aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/deform-material.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib/rdge/materials/deform-material.js')
-rw-r--r--js/lib/rdge/materials/deform-material.js92
1 files changed, 46 insertions, 46 deletions
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 6145f1a6..274369d6 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -51,21 +51,21 @@ var DeformMaterial = function DeformMaterial() {
51 /////////////////////////////////////////////////////////////////////// 51 ///////////////////////////////////////////////////////////////////////
52 // all defined in parent PulseMaterial.js 52 // all defined in parent PulseMaterial.js
53 // load the local default value 53 // load the local default value
54 var u_tex0_index = 0; 54 var u_tex0_index = 0;
55 this._propNames = ["u_tex0", "u_speed" ]; 55 this._propNames = ["u_tex0", "u_speed" ];
56 this._propLabels = ["Texture map", "Speed" ]; 56 this._propLabels = ["Texture map", "Speed" ];
57 this._propTypes = ["file", "float" ]; 57 this._propTypes = ["file", "float" ];
58 this._propValues = []; 58 this._propValues = [];
59 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0); 59 this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
60 this._propValues[this._propNames[1]] = 1.0; 60 this._propValues[this._propNames[1]] = 1.0;
61 61
62 this._propValues[ this._propNames[ u_tex0_index] ] = this._defaultTexMap.slice(0); 62 this._propValues[ this._propNames[ u_tex0_index] ] = this._defaultTexMap.slice(0);
63 63
64 /////////////////////////////////////////////////////////////////////// 64 ///////////////////////////////////////////////////////////////////////
65 // Material Property Accessors 65 // Material Property Accessors
66 /////////////////////////////////////////////////////////////////////// 66 ///////////////////////////////////////////////////////////////////////
67 this.isAnimated = function() { return true; }; 67 this.isAnimated = function() { return true; };
68 this.getShaderDef = function() { return pulseMaterialDef; } 68 this.getShaderDef = function() { return pulseMaterialDef; }
69 69
70 /////////////////////////////////////////////////////////////////////// 70 ///////////////////////////////////////////////////////////////////////
71 71
@@ -112,46 +112,46 @@ var DeformMaterial = function DeformMaterial() {
112 112
113/////////////////////////////////////////////////////////////////////////////////////// 113///////////////////////////////////////////////////////////////////////////////////////
114// RDGE shader 114// RDGE shader
115 115
116// shader spec (can also be loaded from a .JSON file, or constructed at runtime) 116// shader spec (can also be loaded from a .JSON file, or constructed at runtime)
117var deformMaterialDef = 117var deformMaterialDef =
118{'shaders': 118{'shaders':
119 { 119 {
120 'defaultVShader':"assets/shaders/Basic.vert.glsl", 120 'defaultVShader':"assets/shaders/Basic.vert.glsl",
121 'defaultFShader':"assets/shaders/Deform.frag.glsl" 121 'defaultFShader':"assets/shaders/Deform.frag.glsl"
122 }, 122 },
123 'techniques': 123 'techniques':
124 { 124 {
125 'default': 125 'default':
126 [ 126 [
127 { 127 {
128 'vshader' : 'defaultVShader', 128 'vshader' : 'defaultVShader',
129 'fshader' : 'defaultFShader', 129 'fshader' : 'defaultFShader',
130 // attributes 130 // attributes
131 'attributes' : 131 'attributes' :
132 { 132 {
133 'vert' : { 'type' : 'vec3' }, 133 'vert' : { 'type' : 'vec3' },
134 'normal' : { 'type' : 'vec3' }, 134 'normal' : { 'type' : 'vec3' },
135 'texcoord' : { 'type' : 'vec2' } 135 'texcoord' : { 'type' : 'vec2' }
136 }, 136 },
137 // parameters 137 // parameters
138 'params' : 138 'params' :
139 { 139 {
140 'u_tex0': { 'type' : 'tex2d' }, 140 'u_tex0': { 'type' : 'tex2d' },
141 'u_time' : { 'type' : 'float' }, 141 'u_time' : { 'type' : 'float' },
142 'u_speed' : { 'type' : 'float' }, 142 'u_speed' : { 'type' : 'float' },
143 'u_resolution' : { 'type' : 'vec2' } 143 'u_resolution' : { 'type' : 'vec2' }
144 }, 144 },
145 145
146 // render states 146 // render states
147 'states' : 147 'states' :
148 { 148 {
149 'depthEnable' : true, 149 'depthEnable' : true,
150 'offset':[1.0, 0.1] 150 'offset':[1.0, 0.1]
151 } 151 }
152 } 152 }
153 ] 153 ]
154 } 154 }
155}; 155};
156 156
157DeformMaterial.prototype = new PulseMaterial(); 157DeformMaterial.prototype = new PulseMaterial();