diff options
Diffstat (limited to 'js/lib/rdge/materials/flat-material.js')
-rwxr-xr-x | js/lib/rdge/materials/flat-material.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js index 5fa46231..b344db7c 100755 --- a/js/lib/rdge/materials/flat-material.js +++ b/js/lib/rdge/materials/flat-material.js | |||
@@ -70,7 +70,7 @@ var FlatMaterial = function FlatMaterial() | |||
70 | // set up the material node | 70 | // set up the material node |
71 | this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID()); | 71 | this._materialNode = RDGE.createMaterialNode("flatMaterial_" + world.generateUniqueNodeID()); |
72 | this._materialNode.setShader(this._shader); | 72 | this._materialNode.setShader(this._shader); |
73 | 73 | ||
74 | this.setShaderValues(); | 74 | this.setShaderValues(); |
75 | } | 75 | } |
76 | else | 76 | else |
@@ -91,9 +91,9 @@ var FlatMaterial = function FlatMaterial() | |||
91 | 91 | ||
92 | /////////////////////////////////////////////////////////////////////////////////////// | 92 | /////////////////////////////////////////////////////////////////////////////////////// |
93 | // RDGE shader | 93 | // RDGE shader |
94 | 94 | ||
95 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) | 95 | // shader spec (can also be loaded from a .JSON file, or constructed at runtime) |
96 | flatShaderDef = | 96 | flatShaderDef = |
97 | { | 97 | { |
98 | 'shaders': { // shader files | 98 | 'shaders': { // shader files |
99 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", | 99 | 'defaultVShader':"assets/shaders/Basic.vert.glsl", |
@@ -104,7 +104,7 @@ flatShaderDef = | |||
104 | { | 104 | { |
105 | 'vshader' : 'defaultVShader', | 105 | 'vshader' : 'defaultVShader', |
106 | 'fshader' : 'defaultFShader', | 106 | 'fshader' : 'defaultFShader', |
107 | 107 | ||
108 | // attributes | 108 | // attributes |
109 | 'attributes' : | 109 | 'attributes' : |
110 | { | 110 | { |