aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials/material.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-12 15:43:33 -0700
committerValerio Virgillito2012-07-12 15:43:33 -0700
commitc250404e7e1b8015ccc4967a102e2d3873f2d83a (patch)
treefccede2bcb093658b0da15368bfc66bceea7a7d8 /js/lib/rdge/materials/material.js
parent393b86e1c94147b55f761631beef844f7cdc55b7 (diff)
parent2880e1d55a374d48cf39ee074a7a812cd57e1092 (diff)
downloadninja-c250404e7e1b8015ccc4967a102e2d3873f2d83a.tar.gz
Merge branch 'refs/heads/master' into v0.7.1
Diffstat (limited to 'js/lib/rdge/materials/material.js')
-rwxr-xr-xjs/lib/rdge/materials/material.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 0f6f6c92..e8571e9d 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -57,7 +57,7 @@ var Material = function GLMaterial( world ) {
57 // vertex deformation variables 57 // vertex deformation variables
58 this._hasVertexDeformation = false; 58 this._hasVertexDeformation = false;
59 this._vertexDeformationRange = [0, 0, 1, 1]; // (xMin, yMin, xMax, yMax) 59 this._vertexDeformationRange = [0, 0, 1, 1]; // (xMin, yMin, xMax, yMax)
60 this._vertexDeformationTolerance = 0.02; 60 this._vertexDeformationTolerance = 0.1;
61 61
62 // RDGE variables 62 // RDGE variables
63 this._shader = null; 63 this._shader = null;