Merge branch 'refs/heads/Ninja-Internal' into FileIO

7 files changed, 64 insertions, 14 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index 8e000b19..c6d664cf 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -227,14 +227,14 @@ exports.ColorController = Montage.create(Component, {
                 //
                 this.fill = color;
                 //
-                if(e._event.wasSetByCode && mode !== 'nocolor') return;
+                if(e._event.wasSetByCode) return;
                 //
                 this.setColor(mode, color, true);
             } else if (input === 'stroke') {
                 //
                 this.stroke = color;
                 //
-                if(e._event.wasSetByCode && mode !== 'nocolor') return;
+                if(e._event.wasSetByCode) return;
 
                 this.setColor(mode, color, false);
             }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 5b9e4672..f0e9458b 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -274,6 +274,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                 color = this.getShapeProperty(el, "stroke");
             }
 
+            if(!css) {
+                return null;
+            }
+
             css = this.application.ninja.colorController.colorModel.webGlToCss(color);
             return this.application.ninja.colorController.getColorObjFromCss(css);
         }
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 781695b6..fec6a478 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -761,13 +761,10 @@ World.prototype.exportJSON = function()
         // We need to rebuild everything
         if (this._useWebGL)
         {
-                var root = this._rootNode;
-                root.children = new Array();
                 if (worldObj.children && (worldObj.children.length === 1))
                 {
-                        this.init();
-                        this._geomRoot = undefined;
-                        this.importObjectsJSON( worldObj.children[0] );
+            this.rebuildTree(this._geomRoot);
+            this.restartRenderLoop();
                 }
         }
 
@@ -783,6 +780,20 @@ World.prototype.exportJSON = function()
         return jStr;
 }
 
+World.prototype.rebuildTree = function( obj )
+{
+        if (!obj)  return;
+
+        obj.buildBuffers();
+
+        if (obj.getChild()) {
+                 this.rebuildTree( obj.getChild () );
+    }
+
+        if (obj.getNext())
+                this.rebuildTree( obj.getNext() );
+}
+
 World.prototype.exportObjectsJSON = function( obj,  parentObj )
 {
         if (!obj)  return;
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index a87bdbf5..3c4e4bbf 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -302,6 +302,7 @@ var GeomObj = function GLGeomObj() {
                                 case "deform":
                                 case "water":
                                 case "paris":
+                                case "raiders":
                                 case "tunnel":
                                 case "reliefTunnel":
                                 case "squareTunnel":
@@ -375,6 +376,7 @@ var GeomObj = function GLGeomObj() {
                                 case "deform":
                                 case "water":
                                 case "paris":
+                                case "raiders":
                                 case "tunnel":
                                 case "reliefTunnel":
                                 case "squareTunnel":
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index f4a4baa2..fee02a1d 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -282,10 +282,26 @@ var RaidersMaterial = function RaidersMaterial()
         this.inheritedFrom();
 
         this._name = "RaidersMaterial";
-        this._shaderName = "radialBlur";
+        this._shaderName = "raiders";
 
         this._texMap = 'assets/images/raiders.png';
         this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+
+
+    // duplcate method requirde
+    this.dup = function( world ) {
+        // allocate a new uber material
+        var newMat = new RaidersMaterial();
+
+        // copy over the current values;
+        var propNames = [],  propValues = [],  propTypes = [],  propLabels = [];
+        this.getAllProperties( propNames,  propValues,  propTypes,  propLabels);
+        var n = propNames.length;
+        for (var i=0;  i<n;  i++)
+            newMat.setProperty( propNames[i], propValues[i] );
+
+        return newMat;
+    };
 }
 
 RaidersMaterial.prototype = new Material();
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 692ac09a..44364aa2 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -238,6 +238,7 @@ exports.MaterialsModel = Montage.create(Component, {
                                         case "fly":                                     mat = new FlyMaterial();                                break;
                                         case "water":                           mat = new WaterMaterial();                              break;
                                         case "paris":                           mat = new ParisMaterial();                              break;
+                                        case "raiders":                 mat = new RaidersMaterial();                break;
                                         case "zinvert":                         mat = new ZInvertMaterial();                    break;
                                         case "deform":                          mat = new DeformMaterial();                             break;
                                         case "star":                            mat = new StarMaterial();                               break;
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 927b86cf..d627f03b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -148,7 +148,11 @@ exports.EyedropperTool = Montage.create(toolBase, {
                         c = this._getColorFromElement(obj, event);
                     }
 
-                    if(typeof(c) === "string")
+                    if(!c)
+                    {
+                        color = null;
+                    }
+                    else if(typeof(c) === "string")
                     {
                         color = this.application.ninja.colorController.getColorObjFromCss(c);
                     }
@@ -368,7 +372,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
                 this._imageDataContext = this._imageDataCanvas.getContext("2d");
                 if(isWebGl)
                 {
-                    var worldData = elt.elementModel.shapeModel.GLWorld.export();
+                    var worldData = elt.elementModel.shapeModel.GLWorld.exportJSON();
                     if(worldData)
                     {
                         this._webGlDataCanvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, true);
@@ -379,12 +383,24 @@ exports.EyedropperTool = Montage.create(toolBase, {
                         this._webGlDataCanvas.width = w;
                         this._webGlDataCanvas.height = h;
                         this._webGlWorld = new World(this._webGlDataCanvas, true, true);
-                        this._webGlWorld.import(worldData);
+
+                        var index = worldData.indexOf( ';' );
+                        if ((worldData[0] === 'v') && (index < 24))
+                        {
+                            // JSON format.  separate the version info from the JSON info
+                            var jStr = worldData.substr( index+1 );
+                            worldData = JSON.parse( jStr );
+                        }
+
+                        this._webGlWorld.importJSON(worldData);
                         this._webGlWorld.render();
                         setTimeout(function() {
-                            this._webGlWorld.draw();
-                            this._imageDataContext.drawImage(this._webGlDataCanvas, 0, 0);
-                            return this._getColorFromCanvas(this._imageDataContext, tmpPt, true);
+                            if(this._webGlWorld)
+                            {
+                                this._webGlWorld.draw();
+                                this._imageDataContext.drawImage(this._webGlDataCanvas, 0, 0);
+                                return this._getColorFromCanvas(this._imageDataContext, tmpPt, true);
+                            }
                         }.bind(this), 250);
                     }