diff options
author | Jon Reid | 2012-04-05 16:36:22 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-05 16:36:22 -0700 |
commit | eb694fa5d39733264bce7ba832aabbe9c3d6c81e (patch) | |
tree | 049aaa66a6621e9f54b33b9861f50c20667ba0e3 /js/lib/rdge/materials/keleidoscope-material.js | |
parent | a8ea8f377919c7f1a6af69311f55fd57727d9058 (diff) | |
parent | e186c49247689b5c2df6125037e2473636701d17 (diff) | |
download | ninja-eb694fa5d39733264bce7ba832aabbe9c3d6c81e.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/lib/rdge/materials/keleidoscope-material.js')
-rw-r--r-- | js/lib/rdge/materials/keleidoscope-material.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js index 16d1ccfa..4506bb8c 100644 --- a/js/lib/rdge/materials/keleidoscope-material.js +++ b/js/lib/rdge/materials/keleidoscope-material.js | |||
@@ -55,12 +55,12 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
55 | if (world) this.setWorld( world ); | 55 | if (world) this.setWorld( world ); |
56 | 56 | ||
57 | // set up the shader | 57 | // set up the shader |
58 | this._shader = new jshader(); | 58 | this._shader = new RDGE.jshader(); |
59 | this._shader.def = keleidoscopeMaterialDef; | 59 | this._shader.def = keleidoscopeMaterialDef; |
60 | this._shader.init(); | 60 | this._shader.init(); |
61 | 61 | ||
62 | // set up the material node | 62 | // set up the material node |
63 | this._materialNode = createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID()); | 63 | this._materialNode = RDGE.createMaterialNode("keleidoscopeMaterial" + "_" + world.generateUniqueNodeID()); |
64 | this._materialNode.setShader(this._shader); | 64 | this._materialNode.setShader(this._shader); |
65 | 65 | ||
66 | this._time = 0; | 66 | this._time = 0; |
@@ -80,7 +80,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
80 | if (material) | 80 | if (material) |
81 | { | 81 | { |
82 | var technique = material.shaderProgram['default']; | 82 | var technique = material.shaderProgram['default']; |
83 | var renderer = g_Engine.getContext().renderer; | 83 | var renderer = RDGE.globals.engine.getContext().renderer; |
84 | if (renderer && technique) | 84 | if (renderer && technique) |
85 | { | 85 | { |
86 | if (this._shader && this._shader['default']) { | 86 | if (this._shader && this._shader['default']) { |
@@ -90,7 +90,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { | |||
90 | this._time = time; | 90 | this._time = time; |
91 | } | 91 | } |
92 | } | 92 | } |
93 | } | 93 | }; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | /////////////////////////////////////////////////////////////////////////////////////// | 96 | /////////////////////////////////////////////////////////////////////////////////////// |