aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-12 16:06:49 -0700
committerJose Antonio Marquez2012-07-12 16:06:49 -0700
commit3f5958b79392457bb13e65819d502065d05b1db1 (patch)
tree7fab6d64b907eac2cc9795fc90ad0ec5b7b8f5d1 /js/lib/rdge/materials
parent2dd8fabacf115cf32e38115a472f3f2c59926135 (diff)
parent2880e1d55a374d48cf39ee074a7a812cd57e1092 (diff)
downloadninja-3f5958b79392457bb13e65819d502065d05b1db1.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to 'js/lib/rdge/materials')
-rwxr-xr-xjs/lib/rdge/materials/material.js2
-rw-r--r--js/lib/rdge/materials/taper-material.js2
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js2
3 files changed, 3 insertions, 3 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;
diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js
index 73e344d5..929dffa6 100644
--- a/js/lib/rdge/materials/taper-material.js
+++ b/js/lib/rdge/materials/taper-material.js
@@ -61,7 +61,7 @@ var TaperMaterial = function TaperMaterial()
61 61
62 this.hasVertexDeformation = function () { return this._hasVertexDeformation; }; 62 this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
63 this._hasVertexDeformation = true; 63 this._hasVertexDeformation = true;
64 this._vertexDeformationTolerance = 0.02; // should be a property 64 this._vertexDeformationTolerance = 0.1; // should be a property
65 65
66 this.getVertexDeformationTolerance = function() { return this._propValues[this._propNames[7]]; }; 66 this.getVertexDeformationTolerance = function() { return this._propValues[this._propNames[7]]; };
67 67
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 57ef23ea..c7e7dcc8 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -65,7 +65,7 @@ var TwistVertMaterial = function TwistVertMaterial()
65 65
66 this.hasVertexDeformation = function () { return this._hasVertexDeformation; }; 66 this.hasVertexDeformation = function () { return this._hasVertexDeformation; };
67 this._hasVertexDeformation = true; 67 this._hasVertexDeformation = true;
68 this._vertexDeformationTolerance = 0.02; // should be a property 68 this._vertexDeformationTolerance = 0.1; // should be a property
69 69
70 /////////////////////////////////////////////////////////////////////// 70 ///////////////////////////////////////////////////////////////////////
71 // Material Property Accessors 71 // Material Property Accessors