diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/lib/rdge/materials/twist-vert-material.js | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/rdge/materials/twist-vert-material.js')
-rw-r--r-- | js/lib/rdge/materials/twist-vert-material.js | 6 |
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 |