aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/deform-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/deform-material.js
parent648ee61ae84216d0236e0dbc211addc13b2cfa3a (diff)
downloadninja-04343eda8c2f870b0da55cfdc8003c99fe1cc4de.tar.gz
Remove trailing spaces
Diffstat (limited to 'js/lib/rdge/materials/deform-material.js')
-rw-r--r--js/lib/rdge/materials/deform-material.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 6c5f93ad..8f88b22e 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -102,16 +102,16 @@ var DeformMaterial = function DeformMaterial() {
102 102
103/////////////////////////////////////////////////////////////////////////////////////// 103///////////////////////////////////////////////////////////////////////////////////////
104// RDGE shader 104// RDGE shader
105 105
106// shader spec (can also be loaded from a .JSON file, or constructed at runtime) 106// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
107var deformMaterialDef = 107var deformMaterialDef =
108{'shaders': 108{'shaders':
109 { 109 {
110 'defaultVShader':"assets/shaders/Basic.vert.glsl", 110 'defaultVShader':"assets/shaders/Basic.vert.glsl",
111 'defaultFShader':"assets/shaders/Deform.frag.glsl" 111 'defaultFShader':"assets/shaders/Deform.frag.glsl"
112 }, 112 },
113 'techniques': 113 'techniques':
114 { 114 {
115 'default': 115 'default':
116 [ 116 [
117 { 117 {
@@ -125,7 +125,7 @@ var deformMaterialDef =
125 'texcoord' : { 'type' : 'vec2' } 125 'texcoord' : { 'type' : 'vec2' }
126 }, 126 },
127 // parameters 127 // parameters
128 'params' : 128 'params' :
129 { 129 {
130 'u_tex0': { 'type' : 'tex2d' }, 130 'u_tex0': { 'type' : 'tex2d' },
131 'u_time' : { 'type' : 'float' }, 131 'u_time' : { 'type' : 'float' },
@@ -134,7 +134,7 @@ var deformMaterialDef =
134 }, 134 },
135 135
136 // render states 136 // render states
137 'states' : 137 'states' :
138 { 138 {
139 'depthEnable' : true, 139 'depthEnable' : true,
140 'offset':[1.0, 0.1] 140 'offset':[1.0, 0.1]