1 files changed, 74 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 bd10f7a5..1e92e144 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -18,6 +18,8 @@ exports.MaterialsPopup = Montage.create(Component, {
         value: ""
     },
 
+        _useSelection: {  value: false,  enumerable: true },
+
         captureAction: {
                 value:function(event) {
                         switch(event._currentTarget.label)
@@ -88,8 +90,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 ");
@@ -133,6 +136,11 @@ 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" );
+                                }
                         }
                 }
         },
@@ -164,8 +172,10 @@ exports.MaterialsPopup = Montage.create(Component, {
                                                 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;
@@ -212,32 +222,70 @@ 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))
                                 {
-                                        this._material = material;
-                    this.materialsData = this.getMaterialData( material );
+                                        var canvas = selection[0];
+                                        var obj;
+                                        if (canvas.elementModel && canvas.elementModel.shapeModel)  obj = canvas.elementModel.shapeModel.GLGeomObj;
+                                        if (obj)
+                                                material = (whichMaterial === 'stroke') ? obj.getStrokeMaterial() : obj.getFillMaterial();
                                 }
-            }
-            else
-            {
-                this.materialsData = this[materialID];
-            }
-            this.needsDraw = true;
+                        }
+                        else
+                        {
+                                this._useSelection = false;
+
+                                if(
+                                                (materialID ===  "BumpMetalMaterial")           ||
+                                                (materialID ===  "DeformMaterial")                      ||
+                                                (materialID ===  "FlatMaterial")                        ||
+                                                (materialID ===  "FlagMaterial")                        ||
+                                                (materialID ===  "FlyMaterial")                         ||
+                                                (materialID ===  "JuliaMaterial")                       ||
+                                                (materialID ===  "KeleidoscopeMaterial")        ||
+                                                (materialID ===  "LinearGradientMaterial")      ||
+                                                (materialID ===  "MandelMaterial")                      ||
+                                                (materialID ===  "PlasmaMaterial")                      ||
+                                                (materialID ===  "PulseMaterial")                       ||
+                                                (materialID ===  "RadialBlurMaterial")          ||
+                                                (materialID ===  "RadialGradientMaterial")      ||
+                                                (materialID ===  "ReliefTunnelMaterial")        ||
+                                                (materialID ===  "SquareTunnelMaterial")        ||
+                                                (materialID ===  "StarMaterial")                        ||
+                                                (materialID ===  "TaperMaterial")                       ||
+                                                (materialID ===  "TunnelMaterial")                      ||
+                                                (materialID ===  "TwistMaterial")                       ||
+                                                (materialID ===  "TwistVertMaterial")           ||
+                                                (materialID ===  "UberMaterial")                        ||
+                                                (materialID ===  "WaterMaterial")                       ||
+                                                (materialID ===  "ZInvertMaterial")
+                                        )
+                                {
+                                        material = MaterialsModel.getMaterial( materialID );
+                                }
+                        }
+                                
+                        if (material)
+                        {
+                                this._material = material;
+                                this.materialsData = this.getMaterialData( material );
+                        }
+                        else
+                        {
+                                this.materialsData = this[materialID];
+                        }
+                        this.needsDraw = true;
                 }
         },
 
@@ -304,7 +352,7 @@ exports.MaterialsPopup = Montage.create(Component, {
         {
                 value:  function( label,  color )
                 {
-            var css = 'rgba(' + color[0]*255 + ',' + color[1]*255 + ',' + color[2]*255 + ',' + color[3] + ')';
+            var css = 'rgba(' + Math.floor(color[0]*255) + ',' + Math.floor(color[1]*255) + ',' + Math.floor(color[2]*255) + ',' + color[3] + ')';
             var colorObj = this.application.ninja.colorController.getColorObjFromCss(css)
                         var obj =
                         {
@@ -333,7 +381,7 @@ exports.MaterialsPopup = Montage.create(Component, {
                 "defaults":
                 {
                     "minValue": 0,
-                    "maxValue": 128,
+                    "maxValue": 400,
                     "decimalPlace": 100,
                                         "value": value
                 }