diff options
author | Jose Antonio Marquez Russo | 2012-03-09 13:44:58 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-09 13:44:58 -0800 |
commit | af4b43723df785c946abae90d44269e819d55d71 (patch) | |
tree | 761159dc0056354c231d3bfb4f851bfdcea4b462 /js/document | |
parent | 5da69dfd30f353ff753cba9322744e2f33f32a1a (diff) | |
parent | e92a6da7b84c58803489d70efedf74837ddfe4cd (diff) | |
download | ninja-af4b43723df785c946abae90d44269e819d55d71.tar.gz |
Merge pull request #32 from ericmueller/integration
Added asset folder replacement to runtime load.
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index aa56fd0e..f57c61ee 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -197,7 +197,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
197 | //if (path) { | 197 | //if (path) { |
198 | //this.collectGLData(elt, this._glData, path); | 198 | //this.collectGLData(elt, this._glData, path); |
199 | //} else { | 199 | //} else { |
200 | this.collectGLData(elt, this._glData, "assets/"); | 200 | this.collectGLData(elt, this._glData ); |
201 | //} | 201 | //} |
202 | } else { | 202 | } else { |
203 | this._glData = null | 203 | this._glData = null |
@@ -368,11 +368,11 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
368 | 368 | ||
369 | 369 | ||
370 | collectGLData: { | 370 | collectGLData: { |
371 | value: function( elt, dataArray, imagePath ) | 371 | value: function( elt, dataArray ) |
372 | { | 372 | { |
373 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) | 373 | if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld) |
374 | { | 374 | { |
375 | var data = elt.elementModel.shapeModel.GLWorld.export( imagePath ); | 375 | var data = elt.elementModel.shapeModel.GLWorld.export(); |
376 | dataArray.push( data ); | 376 | dataArray.push( data ); |
377 | } | 377 | } |
378 | 378 | ||