diff options
author | Ananya Sen | 2012-04-17 18:11:55 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-17 18:11:55 -0700 |
commit | 35abad196cc9feb76ef50c1b63032a38233a6d51 (patch) | |
tree | 914689c66d4ab6c6e088b571eade0a0e35082916 /js/lib/rdge/materials/fly-material.js | |
parent | 1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff) | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/lib/rdge/materials/fly-material.js')
-rw-r--r-- | js/lib/rdge/materials/fly-material.js | 9 |
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) |
75 | var flyMaterialDef = | 75 | var 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" |