diff options
author | hwc487 | 2012-03-21 16:51:05 -0700 |
---|---|---|
committer | hwc487 | 2012-03-21 16:51:05 -0700 |
commit | 4cd4d29ae10b87f7b280d537b8980d207a22dd43 (patch) | |
tree | afd4af73481a50d7e96b9a5e00300c0960e07023 /js/lib | |
parent | c919442392a9406aeca6764f67e4875ee0a6370a (diff) | |
download | ninja-4cd4d29ae10b87f7b280d537b8980d207a22dd43.tar.gz |
Synchronized material animation speed for pulse material between Ninja and runtime.
Diffstat (limited to 'js/lib')
-rw-r--r-- | js/lib/rdge/materials/pulse-material.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index e6be69b4..2075d1ff 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js | |||
@@ -169,7 +169,8 @@ var PulseMaterial = function PulseMaterial() { | |||
169 | { | 169 | { |
170 | 'material' : this.getShaderName(), | 170 | 'material' : this.getShaderName(), |
171 | 'name' : this.getName(), | 171 | 'name' : this.getName(), |
172 | 'texture' : this._propValues[this._propNames[0]] | 172 | 'texture' : this._propValues[this._propNames[0]], |
173 | 'dTime' : this._dTime | ||
173 | }; | 174 | }; |
174 | 175 | ||
175 | return jObj; | 176 | return jObj; |
@@ -183,6 +184,8 @@ var PulseMaterial = function PulseMaterial() { | |||
183 | try { | 184 | try { |
184 | this._propValues[this._propNames[0]] = jObj.texture; | 185 | this._propValues[this._propNames[0]] = jObj.texture; |
185 | this._texMap = jObj.texture; | 186 | this._texMap = jObj.texture; |
187 | if (jObj.dTime) | ||
188 | this._dTime = jObj.dTime; | ||
186 | } | 189 | } |
187 | catch (e) | 190 | catch (e) |
188 | { | 191 | { |