aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorhwc4872012-03-21 16:51:05 -0700
committerhwc4872012-03-21 16:51:05 -0700
commit4cd4d29ae10b87f7b280d537b8980d207a22dd43 (patch)
treeafd4af73481a50d7e96b9a5e00300c0960e07023 /assets
parentc919442392a9406aeca6764f67e4875ee0a6370a (diff)
downloadninja-4cd4d29ae10b87f7b280d537b8980d207a22dd43.tar.gz
Synchronized material animation speed for pulse material between Ninja and runtime.
Diffstat (limited to 'assets')
-rw-r--r--assets/canvas-runtime.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js
index 87aac71f..7f2dc8ab 100644
--- a/assets/canvas-runtime.js
+++ b/assets/canvas-runtime.js
@@ -1249,6 +1249,7 @@ function RuntimePulseMaterial()
1249 this.import = function( jObj ) 1249 this.import = function( jObj )
1250 { 1250 {
1251 this._texMap = jObj.texture; 1251 this._texMap = jObj.texture;
1252 if (jObj.dTime) this._dTime = jObj.dTime;
1252 } 1253 }
1253 1254
1254 this.init = function( world ) 1255 this.init = function( world )
@@ -1603,6 +1604,12 @@ function RuntimePlasmaMaterial()
1603 this.update(); 1604 this.update();
1604 } 1605 }
1605 1606
1607 this.importJSON = function( jObj )
1608 {
1609 this._speed = jObj.speed;
1610 this._dTime = jObj.dTime;
1611 }
1612
1606 this.update = function( time ) 1613 this.update = function( time )
1607 { 1614 {
1608 var material = this._materialNode; 1615 var material = this._materialNode;