Skip to content

Commit

Permalink
Add dropbox.min.map to avoid an error and put the computing callbacks…
Browse files Browse the repository at this point in the history
… in place.
  • Loading branch information
haehn committed Sep 26, 2013
1 parent b26d3d4 commit ac6679a
Show file tree
Hide file tree
Showing 4 changed files with 258 additions and 248 deletions.
12 changes: 6 additions & 6 deletions index.html
Expand Up @@ -71,19 +71,19 @@
<script type='text/javascript' src='js/x.scene.js'></script>
<script type='text/javascript' src='js/x.share.js'></script>
<script type='text/javascript' src='js/x.realtime.js'></script>
<!-- <script type='text/javascript' src='js/xtk.js'></script> -->
<script type="text/javascript" src="../X/lib/google-closure-library/closure/goog/base.js"></script>
<script type="text/javascript" src="../X/xtk-deps.js"></script>
<script type='text/javascript' src='js/xtk.js'></script>
<!-- <script type="text/javascript" src="../X/lib/google-closure-library/closure/goog/base.js"></script> -->
<!-- <script type="text/javascript" src="../X/xtk-deps.js"></script> -->


<script type='text/javascript' src='js/pusher.min.js'></script>

<!-- Google Analytics -->
<script type="text/javascript">

goog.require('X.renderer2D');
goog.require('X.renderer3D');
goog.require('X.volume');
// goog.require('X.renderer2D');
// goog.require('X.renderer3D');
// goog.require('X.volume');


// goog.require('X.renderer3D');
Expand Down
1 change: 1 addition & 0 deletions js/dropbox.min.map

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions js/x.rendering.js
Expand Up @@ -474,6 +474,15 @@ function parse(data) {

}

// add callbacks for computing
volume.onComputing = function(direction) {
console.log('computing', direction);
}

volume.onComputingEnd = function(direction) {
console.log('computing end', direction);
}

if (data['colortable']['file'].length > 0) {

// we have a color table
Expand Down

0 comments on commit ac6679a

Please sign in to comment.