diff options
author | Nivesh Rajbhandari | 2012-04-04 15:53:53 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 15:53:53 -0700 |
commit | b06dbed626994db7bf41e12a712b5289a1306b50 (patch) | |
tree | bee299aae4f4dcac507236f59fdfc3768f9a6b05 /js/lib/rdge/materials/julia-material.js | |
parent | db0fa4e454b76d8a2bd6ba47c6f10166761179e7 (diff) | |
parent | e721a7c1009f298a1bd8fea583da14535e039880 (diff) | |
download | ninja-b06dbed626994db7bf41e12a712b5289a1306b50.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/lib/rdge/materials/julia-material.js')
-rw-r--r-- | js/lib/rdge/materials/julia-material.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js index a85bd6f7..7aeec3dc 100644 --- a/js/lib/rdge/materials/julia-material.js +++ b/js/lib/rdge/materials/julia-material.js | |||
@@ -46,12 +46,12 @@ var JuliaMaterial = function JuliaMaterial() { | |||
46 | if (world) this.setWorld( world ); | 46 | if (world) this.setWorld( world ); |
47 | 47 | ||
48 | // set up the shader | 48 | // set up the shader |
49 | this._shader = new jshader(); | 49 | this._shader = new RDGE.jshader(); |
50 | this._shader.def = JuliaMaterialDef; | 50 | this._shader.def = JuliaMaterialDef; |
51 | this._shader.init(); | 51 | this._shader.init(); |
52 | 52 | ||
53 | // set up the material node | 53 | // set up the material node |
54 | this._materialNode = createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID()); | 54 | this._materialNode = RDGE.createMaterialNode("juliaMaterial" + "_" + world.generateUniqueNodeID()); |
55 | this._materialNode.setShader(this._shader); | 55 | this._materialNode.setShader(this._shader); |
56 | 56 | ||
57 | this._time = 0; | 57 | this._time = 0; |
@@ -68,7 +68,7 @@ var JuliaMaterial = function JuliaMaterial() { | |||
68 | var material = this._materialNode; | 68 | var material = this._materialNode; |
69 | if (material) { | 69 | if (material) { |
70 | var technique = material.shaderProgram['default']; | 70 | var technique = material.shaderProgram['default']; |
71 | var renderer = g_Engine.getContext().renderer; | 71 | var renderer = RDGE.globals.engine.getContext().renderer; |
72 | if (renderer && technique) { | 72 | if (renderer && technique) { |
73 | if (this._shader && this._shader['default']) { | 73 | if (this._shader && this._shader['default']) { |
74 | this._shader['default'].u_time.set( [this._time] ); | 74 | this._shader['default'].u_time.set( [this._time] ); |
@@ -76,7 +76,7 @@ var JuliaMaterial = function JuliaMaterial() { | |||
76 | this._time = time; | 76 | this._time = time; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | } | 79 | }; |
80 | } | 80 | } |
81 | 81 | ||
82 | /////////////////////////////////////////////////////////////////////////////////////// | 82 | /////////////////////////////////////////////////////////////////////////////////////// |