aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/plasma-material.js
diff options
context:
space:
mode:
authorEric Guzman2012-03-27 10:22:42 -0700
committerEric Guzman2012-03-27 10:22:42 -0700
commit309b201017da2a4094df4f06adeeff9d396b193a (patch)
tree92257b32855bcd31dd74967b085a6632fd7dbe9b /js/lib/rdge/materials/plasma-material.js
parentda03585a0b03220281f6d54d9acf0ae0fafaef16 (diff)
parent309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
downloadninja-309b201017da2a4094df4f06adeeff9d396b193a.tar.gz
Merge branch 'refs/heads/master' into PresetsPI
Diffstat (limited to 'js/lib/rdge/materials/plasma-material.js')
-rw-r--r--js/lib/rdge/materials/plasma-material.js18
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///////////////////////////////////////////////////////////////////////////////////////