aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/square-tunnel-material.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:16:17 -0700
committerValerio Virgillito2012-07-09 14:18:36 -0700
commit1bbba17e8605434356de0a477710d6a0136986fc (patch)
tree7cdc80226b776c6fb2250e250acdbcd53fdb1ddd /js/lib/rdge/materials/square-tunnel-material.js
parentdc5b7a479a185dda8e9a09f4bbe26bd290641624 (diff)
parentab80aa9c7da912db384ec48c656f84fd673b5253 (diff)
downloadninja-1bbba17e8605434356de0a477710d6a0136986fc.tar.gz
Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal
Conflicts: js/lib/geom/circle.js js/lib/rdge/materials/linear-gradient-material.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/lib/rdge/materials/square-tunnel-material.js')
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js10
1 files changed, 10 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/square-tunnel-material.js b/js/lib/rdge/materials/square-tunnel-material.js
index 833ca1c2..e8066f6b 100644
--- a/js/lib/rdge/materials/square-tunnel-material.js
+++ b/js/lib/rdge/materials/square-tunnel-material.js
@@ -89,6 +89,16 @@ var SquareTunnelMaterial = function SquareTunnelMaterial() {
89 this.setResolution([world.getViewportWidth(), world.getViewportHeight()]); 89 this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
90 this.update(0); 90 this.update(0);
91 }; 91 };
92
93 this.resetToDefault = function()
94 {
95 this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
96 this._propValues[this._propNames[u_speed_index]] = 1.0;
97
98 var nProps = this._propNames.length;
99 for (var i=0; i<nProps; i++)
100 this.setProperty( this._propNames[i], this._propValues[this._propNames[i]] );
101 };
92}; 102};
93 103
94/////////////////////////////////////////////////////////////////////////////////////// 104///////////////////////////////////////////////////////////////////////////////////////