aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/keleidoscope-material.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-04 15:54:53 -0700
committerJose Antonio Marquez2012-04-04 15:54:53 -0700
commitc3022de5ba2e24737184dba7454233b165da0a20 (patch)
tree0bc6a2d433c577e13d598c3385bebaff8a226c86 /js/lib/rdge/materials/keleidoscope-material.js
parente2ed78b699c3f2353bdf636629956c2a3ef319be (diff)
parente721a7c1009f298a1bd8fea583da14535e039880 (diff)
downloadninja-c3022de5ba2e24737184dba7454233b165da0a20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/lib/rdge/materials/keleidoscope-material.js')
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js8
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///////////////////////////////////////////////////////////////////////////////////////