aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/fly-material.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-06 12:13:59 -0700
committerPushkar Joshi2012-04-06 12:13:59 -0700
commit6cce5e9367676f5b452c28dd7d960aa46f4e464c (patch)
tree779125b7c1fc668c02e0dfbb661494a16242c329 /js/lib/rdge/materials/fly-material.js
parentf61545fd7054088efc88aafffd78e11df80d750d (diff)
parent7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff)
downloadninja-6cce5e9367676f5b452c28dd7d960aa46f4e464c.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/lib/rdge/materials/fly-material.js')
-rw-r--r--js/lib/rdge/materials/fly-material.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index bd92ecd8..37bef66a 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -48,12 +48,12 @@ var FlyMaterial = function FlyMaterial() {
48 if (world) this.setWorld( world ); 48 if (world) this.setWorld( world );
49 49
50 // set up the shader 50 // set up the shader
51 this._shader = new jshader(); 51 this._shader = new RDGE.jshader();
52 this._shader.def = flyMaterialDef; 52 this._shader.def = flyMaterialDef;
53 this._shader.init(); 53 this._shader.init();
54 54
55 // set up the material node 55 // set up the material node
56 this._materialNode = createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID()); 56 this._materialNode = RDGE.createMaterialNode("flyMaterial" + "_" + world.generateUniqueNodeID());
57 this._materialNode.setShader(this._shader); 57 this._materialNode.setShader(this._shader);
58 58
59 this._time = 0; 59 this._time = 0;
@@ -65,7 +65,7 @@ var FlyMaterial = function FlyMaterial() {
65 this.updateTexture(); 65 this.updateTexture();
66 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] ); 66 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
67 this.update( 0 ); 67 this.update( 0 );
68 } 68 };
69}; 69};
70 70
71/////////////////////////////////////////////////////////////////////////////////////// 71///////////////////////////////////////////////////////////////////////////////////////
@@ -73,7 +73,8 @@ var FlyMaterial = function FlyMaterial() {
73 73
74// shader spec (can also be loaded from a .JSON file, or constructed at runtime) 74// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
75var flyMaterialDef = 75var flyMaterialDef =
76{'shaders': 76{
77 'shaders':
77 { 78 {
78 'defaultVShader':"assets/shaders/Basic.vert.glsl", 79 'defaultVShader':"assets/shaders/Basic.vert.glsl",
79 'defaultFShader':"assets/shaders/Fly.frag.glsl" 80 'defaultFShader':"assets/shaders/Fly.frag.glsl"