diff options
author | hwc487 | 2012-02-29 15:23:28 -0800 |
---|---|---|
committer | hwc487 | 2012-02-29 15:23:28 -0800 |
commit | 07c48708a99b94a220c043ad5951a331bbd4fc2d (patch) | |
tree | 6fdf01f3d0fca0cf5835246bed21d6ae1816ce88 /js/helper-classes/RDGE/runtime/CanvasDataManager.js | |
parent | 347fc28227d822e9fea3fa823fae79cf14ea041c (diff) | |
download | ninja-07c48708a99b94a220c043ad5951a331bbd4fc2d.tar.gz |
WebGL file I/O
Diffstat (limited to 'js/helper-classes/RDGE/runtime/CanvasDataManager.js')
-rw-r--r-- | js/helper-classes/RDGE/runtime/CanvasDataManager.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/runtime/CanvasDataManager.js b/js/helper-classes/RDGE/runtime/CanvasDataManager.js index 4985fc9a..46d944a1 100644 --- a/js/helper-classes/RDGE/runtime/CanvasDataManager.js +++ b/js/helper-classes/RDGE/runtime/CanvasDataManager.js | |||
@@ -29,9 +29,10 @@ function CanvasDataManager() | |||
29 | var canvas = this.findCanvasWithID( id, root ); | 29 | var canvas = this.findCanvasWithID( id, root ); |
30 | if (canvas) | 30 | if (canvas) |
31 | { | 31 | { |
32 | var loadForAuthoring = true; | 32 | //var loadForAuthoring = true; |
33 | var index = importStr.indexOf( "scenedata: " ); | 33 | var index = importStr.indexOf( "scenedata: " ); |
34 | if (index >= 0) loadForAuthoring = false; | 34 | //if (index >= 0) loadForAuthoring = false; |
35 | var loadForAuthoring = false; | ||
35 | 36 | ||
36 | if (loadForAuthoring) | 37 | if (loadForAuthoring) |
37 | { | 38 | { |
@@ -64,7 +65,7 @@ function CanvasDataManager() | |||
64 | { | 65 | { |
65 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) | 66 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) |
66 | { | 67 | { |
67 | var data = elt.elementModel.shapeModel.GLWorld.export(); | 68 | var data = elt.elementModel.shapeModel.GLWorld.export( true ); |
68 | dataArray.push( data ); | 69 | dataArray.push( data ); |
69 | } | 70 | } |
70 | 71 | ||
@@ -90,7 +91,8 @@ function CanvasDataManager() | |||
90 | for (var i=0; i<nKids; i++) | 91 | for (var i=0; i<nKids; i++) |
91 | { | 92 | { |
92 | var child = elt.children[i]; | 93 | var child = elt.children[i]; |
93 | this.findCanvasWithID( id, child ); | 94 | var foundElt = this.findCanvasWithID( id, child ); |
95 | if (foundElt) return foundElt; | ||
94 | } | 96 | } |
95 | } | 97 | } |
96 | } | 98 | } |