diff options
author | John Mayhew | 2012-04-03 13:39:32 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-03 13:39:32 -0700 |
commit | 18609d375e7aab9cb48c9b3f5b291f85cbd28683 (patch) | |
tree | deca3dc7277c154782f451fbd5b960c3d5c9dba7 /assets | |
parent | d5d4dcac78ebf8ba3163a8c7055d783b6397a435 (diff) | |
download | ninja-18609d375e7aab9cb48c9b3f5b291f85cbd28683.tar.gz |
removed old unused import and export functions.
Diffstat (limited to 'assets')
-rw-r--r-- | assets/canvas-runtime.js | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index 6e9d1121..6278fdac 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -290,17 +290,17 @@ NinjaCvsRt.GLRuntime = function ( canvas, jObj, assetPath ) | |||
290 | { | 290 | { |
291 | case 1: | 291 | case 1: |
292 | obj = new NinjaCvsRt.RuntimeRectangle(); | 292 | obj = new NinjaCvsRt.RuntimeRectangle(); |
293 | obj.import( jObj, parent ); | 293 | obj.importJSON( jObj, parent ); |
294 | break; | 294 | break; |
295 | 295 | ||
296 | case 2: // circle | 296 | case 2: // circle |
297 | obj = new NinjaCvsRt.RuntimeOval(); | 297 | obj = new NinjaCvsRt.RuntimeOval(); |
298 | obj.import( jObj, parent ); | 298 | obj.importJSON( jObj, parent ); |
299 | break; | 299 | break; |
300 | 300 | ||
301 | case 3: // line | 301 | case 3: // line |
302 | obj = new NinjaCvsRt.RuntimeLine(); | 302 | obj = new NinjaCvsRt.RuntimeLine(); |
303 | obj.import( jObj, parent ); | 303 | obj.importJSON( jObj, parent ); |
304 | break; | 304 | break; |
305 | 305 | ||
306 | default: | 306 | default: |
@@ -481,7 +481,7 @@ NinjaCvsRt.RuntimeGeomObj = function () | |||
481 | this._children.push( child ); | 481 | this._children.push( child ); |
482 | }; | 482 | }; |
483 | 483 | ||
484 | this.import = function() | 484 | this.importJSON = function() |
485 | { | 485 | { |
486 | }; | 486 | }; |
487 | 487 | ||
@@ -530,7 +530,7 @@ NinjaCvsRt.RuntimeGeomObj = function () | |||
530 | 530 | ||
531 | if (mat) | 531 | if (mat) |
532 | { | 532 | { |
533 | mat.import( matObj ); | 533 | mat.importJSON( matObj ); |
534 | mat._materialNodeName = matNodeName; | 534 | mat._materialNodeName = matNodeName; |
535 | this._materials.push( mat ); | 535 | this._materials.push( mat ); |
536 | } | 536 | } |
@@ -671,7 +671,7 @@ NinjaCvsRt.RuntimeRectangle = function () | |||
671 | this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj; | 671 | this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj; |
672 | this.inheritedFrom(); | 672 | this.inheritedFrom(); |
673 | 673 | ||
674 | this.import = function( jObj ) | 674 | this.importJSON = function( jObj ) |
675 | { | 675 | { |
676 | this._xOffset = jObj.xoff; | 676 | this._xOffset = jObj.xoff; |
677 | this._yOffset = jObj.yoff; | 677 | this._yOffset = jObj.yoff; |
@@ -820,7 +820,7 @@ NinjaCvsRt.RuntimeLine = function () | |||
820 | this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj; | 820 | this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj; |
821 | this.inheritedFrom(); | 821 | this.inheritedFrom(); |
822 | 822 | ||
823 | this.import = function( jObj ) | 823 | this.importJSON = function( jObj ) |
824 | { | 824 | { |
825 | this._xOffset = jObj.xoff; | 825 | this._xOffset = jObj.xoff; |
826 | this._yOffset = jObj.yoff; | 826 | this._yOffset = jObj.yoff; |
@@ -918,7 +918,7 @@ NinjaCvsRt.RuntimeOval = function () | |||
918 | this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj; | 918 | this.inheritedFrom = NinjaCvsRt.RuntimeGeomObj; |
919 | this.inheritedFrom(); | 919 | this.inheritedFrom(); |
920 | 920 | ||
921 | this.import = function( jObj ) | 921 | this.importJSON = function( jObj ) |
922 | { | 922 | { |
923 | this._xOffset = jObj.xoff; | 923 | this._xOffset = jObj.xoff; |
924 | this._yOffset = jObj.yoff; | 924 | this._yOffset = jObj.yoff; |
@@ -1191,7 +1191,7 @@ NinjaCvsRt.RuntimeMaterial = function ( world ) | |||
1191 | { | 1191 | { |
1192 | }; | 1192 | }; |
1193 | 1193 | ||
1194 | this.import = function( jObj ) | 1194 | this.importJSON = function( jObj ) |
1195 | { | 1195 | { |
1196 | }; | 1196 | }; |
1197 | }; | 1197 | }; |
@@ -1208,7 +1208,7 @@ NinjaCvsRt.RuntimeFlatMaterial = function () | |||
1208 | // assign a default color | 1208 | // assign a default color |
1209 | this._color = [1,0,0,1]; | 1209 | this._color = [1,0,0,1]; |
1210 | 1210 | ||
1211 | this.import = function( jObj ) | 1211 | this.importJSON = function( jObj ) |
1212 | { | 1212 | { |
1213 | this._color = jObj.color; | 1213 | this._color = jObj.color; |
1214 | }; | 1214 | }; |
@@ -1236,7 +1236,7 @@ NinjaCvsRt.RuntimePulseMaterial = function () | |||
1236 | this.isAnimated = function() { return true; }; | 1236 | this.isAnimated = function() { return true; }; |
1237 | 1237 | ||
1238 | 1238 | ||
1239 | this.import = function( jObj ) | 1239 | this.importJSON = function( jObj ) |
1240 | { | 1240 | { |
1241 | this._texMap = jObj.texture; | 1241 | this._texMap = jObj.texture; |
1242 | if (jObj.dTime) this._dTime = jObj.dTime; | 1242 | if (jObj.dTime) this._dTime = jObj.dTime; |
@@ -1331,7 +1331,7 @@ NinjaCvsRt.RuntimeRadialGradientMaterial = function () | |||
1331 | } | 1331 | } |
1332 | }; | 1332 | }; |
1333 | 1333 | ||
1334 | this.import = function( jObj ) | 1334 | this.importJSON = function( jObj ) |
1335 | { | 1335 | { |
1336 | this._color1 = jObj.color1, | 1336 | this._color1 = jObj.color1, |
1337 | this._color2 = jObj.color2, | 1337 | this._color2 = jObj.color2, |
@@ -1374,7 +1374,7 @@ NinjaCvsRt.RuntimeBumpMetalMaterial = function () | |||
1374 | this._specularTexture = "assets/images/silver.png"; | 1374 | this._specularTexture = "assets/images/silver.png"; |
1375 | this._normalTexture = "assets/images/normalMap.png"; | 1375 | this._normalTexture = "assets/images/normalMap.png"; |
1376 | 1376 | ||
1377 | this.import = function( jObj ) | 1377 | this.importJSON = function( jObj ) |
1378 | { | 1378 | { |
1379 | this._lightDiff = jObj.lightDiff; | 1379 | this._lightDiff = jObj.lightDiff; |
1380 | this._diffuseTexture = jObj.diffuseTexture; | 1380 | this._diffuseTexture = jObj.diffuseTexture; |
@@ -1515,7 +1515,7 @@ NinjaCvsRt.RuntimeUberMaterial = function () | |||
1515 | { | 1515 | { |
1516 | }; | 1516 | }; |
1517 | 1517 | ||
1518 | this.import = function( jObj ) | 1518 | this.importJSON = function( jObj ) |
1519 | { | 1519 | { |
1520 | if (jObj.materialProps) | 1520 | if (jObj.materialProps) |
1521 | { | 1521 | { |