3 files changed, 341 insertions, 3 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 73273adc..d314760b 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -30,6 +30,7 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
     this._canvas = canvas;
         if (this._useWebGL) {
+        preserveDrawingBuffer = true;
         if(preserveDrawingBuffer) {
             this._glContext = canvas.getContext("experimental-webgl", {preserveDrawingBuffer: true});
         } else {
diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 2ef83227..9c9a189a 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,53 @@ 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( world.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;
@@ -136,7 +184,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/texture.js b/js/lib/rdge/texture.js
new file mode 100644
index 00000000..c72864b8
--- /dev/null
+++ b/js/lib/rdge/texture.js
@@ -0,0 +1,285 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var Material = require("js/lib/rdge/materials/material").Material;
+
+///////////////////////////////////////////////////////////////////////
+// Class GLTexture
+//      GL representation of a texture.
+///////////////////////////////////////////////////////////////////////
+function Texture( dstWorld )
+{
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+        this._texture;
+
+        // 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;
+
+    ///////////////////////////////////////////////////////////////////////
+    // 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;       }
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+
+        this.loadFromFile = function( texMapName,  wrap,  mips )
+        {
+                var tex = this._texture;
+                this._srcCanvas = null;
+
+                // only load if something has changed
+                if (this._texMapName !== texMapName)    // does RDGE allow us to change wrap or mips?
+                {
+                        this._texMapName = texMapName.slice();
+                        this._wrap = wrap;
+                        this._mips = mips;
+
+                        var dstWorld = this.getDstWorld();
+                        if (dstWorld)
+                        {
+                                var renderer = dstWorld.getRenderer();
+                                tex = renderer.getTextureByName(texMapName, wrap, mips );
+                                this._texture = tex;
+                                dstWorld.textureToLoad( tex );
+                        }
+                }
+
+                return tex;
+        }
+
+    var __texCounter = 0;
+
+    /*
+        this.loadFromCanvas = function( srcCanvas,  wrap, mips )
+        {
+                this._texMapName = "GLTexture_" + __texCounter;
+                __texCounter++;
+
+                //if (elt.elementModel && elt.elementModel.shapeModel && elt.elementModel.shapeModel.GLWorld)
+                var world = this.getDstWorld();
+                var renderer = world.getRenderer();
+
+                // set default values for wrap and mips
+        if (wrap === undefined)
+            wrap = "REPEAT";
+        if (mips === undefined)
+            mips = true;
+
+                var imageData;
+                var width = srcCanvas.width,  height = srcCanvas.height;
+                width = 64;  height = 64;       // some even power of 2 for now...
+
+                // create a canvas to be used as the image for the texture map
+                var doc = srcCanvas.ownerDocument;
+                var dstCanvas = doc.createElement("canvas");
+                dstCanvas.width = width;
+                dstCanvas.height = height;
+                var dstCtx = dstCanvas.getContext("2d");
+
+                var tex;
+                var srcCtx = srcCanvas.getContext("2d");
+                if (srcCtx)
+                {
+                        tex = renderer.getTextureByName(this._texMapName, wrap, mips );
+                        imageData = srcCtx.getImageData( 0, 0, width, height );
+                    dstCtx.putImageData( imageData, 0, 0 );
+                }
+                else
+                {