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

1 files changed, 155 insertions, 26 deletions

diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 0a32447e..40f07509 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -33,12 +33,17 @@ exports.MaterialsPopup = Montage.create(Component, {
         value: ""
     },
 
+        _useSelection: {  value: false,  enumerable: true },
+        _whichMaterial: { value: "fill", enumerable: true },
+        _originalValues: {value: null,  enumerable: true },
+
         captureAction: {
                 value:function(event) {
                         switch(event._currentTarget.label)
                         {
                                 case "Cancel":
                                         console.log("Cancel material edit");
+                                        this.revertToOriginalValues();
                                         break;
                                 case "OK":
                                         console.log("Committing material with the following values:");
@@ -67,6 +72,46 @@ exports.MaterialsPopup = Montage.create(Component, {
                 }
         },
 
+        revertToOriginalValues:
+        {
+                value: function()
+                {
+                        if (this._originalValues)
+                        {
+                                this._material.importJSON( this._originalValues );
+
+                                if (this._useSelection)
+                                {
+                                        var selection = this.application.ninja.selectedElements;
+                                        if (selection && (selection.length > 0))
+                                        {
+                                                var nObjs = selection.length;
+                                                for (var iObj=0;  iObj<nObjs;  iObj++)
+                                                {
+                                                        var canvas = selection[iObj];
+                                                        var obj;
+                                                        if (canvas.elementModel && canvas.elementModel.shapeModel)  obj = canvas.elementModel.shapeModel.GLGeomObj;
+                                                        if (obj)
+                                                        {
+                                                                var matArray = obj._materialArray;
+                                                                var matTypeArray = obj._materialTypeArray;
+                                                                var nMats = matArray.length;
+                                                                for (var iMat=0;  iMat<nMats;  iMat++)
+                                                                {
+                                                                        if (matTypeArray[iMat] === this._whichMaterial)
+                                                                                matArray[iMat].importJSON( this._originalValues );
+                                                                }
+                                                                var world = obj.getWorld();
+                                                                if (world)
+                                                                        world.restartRenderLoop();
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
+        },
+
     updatePreview:
     {
         value: function(event)
@@ -103,8 +148,9 @@ exports.MaterialsPopup = Montage.create(Component, {
 
     _handlePropertyChange:
     {
-        value: function(event)
+        value: function(theEvent)
         {
+                        var event = theEvent._event;
             if(typeof event.propertyValue === "object")
             {
                 console.log(event.propertyLabel + " changed to ");
@@ -148,6 +194,37 @@ exports.MaterialsPopup = Montage.create(Component, {
                                         var value = this.decodeValue( this._propTypes[index],  propValue );
                                         this._material.setProperty( this._propNames[index],  value );
                                 }
+
+                                if (this._useSelection)
+                                {
+                                        console.log( "apply to selection" );
+
+                                        var selection = this.application.ninja.selectedElements;
+                                        if (selection && (selection.length > 0))
+                                        {
+                                                var nObjs = selection.length;
+                                                for (var iObj=0;  iObj<nObjs;  iObj++)
+                                                {
+                                                        var canvas = selection[iObj];
+                                                        var obj;
+                                                        if (canvas.elementModel && canvas.elementModel.shapeModel)  obj = canvas.elementModel.shapeModel.GLGeomObj;
+                                                        if (obj)
+                                                        {
+                                                                var matArray = obj._materialArray;
+                                                                var matTypeArray = obj._materialTypeArray;
+                                                                var nMats = matArray.length;
+                                                                for (var iMat=0;  iMat<nMats;  iMat++)
+                                                                {
+                                                                        if (matTypeArray[iMat] === this._whichMaterial)
+                                                                                matArray[iMat].setProperty( this._propNames[index], value );
+                                                                }
+                                                                var world = obj.getWorld();
+                                                                if (world)
+                                                                        world.restartRenderLoop();
+                                                        }
+                                                }
+                                        }
+                                }
                         }
                 }
         },
@@ -173,14 +250,20 @@ exports.MaterialsPopup = Montage.create(Component, {
                                         rtnValue = value;
                                         break;
 
+                                case "angle":
+                                        rtnValue = value*3.14159/180.0;
+                                        break;
+
                                 case "file":
                                         if (value && (value.length > 0))
                                         {
                                                 var index = value.lastIndexOf( "/" );
                                                 if (index < 0)  index = value.lastIndexOf( "\\" );
                                                 if (index >= 0)
+                                                {
                                                         value = value.substr( index+1 );
-                                                value = "assets\\images\\" + value;
+                                                        value = "assets/images/" + value;
+                                                }
                                                 rtnValue = value.slice(0);
                                         }
                                         break;
@@ -227,32 +310,74 @@ exports.MaterialsPopup = Montage.create(Component, {
         loadMaterials:
         {
                 enumerable: true,
-                value: function(materialID)
+                value: function(materialID,  useSelection,  whichMaterial)
                 {
-            //TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
-            this.materialsData = [];
-
-            this._materialName = materialID;
-            if(
-                                        (materialID ===  "UberMaterial")                                ||
-                                        (materialID ===  "FlatMaterial")                                ||
-                                        (materialID ===  "BumpMetalMaterial")                   ||
-                                        (materialID ===  "LinearGradientMaterial")              ||
-                                        (materialID ===  "RadialGradientMaterial")
-                                )
+                        //TODO - Hack to force repetition to draw. Setting .length = 0 did not work.
+                        this.materialsData = [];
+
+                        var material;
+                        this._materialName = materialID;
+                        if (useSelection)
                         {
-                                var material = MaterialsModel.getMaterial( materialID );
-                                if (material)
+                                this._useSelection = true;
+                                var selection = this.application.ninja.selectedElements;
+                                if (selection && (selection.length > 0))
                                 {