Added Flag material

4 files changed, 273 insertions, 266 deletions

diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index 77991a8c..8d4d1ee3 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -23,6 +23,8 @@ var FlagMaterial = function FlagMaterial() {
     this._defaultWaveWidth = 1.0;
     this._defaultWaveHeight = 1.0;
 
+        this._hasVertexDeformation = true;
+
     ///////////////////////////////////////////////////////////////////////
     // Properties
     ///////////////////////////////////////////////////////////////////////
@@ -37,6 +39,10 @@ var FlagMaterial = function FlagMaterial() {
     this._propValues[ this._propNames[1] ] = this._defaultWaveWidth;
     this._propValues[ this._propNames[2] ] = this._defaultWaveHeight;
 
+        // a material can be animated or not. default is not.  
+        // Any material needing continuous rendering should override this method
+        this.isAnimated = function() {  return true;  };
+
     ///////////////////////////////////////////////////////////////////////
     // Methods
     ///////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 13251ce8..a81ca18f 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -38,6 +38,11 @@ var Material = function GLMaterial( world ) {
         this._shader = null;
         this._materialNode = null;
 
+        // vertex deformation variables
+        this._hasVertexDeformation = false;
+        this._vertexDeformationRange = [0, 0, 1, 1];    // (xMin, yMin, xMax, yMax)
+        this._vertexDeformationTolerance = 0.02;
+
     ///////////////////////////////////////////////////////////////////////
     // Property Accessors
     ///////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js
index 2d2cdcc5..802690a2 100644
--- a/js/lib/rdge/materials/twist-vert-material.js
+++ b/js/lib/rdge/materials/twist-vert-material.js
@@ -36,6 +36,7 @@ function TwistVertMaterial()
         this.getShaderName                      = function()    {  return this._shaderName;                             }
 
         this.isAnimated                         = function()    {  return true;                                                 }
+        
         this.hasVertexDeformation       = function()    {  return this._hasVertexDeformation;   }
         this._hasVertexDeformation      = true;
         this._vertexDeformationTolerance = 0.02;        // should be a property
diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index 83509f80..2e76f2c0 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.js
@@ -12,264 +12,259 @@ var Material = require("js/lib/rdge/materials/material").Material;
 ///////////////////////////////////////////////////////////////////////
 function Texture( dstWorld, texMapName,  wrap, mips )
 {
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-    this._texture;
-
-    // texture attributes
-    this._texMapName = texMapName.slice();
-
-    // set default values for wrap and mips
-    if (wrap === undefined)
-        wrap = "REPEAT";
-    if (mips === undefined)
-        mips = true;
-    this._wrap = wrap;
-    this._mips = mips;
+        ///////////////////////////////////////////////////////////////////////
+        // Instance variables
+        ///////////////////////////////////////////////////////////////////////
+        this._texture;
+
+        // texture attributes
+        this._texMapName = texMapName.slice();
+
+        // set default values for wrap and mips
+        if (wrap === undefined)
+                wrap = "REPEAT";
+        if (mips === undefined)
+                mips = true;
+        this._wrap = wrap;
+        this._mips = mips;
 
    // the canvas generating the texture map (if there is one)
-    this._srcCanvas;    
-    this._srcWorld;
-
-    // cache whether or not the source is animated
-    this._isAnimated = false;
-    
-    // the destination world that will use the texture map
-    this._dstWorld = dstWorld;
-
-    ///////////////////////////////////////////////////////////////////////
-    // Property Accessors
-    ///////////////////////////////////////////////////////////////////////
-    this.getTexture             = function()    {  return this._texture;        }
-
-    this.setSrcWorld    = function(w)   {  this._srcWorld = w;          }
-    this.getSrcWorld    = function()    {  return this._srcWorld;       }
-
-    this.setDstWorld    = function(w)   {  this._dstWorld = w;          }
-    this.getDstWorld    = function()    {  return this._dstWorld;       }
-
-    this.isAnimated     = function()    {  return this._isAnimated; }
-
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
-
-    this.init = function()
-    {
-        // determine if the source is a canvas or an image file
-        var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
-        var root = viewUtils.application.ninja.currentDocument.documentRoot;
-        var srcCanvas = this.findCanvas( this._texMapName, root );
-        if (srcCanvas)
-        {
-            this._srcCanvas = srcCanvas;
-            if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel && srcCanvas.elementModel.shapeModel.GLWorld)
-            {
-                this._srcWorld = srcCanvas.elementModel.shapeModel.GLWorld;
-
-                // add a notifier to the world
-                this._srcWorld.addListener( this,  this.worldCallback,  { srcWorld: this._srcWorld } );
-
-                // check if the source is animated
-                if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel  && srcCanvas.elementModel.shapeModel.GLWorld)
-                    this._isAnimated = this._srcWorld._hasAnimatedMaterials;
-            }
-
-            this.loadFromCanvas();
-        }
-        else
-        {
-            this.loadFromFile();  
-        }
-    }
-
-    this.worldCallback = function( type, callbackObj,  calleeData,  callerData )
-    {
-        console.log( "texture callback, type: " + type );
-        if (calleeData.srcWorld)
-        {
-            var srcWorld = calleeData.srcWorld;
-            var notifier = srcWorld._notifier;
-            var texture = this.callbackObj;
-            if (texture)
-            {
-                switch (type)
-                {
-                    case notifier.OBJECT_DELETE:
-                        break;
-
-                    case notifier.OBJECT_REINSTANTIATE:
-                        break;
-
-                    case notifier.OBJECT_CHANGE:
-                        if (!texture.isAnimated())
-                            texture.rerender();
-                            texture.getDstWorld().restartRenderLoop();
-                        break;
-
-                    default:
-                        throw new Exception( "unrecognized texture callback type: " + type );
-                        break;
-                }
-           }
-        }
-    }
-
+        this._srcCanvas;        
+        this._srcWorld;
+
+        // cache whether or not the source is animated
+        this._isAnimated = false;
+        
+        // the destination world that will use the texture map
+        this._dstWorld = dstWorld;
+
+        ///////////////////////////////////////////////////////////////////////
+        // Property Accessors
+        ///////////////////////////////////////////////////////////////////////
+        this.getTexture         = function()    {  return this._texture;        }
+
+        this.setSrcWorld        = function(w)   {  this._srcWorld = w;          }
+        this.getSrcWorld        = function()    {  return this._srcWorld;       }
+
+        this.setDstWorld        = function(w)   {  this._dstWorld = w;          }
+        this.getDstWorld        = function()    {  return this._dstWorld;       }
+
+        this.isAnimated     = function()    {  return this._isAnimated; }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Methods
+        ///////////////////////////////////////////////////////////////////////
+
+        this.init = function()
+        {
+                // determine if the source is a canvas or an image file
+                var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+                var root = viewUtils.application.ninja.currentDocument.documentRoot;
+                var srcCanvas = this.findCanvas( this._texMapName, root );
+                if (srcCanvas)
+                {
+                        this._srcCanvas = srcCanvas;
+                        if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel && srcCanvas.elementModel.shapeModel.GLWorld)
+                        {
+                                this._srcWorld = srcCanvas.elementModel.shapeModel.GLWorld;
+
+                                // add a notifier to the world
+                                this._srcWorld.addListener( this,  this.worldCallback,  { srcWorld: this._srcWorld } );
+
+                                // check if the source is animated
+                                if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel  && srcCanvas.elementModel.shapeModel.GLWorld)
+                                        this._isAnimated = this._srcWorld._hasAnimatedMaterials;
+                        }
+
+                        this.loadFromCanvas();
+                }
+                else
+                {
+                        this.loadFromFile();  
+                }
+        }
+
+        this.worldCallback = function( type, callbackObj,  calleeData,  callerData )
+        {
+                console.log( "texture callback, type: " + type );
+                if (calleeData.srcWorld)
+                {
+                        var srcWorld = calleeData.srcWorld;
+                        var notifier = srcWorld._notifier;
+                        var texture = this.callbackObj;
+                        if (texture)
+                        {
+                                switch (type)
+                                {
+                                        case notifier.OBJECT_DELETE:
+                                                break;
+
+                                        case notifier.OBJECT_REINSTANTIATE:
+                                                break;
+
+                                        case notifier.OBJECT_CHANGE:
+                                                if (!texture.isAnimated())
+                                                        texture.rerender();
+                                                        texture.getDstWorld().restartRenderLoop();
+                                                break;
+
+                                        default:
+                                                throw new Exception( "unrecognized texture callback type: " + type );
+                                                break;
+                                }
+                   }
+                }
+        }
+