3 files changed, 92 insertions, 8 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 2ef83227..a3ef9d37 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -6,6 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
+var Texture = require("js/lib/rdge/texture").Texture;
+
 ///////////////////////////////////////////////////////////////////////
 // Class GLMaterial
 //      RDGE representation of a material.
@@ -18,8 +20,13 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._shaderName = "bumpMetal";
 
         this._lightDiff = [0.3, 0.3, 0.3, 1.0];
-        this._diffuseTexture = "assets/images/metal.png";
-        this._specularTexture = "assets/images/silver.png";
+        
+    //this._diffuseTexture = "assets/images/metal.png";
+        this._diffuseTexture = "texture";
+    this._diffuseWorld = null;      // the world that the texture is derived from (if there is one).
+    this._diffuseTextureObj = null;
+        
+    this._specularTexture = "assets/images/silver.png";
         this._normalTexture = "assets/images/normalMap.png";
 
     ///////////////////////////////////////////////////////////////////////
@@ -119,12 +126,30 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() );
                 this._materialNode.setShader(this._shader);
 
+        // DEBUG CODE
+        this.initWorldTextures();
+
                 // set some image maps
                 this.updateTexture(1);
         this.updateTexture(2);
         this.updateTexture(3);
         };
 
+    this.initWorldTextures = function()
+    {
+        // find the world with the given id
+        var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
+        var root = viewUtils.application.ninja.currentDocument.documentRoot;
+        this._diffuseWorld = this.findWorld( this._diffuseTexture,  root );
+        if (this._diffuseWorld)
+        {
+            var world = this.getWorld();
+            var tex = new Texture( world );
+            this._diffuseTextureObj = tex;
+            tex.loadFromCanvas( this._diffuseWorld.getCanvas() );
+        }
+    }
+
         this.updateTexture = function( index )
         {
                 var material = this._materialNode;
@@ -136,7 +161,11 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                         {
                                 var texMapName = this._propValues[this._propNames[index]];
                                 var wrap = 'REPEAT',  mips = true;
-                                var tex = this.loadTexture( texMapName, wrap, mips );
+                                var tex;
+                if ((index === 1) && this._diffuseTextureObj)
+                    tex = this._diffuseTextureObj.getTexture();
+                else
+                    tex = this.loadTexture( texMapName, wrap, mips );
 
                                 if (tex)
                                 {
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 =