aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/Materials
diff options
context:
space:
mode:
authorhwc4872012-02-03 15:18:45 -0800
committerhwc4872012-02-03 15:18:45 -0800
commit3d5b5f7c5efb25b5e605d5d120b57f2dde33fd23 (patch)
treea2b2e55cf968221528408670b9da395ab2110d6d /js/helper-classes/RDGE/Materials
parent7dd20aec0a91731c2acaa0abfa66b754b6c82fe6 (diff)
downloadninja-3d5b5f7c5efb25b5e605d5d120b57f2dde33fd23.tar.gz
Added a counter to the renderer that tracks the number of unloaded texture maps.
Started vertex deformations.
Diffstat (limited to 'js/helper-classes/RDGE/Materials')
-rw-r--r--js/helper-classes/RDGE/Materials/FlatMaterial.js1
-rw-r--r--js/helper-classes/RDGE/Materials/LinearGradientMaterial.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/Materials/FlatMaterial.js b/js/helper-classes/RDGE/Materials/FlatMaterial.js
index 3e3ae25e..c8eb3b6c 100644
--- a/js/helper-classes/RDGE/Materials/FlatMaterial.js
+++ b/js/helper-classes/RDGE/Materials/FlatMaterial.js
@@ -121,6 +121,7 @@ function FlatMaterial()
121flatShaderDef = 121flatShaderDef =
122{ 122{
123 'shaders': { // shader files 123 'shaders': { // shader files
124 //'defaultVShader':"assets/shaders/Taper.vert.glsl",
124 'defaultVShader':"assets/shaders/Basic.vert.glsl", 125 'defaultVShader':"assets/shaders/Basic.vert.glsl",
125 'defaultFShader':"assets/shaders/Basic.frag.glsl", 126 'defaultFShader':"assets/shaders/Basic.frag.glsl",
126 }, 127 },
diff --git a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
index ce965296..8b23d77e 100644
--- a/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
+++ b/js/helper-classes/RDGE/Materials/LinearGradientMaterial.js
@@ -135,8 +135,10 @@ function LinearGradientMaterial()
135 // duplcate method requirde 135 // duplcate method requirde
136 this.dup = function() { return new LinearGradientMaterial(); } 136 this.dup = function() { return new LinearGradientMaterial(); }
137 137
138 this.init = function() 138 this.init = function( world )
139 { 139 {
140 this.setWorld( world );
141
140 // set up the shader 142 // set up the shader
141 this._shader = new jshader(); 143 this._shader = new jshader();
142 this._shader.def = linearGradientMaterialDef; 144 this._shader.def = linearGradientMaterialDef;