aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/julia-material.js
diff options
context:
space:
mode:
authorAnanya Sen2012-04-17 18:11:55 -0700
committerAnanya Sen2012-04-17 18:11:55 -0700
commit35abad196cc9feb76ef50c1b63032a38233a6d51 (patch)
tree914689c66d4ab6c6e088b571eade0a0e35082916 /js/lib/rdge/materials/julia-material.js
parent1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff)
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/lib/rdge/materials/julia-material.js')
-rw-r--r--js/lib/rdge/materials/julia-material.js8
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///////////////////////////////////////////////////////////////////////////////////////