diff options
Diffstat (limited to 'js/lib/rdge/materials/material.js')
-rwxr-xr-x | js/lib/rdge/materials/material.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js index 65448c0c..34524097 100755 --- a/js/lib/rdge/materials/material.js +++ b/js/lib/rdge/materials/material.js | |||
@@ -32,16 +32,12 @@ var Material = function GLMaterial( world ) { | |||
32 | // vertex deformation variables | 32 | // vertex deformation variables |
33 | this._hasVertexDeformation = false; | 33 | this._hasVertexDeformation = false; |
34 | this._vertexDeformationRange = [0, 0, 1, 1]; // (xMin, yMin, xMax, yMax) | 34 | this._vertexDeformationRange = [0, 0, 1, 1]; // (xMin, yMin, xMax, yMax) |
35 | this._vertexDeformationTolerance = 0.1; | 35 | this._vertexDeformationTolerance = 0.02; |
36 | 36 | ||
37 | // RDGE variables | 37 | // RDGE variables |
38 | this._shader = null; | 38 | this._shader = null; |
39 | this._materialNode = null; | 39 | this._materialNode = null; |
40 | 40 | ||
41 | // vertex deformation variables | ||
42 | this._hasVertexDeformation = false; | ||
43 | this._vertexDeformationRange = [0, 0, 1, 1]; // (xMin, yMin, xMax, yMax) | ||
44 | this._vertexDeformationTolerance = 0.02; | ||
45 | 41 | ||
46 | /////////////////////////////////////////////////////////////////////// | 42 | /////////////////////////////////////////////////////////////////////// |
47 | // Property Accessors | 43 | // Property Accessors |
@@ -366,6 +362,10 @@ var Material = function GLMaterial( world ) { | |||
366 | throw new Error( "Material.init() must be overridden by subclass" ); | 362 | throw new Error( "Material.init() must be overridden by subclass" ); |
367 | }; | 363 | }; |
368 | 364 | ||
365 | this.resetToDefault = function() { | ||
366 | // materials should override this functinon | ||
367 | }; | ||
368 | |||
369 | this.update = function( time ) { | 369 | this.update = function( time ) { |
370 | // animated materials should implement the update method | 370 | // animated materials should implement the update method |
371 | }; | 371 | }; |
@@ -374,6 +374,10 @@ var Material = function GLMaterial( world ) { | |||
374 | // some materials need to preserve an aspect ratio - or someting else. | 374 | // some materials need to preserve an aspect ratio - or someting else. |
375 | }; | 375 | }; |
376 | 376 | ||
377 | this.fitToPrimitiveArray = function( primArray ) { | ||
378 | // some materials need to preserve an aspect ratio - or someting else. | ||
379 | }; | ||
380 | |||
377 | this.registerTexture = function( texture ) { | 381 | this.registerTexture = function( texture ) { |
378 | // the world needs to know about the texture map | 382 | // the world needs to know about the texture map |
379 | var world = this.getWorld(); | 383 | var world = this.getWorld(); |