Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/lib/drawing/world.js
	js/lib/geom/geom-obj.js
	js/lib/rdge/materials/cloud-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js

1 files changed, 41 insertions, 0 deletions

diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index e0bf3364..bcbcb4bc 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.js
@@ -112,6 +112,7 @@ function Texture( dstWorld, texMapName,  wrap, mips )
                                 switch (type)
                                 {
                                         case notifier.OBJECT_DELETE:
+                                                texture.rebuildSrcLocally();
                                                 break;
 
                                         case notifier.OBJECT_REINSTANTIATE:
@@ -134,6 +135,30 @@ function Texture( dstWorld, texMapName,  wrap, mips )
                 }
         }
 
+        this.rebuildSrcLocally = function()
+        {
+                var srcWorld = this._srcWorld;
+                if (srcWorld)
+                {
+                        // get the data from the old world
+                        var jStr = srcWorld.exportJSON();
+                        var jObj = JSON.parse( jStr );
+                        var oldCanvas = srcWorld.getCanvas();
+
+                        // create a new canvas
+                        this._srcCanvas = NJUtils.makeNJElement("canvas", canvasID, "shape", {"data-RDGE-id": NJUtils.generateRandom()}, true);
+                        srcCanvas = this._srcCanvas;
+                        srcCanvas.width  = oldCanvas.width;
+                        srcCanvas.height = oldCanvas.height;
+
+                        // rebuild the world
+                        this._srcWorld = new GLWorld( this._srcCanvas, true, true );
+                        this._srcWorld.importSJON( jObj );
+
+                        this._isLocal = true;
+                }
+        }
+
         this.loadFromFile = function()
         {
                 var tex = this._texture;
@@ -197,6 +222,12 @@ function Texture( dstWorld, texMapName,  wrap, mips )
                 }
                 var srcCanvas = this._srcCanvas;
 
+                if (this._isLocal)
+                {
+                        this._srcWorld.update();
+                        this._srcWorld.draw();
+                }
+
                 var world = this.getDstWorld();
                 if (!world)
                 {
@@ -233,9 +264,19 @@ function Texture( dstWorld, texMapName,  wrap, mips )
 
                 // copy the source canvas to the context to be used in the texture
                 renderCtx.drawImage(srcCanvas, 0, 0, width, height);
+                /*
+                renderCtx.fillStyle = "#00000a";
+                renderCtx.fillRect(0, 0, width, height );
+                var imageData = renderCtx.getImageData(0,0,width, height);
+                for (var i=3;  i<imageData.data.length;  i+=4)
+                {
+                        imageData.data[i] = 128;
+                }
+                */
 
                 /////////////////
                 tex.image = renderCanvas;
+
                 renderer.commitTexture( tex );
 
                 return tex;