aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/twist-vert-material.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-13 11:15:34 -0700
committerValerio Virgillito2012-03-13 11:15:34 -0700
commitf6b958360d82854bdaf51848e7fd715d1f633179 (patch)
tree80f6c08bb730089bdd3f26310df8d2363f9ba863 /js/lib/rdge/materials/twist-vert-material.js
parentc24f58c10231c30d3a8a4c9fb9a4f395dd746180 (diff)
parent4d7b86f55c504ee4e8c2460cf6b60cb9a2cf18f0 (diff)
downloadninja-f6b958360d82854bdaf51848e7fd715d1f633179.tar.gz
Merge pull request #105 from joseeight/FileIO-Build-Candidate
File I/O adding webGL/canvas data functionality
Diffstat (limited to 'js/lib/rdge/materials/twist-vert-material.js')
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index c2573071..05172a1b 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -46,8 +46,10 @@ function TwistVertMaterial()
46 // duplcate method requirde 46 // duplcate method requirde
47 this.dup = function() { return new TwistVertMaterial(); } 47 this.dup = function() { return new TwistVertMaterial(); }
48 48
49 this.init = function() 49 this.init = function( world )
50 { 50 {
51 this.setWorld( world );
52
51 // set up the shader 53 // set up the shader
52 this._shader = new jshader(); 54 this._shader = new jshader();
53 this._shader.def = twistVertShaderDef; 55 this._shader.def = twistVertShaderDef;
@@ -57,7 +59,7 @@ function TwistVertMaterial()
57 this._shader.twistMe.color.set( this.getColor() ); 59 this._shader.twistMe.color.set( this.getColor() );
58 60
59 // set up the material node 61 // set up the material node
60 this._materialNode = createMaterialNode("twistVertMaterial"); 62 this._materialNode = createMaterialNode("twistVertMaterial" + "_" + world.generateUniqueNodeID());
61 this._materialNode.setShader(this._shader); 63 this._materialNode.setShader(this._shader);
62 64
63 // initialize the twist vert properties 65 // initialize the twist vert properties