diff options
author | hwc487 | 2012-03-22 15:47:11 -0700 |
---|---|---|
committer | hwc487 | 2012-03-22 15:47:11 -0700 |
commit | e927e4702d7dbd4a878f6979b3f56b46758f93de (patch) | |
tree | e6bb8951374a6504bd6c745ce7233da5cd4869dc /js/lib/rdge/materials/plasma-material.js | |
parent | 00cd98e49c959906d7c44bb6adcdef1f3d5148ae (diff) | |
parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
download | ninja-e927e4702d7dbd4a878f6979b3f56b46758f93de.tar.gz |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into Textures
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 | /////////////////////////////////////////////////////////////////////////////////////// |