aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/flat-material.js
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:53:10 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit04343eda8c2f870b0da55cfdc8003c99fe1cc4de (patch)
tree0a6048889b65bb16ff58822e55bc1346e9eb07bd /js/lib/rdge/materials/flat-material.js
parent648ee61ae84216d0236e0dbc211addc13b2cfa3a (diff)
downloadninja-04343eda8c2f870b0da55cfdc8003c99fe1cc4de.tar.gz
Remove trailing spaces
Diffstat (limited to 'js/lib/rdge/materials/flat-material.js')
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js8
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)
96flatShaderDef = 96flatShaderDef =
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 {