diff options
author | Eric Guzman | 2012-04-05 18:42:40 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-05 18:42:40 -0700 |
commit | 8ff9dde2053e41d85bb27d9c91808a30e551a138 (patch) | |
tree | 8eec67d632d82d3052ed470096eda13fd50a55c8 /js/lib/rdge/materials/mandel-material.js | |
parent | 4631d54ffb4942378835689e9f5d70ed95610822 (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-8ff9dde2053e41d85bb27d9c91808a30e551a138.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/rdge/materials/mandel-material.js')
-rw-r--r-- | js/lib/rdge/materials/mandel-material.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js index e7b105e1..a82a4bfc 100644 --- a/js/lib/rdge/materials/mandel-material.js +++ b/js/lib/rdge/materials/mandel-material.js | |||
@@ -57,12 +57,12 @@ var MandelMaterial = function MandelMaterial() { | |||
57 | if (world) this.setWorld( world ); | 57 | if (world) this.setWorld( world ); |
58 | 58 | ||
59 | // set up the shader | 59 | // set up the shader |
60 | this._shader = new jshader(); | 60 | this._shader = new RDGE.jshader(); |
61 | this._shader.def = MandelMaterialDef; | 61 | this._shader.def = MandelMaterialDef; |
62 | this._shader.init(); | 62 | this._shader.init(); |
63 | 63 | ||
64 | // set up the material node | 64 | // set up the material node |
65 | this._materialNode = createMaterialNode("mandelMaterial" + "_" + world.generateUniqueNodeID()); | 65 | this._materialNode = RDGE.createMaterialNode("mandelMaterial" + "_" + world.generateUniqueNodeID()); |
66 | this._materialNode.setShader(this._shader); | 66 | this._materialNode.setShader(this._shader); |
67 | 67 | ||
68 | this._time = 0; | 68 | this._time = 0; |
@@ -79,14 +79,14 @@ var MandelMaterial = function MandelMaterial() { | |||
79 | var material = this._materialNode; | 79 | var material = this._materialNode; |
80 | if (material) { | 80 | if (material) { |
81 | var technique = material.shaderProgram['default']; | 81 | var technique = material.shaderProgram['default']; |
82 | var renderer = g_Engine.getContext().renderer; | 82 | var renderer = RDGE.globals.engine.getContext().renderer; |
83 | if (renderer && technique) { | 83 | if (renderer && technique) { |
84 | if (this._shader && this._shader['default']) | 84 | if (this._shader && this._shader['default']) |
85 | this._shader['default'].u_time.set( [this._time] ); | 85 | this._shader['default'].u_time.set( [this._time] ); |
86 | this._time = time; | 86 | this._time = time; |
87 | } | 87 | } |
88 | } | 88 | } |
89 | } | 89 | }; |
90 | }; | 90 | }; |
91 | 91 | ||
92 | /////////////////////////////////////////////////////////////////////////////////////// | 92 | /////////////////////////////////////////////////////////////////////////////////////// |