diff options
author | Valerio Virgillito | 2012-04-30 14:49:49 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-30 14:49:49 -0700 |
commit | 6b1a6994d98a18b45016b97ac8d81483109a586c (patch) | |
tree | cda8a39f8813fb5c0f9b4fb1d37007e6ec971128 /js/document | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
parent | 48e442977ef1630e0f664265a7142320b55d7d20 (diff) | |
download | ninja-6b1a6994d98a18b45016b97ac8d81483109a586c.tar.gz |
Merge pull request #182 from ericmueller/Canvas-interaction
Canvas interaction
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 3dbf96ce..9d083dd8 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -207,16 +207,16 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
207 | var elt = this.documentRoot; | 207 | var elt = this.documentRoot; |
208 | if (elt) | 208 | if (elt) |
209 | { | 209 | { |
210 | /* | ||
211 | // Use this code to test the runtime version of WebGL | ||
212 | var cdm = new NinjaCvsRt.CanvasDataManager(); | ||
213 | cdm.loadGLData(elt, value, null ); | ||
214 | */ | ||
215 | |||
216 | // /* | ||
210 | var nWorlds= value.length; | 217 | var nWorlds= value.length; |
211 | for (var i=0; i<nWorlds; i++) | 218 | for (var i=0; i<nWorlds; i++) |
212 | { | 219 | { |
213 | /* | ||
214 | // Use this code to test the runtime version of WebGL | ||
215 | var cdm = new NinjaCvsRt.CanvasDataManager(); | ||
216 | cdm.loadGLData(elt, value, null ); | ||
217 | */ | ||
218 | |||
219 | // /* | ||
220 | // get the data for the next canvas | 220 | // get the data for the next canvas |
221 | var importStr = value[i]; | 221 | var importStr = value[i]; |
222 | 222 | ||
@@ -228,7 +228,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
228 | { | 228 | { |
229 | // JSON format. pull off the | 229 | // JSON format. pull off the |
230 | importStr = importStr.substr( index+1 ); | 230 | importStr = importStr.substr( index+1 ); |
231 | jObj = jObj = JSON.parse( importStr ); | 231 | jObj = JSON.parse( importStr ); |
232 | id = jObj.id; | 232 | id = jObj.id; |
233 | } | 233 | } |
234 | else | 234 | else |
@@ -281,8 +281,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
281 | } | 281 | } |
282 | } | 282 | } |
283 | } | 283 | } |
284 | // */ | ||
285 | } | 284 | } |
285 | // */ | ||
286 | } | 286 | } |
287 | } | 287 | } |
288 | }, | 288 | }, |