diff options
author | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
commit | e186c49247689b5c2df6125037e2473636701d17 (patch) | |
tree | e626b006027949f87b5aa1e76eb0ed719adb99bb /js/lib/rdge/materials/plasma-material.js | |
parent | 135c5257e2a4d5f1b25f62758c6783fd2ebe5e19 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-e186c49247689b5c2df6125037e2473636701d17.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/lib/rdge/materials/plasma-material.js')
-rw-r--r-- | js/lib/rdge/materials/plasma-material.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js index b04d8451..02172a6b 100644 --- a/js/lib/rdge/materials/plasma-material.js +++ b/js/lib/rdge/materials/plasma-material.js | |||
@@ -49,7 +49,7 @@ var PlasmaMaterial = function PlasmaMaterial() { | |||
49 | this.setWorld( world ); | 49 | this.setWorld( world ); |
50 | 50 | ||
51 | // set up the shader | 51 | // set up the shader |
52 | this._shader = new jshader(); | 52 | this._shader = new RDGE.jshader(); |
53 | this._shader.def = plasmaShaderDef; | 53 | this._shader.def = plasmaShaderDef; |
54 | this._shader.init(); | 54 | this._shader.init(); |
55 | 55 | ||
@@ -58,14 +58,14 @@ var PlasmaMaterial = function PlasmaMaterial() { | |||
58 | this._shader['default'].u_time.set( [this._time] ); | 58 | this._shader['default'].u_time.set( [this._time] ); |
59 | 59 | ||
60 | // set up the material node | 60 | // set up the material node |
61 | this._materialNode = createMaterialNode("plasmaMaterial" + "_" + world.generateUniqueNodeID()); | 61 | this._materialNode = RDGE.createMaterialNode("plasmaMaterial" + "_" + world.generateUniqueNodeID()); |
62 | this._materialNode.setShader(this._shader); | 62 | this._materialNode.setShader(this._shader); |
63 | }; | 63 | }; |
64 | 64 | ||
65 | this.update = function( time ) { | 65 | this.update = function( time ) { |
66 | this._shader['default'].u_time.set( [this._time] ); | 66 | this._shader['default'].u_time.set( [this._time] ); |
67 | this._time += this._dTime; | 67 | this._time += this._dTime; |
68 | } | 68 | }; |
69 | 69 | ||
70 | this.exportJSON = function() | 70 | this.exportJSON = function() |
71 | { | 71 | { |
@@ -75,16 +75,16 @@ var PlasmaMaterial = function PlasmaMaterial() { | |||
75 | 'name' : this.getName(), | 75 | 'name' : this.getName(), |
76 | 'speed' : this._speed, | 76 | 'speed' : this._speed, |
77 | 'dTime' : this._dTime | 77 | 'dTime' : this._dTime |
78 | } | 78 | }; |
79 | 79 | ||
80 | return jObj; | 80 | return jObj; |
81 | } | 81 | }; |
82 | 82 | ||
83 | this.importJSON = function( jObj ) | 83 | this.importJSON = function( jObj ) |
84 | { | 84 | { |
85 | this._speed = jObj.speed; | 85 | this._speed = jObj.speed; |
86 | this._dTime = jObj.dTime; | 86 | this._dTime = jObj.dTime; |
87 | } | 87 | }; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | /////////////////////////////////////////////////////////////////////////////////////// | 90 | /////////////////////////////////////////////////////////////////////////////////////// |