5 files changed, 211 insertions, 257 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index d314760b..e3818178 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -327,6 +327,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
                 var rtnVal = false;
                 if (root) {
                         rtnVal = this.hHasAnimatedMaterials( root );
+            this._hasAnimatedMaterials = rtnVal;
         }
 
                 return rtnVal;
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 9c9a189a..a3ef9d37 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -146,33 +146,10 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
             var world = this.getWorld();
             var tex = new Texture( world );
             this._diffuseTextureObj = tex;
-            tex.loadFromCanvas( world.getCanvas() );
+            tex.loadFromCanvas( this._diffuseWorld.getCanvas() );
         }
     }
 
-    this.findWorld = function( id,  elt )
-    {
-        if (elt.id && elt.id === id)
-        {
-            if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
-            {
-                var world = elt.elementModel.shapeModel.GLWorld;
-                return world;
-            }
-        }
- 
-                if (elt.children)
-                {
-                        var nKids = elt.children.length;
-                        for (var i=0;  i<nKids;  i++)
-                        {
-                                var child = elt.children[i];
-                                var world = this.findWorld( id, child );
-                if (world)  return world;
-                        }
-                }
-   }
-
         this.updateTexture = function( index )
         {
                 var material = this._materialNode;
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index c1d13b15..157fa7db 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -252,6 +252,29 @@ var Material = function GLMaterial( world ) {
                 return tex;
         };
 
+    this.findWorld = function( id,  elt )
+    {
+        if (elt.id && elt.id === id)
+        {
+            if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
+            {
+                var world = elt.elementModel.shapeModel.GLWorld;
+                return world;
+            }
+        }
+ 
+                if (elt.children)
+                {
+                        var nKids = elt.children.length;
+                        for (var i=0;  i<nKids;  i++)
+                        {
+                                var child = elt.children[i];
+                                var world = this.findWorld( id, child );
+                if (world)  return world;
+                        }
+                }
+   }
+
         this.export = function() {
                 // this function should be overridden by subclasses
                 var exportStr = "material: " + this.getShaderName() + "\n" + "endMaterial\n";
diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 2075d1ff..5461c5fb 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -5,19 +5,28 @@
  </copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
+var Texture = require("js/lib/rdge/texture").Texture;
 var Material = require("js/lib/rdge/materials/material").Material;
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
 ///////////////////////////////////////////////////////////////////////
-var PulseMaterial = function PulseMaterial() {
+var PulseMaterial = function PulseMaterial()
+{
+    var MaterialLibrary = require("js/models/materials-model").MaterialsModel;
+
+   // initialize the inherited members
+    this.inheritedFrom = Material;
+    this.inheritedFrom();
+   
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
         this._name = "PulseMaterial";
         this._shaderName = "pulse";
 
-        this._texMap = 'assets/images/cubelight.png';
+        //this._texMap = 'assets/images/cubelight.png';
+        this._texMap = 'texture';
 
         this._time = 0.0;
         this._dTime = 0.01;
@@ -109,6 +118,16 @@ var PulseMaterial = function PulseMaterial() {
                         this._shader['default'].u_time.set( [this._time] );
         }
 
+        // check if the texture uses a canvas as the source
+        var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+        var root = viewUtils.application.ninja.currentDocument.documentRoot;
+        var texMapName = this._propValues[this._propNames[0]];
+        var texWorld = this.findWorld( texMapName, root );
+        if (texWorld)
+        {
+            this._glTex = new Texture( this.getWorld() );
+            this._glTex.loadFromCanvas( texWorld.getCanvas() );
+        }
 
                 // set the shader values in the shader
                 this.updateTexture();
@@ -122,9 +141,18 @@ var PulseMaterial = function PulseMaterial() {
                         var technique = material.shaderProgram['default'];
                         var renderer = g_Engine.getContext().renderer;
                         if (renderer && technique) {
-                                var texMapName = this._propValues[this._propNames[0]];
                                 var wrap = 'REPEAT',  mips = true;
-                                var tex = this.loadTexture( texMapName, wrap, mips );
+                var tex;
+                if (this._glTex)
+                {
+                    this._glTex.rerender();
+                    tex = this._glTex.getTexture();
+                }
+                else
+                {
+                    var texMapName = this._propValues[this._propNames[0]];
+                                    tex = this.loadTexture( texMapName, wrap, mips );
+                }
 
                                 if (tex) {
                                         technique.u_tex0.set( tex );
@@ -138,6 +166,9 @@ var PulseMaterial = function PulseMaterial() {
                 var material = this._materialNode;
                 if (material)
                 {
+            if (this._glTex && this._glTex.isAnimated())
+                this.updateTexture();
+
                         var technique = material.shaderProgram['default'];
                         var renderer = g_Engine.getContext().renderer;
                         if (renderer && technique) {
@@ -279,7 +310,8 @@ var pulseMaterialDef =
         }
 };
 
-PulseMaterial.prototype = new Material();
+// doing the inheritance here introtudes bugs.  Local instance variables are overwritten in the base class
+//PulseMaterial.prototype = new Material();
 
 if (typeof exports === "object") {
     exports.PulseMaterial = PulseMaterial;
diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index c72864b8..b349ee62 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.js
@@ -15,267 +15,188 @@ function Texture( dstWorld )
     ///////////////////////////////////////////////////////////////////////
     // Instance variables
     ///////////////////////////////////////////////////////////////////////
-        this._texture;
+    this._texture;
 
-        // texture attributes
-        this._texMapName;
-        this._wrap;
-        this._mips;
+    // texture attributes
+    this._texMapName;
+    this._wrap;
+    this._mips;
 
-        this._srcCanvas;        // the canvas generating the texture map.
-        this._dstWorld;         // the world that will use the texture map
-        this._dstWorld = dstWorld;
+    this._srcCanvas;    // the canvas generating the texture map.
+    this._dstWorld;             // the world that will use the texture map
+    this._dstWorld = dstWorld;