aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/julia-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/julia-material.js
parent648ee61ae84216d0236e0dbc211addc13b2cfa3a (diff)
downloadninja-04343eda8c2f870b0da55cfdc8003c99fe1cc4de.tar.gz
Remove trailing spaces
Diffstat (limited to 'js/lib/rdge/materials/julia-material.js')
-rw-r--r--js/lib/rdge/materials/julia-material.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index 718f5b44..cf9176df 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -90,16 +90,16 @@ var JuliaMaterial = function JuliaMaterial() {
90 90
91/////////////////////////////////////////////////////////////////////////////////////// 91///////////////////////////////////////////////////////////////////////////////////////
92// RDGE shader 92// RDGE shader
93 93
94// shader spec (can also be loaded from a .JSON file, or constructed at runtime) 94// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
95var JuliaMaterialDef = 95var JuliaMaterialDef =
96{'shaders': 96{'shaders':
97 { 97 {
98 'defaultVShader':"assets/shaders/Basic.vert.glsl", 98 'defaultVShader':"assets/shaders/Basic.vert.glsl",
99 'defaultFShader':"assets/shaders/Julia.frag.glsl" 99 'defaultFShader':"assets/shaders/Julia.frag.glsl"
100 }, 100 },
101 'techniques': 101 'techniques':
102 { 102 {
103 'default': 103 'default':
104 [ 104 [
105 { 105 {
@@ -113,7 +113,7 @@ var JuliaMaterialDef =
113 'texcoord' : { 'type' : 'vec2' } 113 'texcoord' : { 'type' : 'vec2' }
114 }, 114 },
115 // parameters 115 // parameters
116 'params' : 116 'params' :
117 { 117 {
118 'u_time' : { 'type' : 'float' }, 118 'u_time' : { 'type' : 'float' },
119 'u_speed' : { 'type' : 'float' }, 119 'u_speed' : { 'type' : 'float' },
@@ -121,7 +121,7 @@ var JuliaMaterialDef =
121 }, 121 },
122 122
123 // render states 123 // render states
124 'states' : 124 'states' :
125 { 125 {
126 'depthEnable' : true, 126 'depthEnable' : true,
127 'offset':[1.0, 0.1] 127 'offset':[1.0, 0.1]