aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/plasma-material.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-22 16:26:02 -0700
committerJose Antonio Marquez2012-03-22 16:26:02 -0700
commit748a5c55e15809add748a15a87cd730e3fcee4bf (patch)
tree688f3ee299b2985fa5617426a5789d86f518b877 /js/lib/rdge/materials/plasma-material.js
parent7fbda862c62f37d4c67e4d5a619b7e3cffc309ff (diff)
parentb25195d010417417bb5b2e5362385078d68d9a84 (diff)
downloadninja-748a5c55e15809add748a15a87cd730e3fcee4bf.tar.gz
Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Components
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///////////////////////////////////////////////////////////////////////////////////////