diff options
author | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
commit | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch) | |
tree | 3a8b45f4802f002269ff1bcf596f94cee4679a07 /js/lib/rdge/materials/plasma-material.js | |
parent | bda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff) | |
parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
download | ninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/lib/rdge/materials/plasma-material.js')
-rw-r--r-- | js/lib/rdge/materials/plasma-material.js | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js index 86b1a93c..b04d8451 100644 --- a/js/lib/rdge/materials/plasma-material.js +++ b/js/lib/rdge/materials/plasma-material.js | |||
@@ -67,6 +67,24 @@ var PlasmaMaterial = function PlasmaMaterial() { | |||
67 | this._time += this._dTime; | 67 | this._time += this._dTime; |
68 | } | 68 | } |
69 | 69 | ||
70 | this.exportJSON = function() | ||
71 | { | ||
72 | var jObj = | ||
73 | { | ||
74 | 'material' : this.getShaderName(), | ||
75 | 'name' : this.getName(), | ||
76 | 'speed' : this._speed, | ||
77 | 'dTime' : this._dTime | ||
78 | } | ||
79 | |||
80 | return jObj; | ||
81 | } | ||
82 | |||
83 | this.importJSON = function( jObj ) | ||
84 | { | ||
85 | this._speed = jObj.speed; | ||
86 | this._dTime = jObj.dTime; | ||
87 | } | ||
70 | }; | 88 | }; |
71 | 89 | ||
72 | /////////////////////////////////////////////////////////////////////////////////////// | 90 | /////////////////////////////////////////////////////////////////////////////////////// |