Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

2 files changed, 92 insertions, 73 deletions

diff --git a/js/models/color-model.js b/js/models/color-model.js
index 764feeb5..a2eab2e1 100755
--- a/js/models/color-model.js
+++ b/js/models/color-model.js
@@ -231,10 +231,10 @@ exports.ColorModel = Montage.create(Component, {
     //
     applyNoColor: {
         enumerable: true,
-        value: function () {
+        value: function (code) {
                 //
                 var nocolor = {};
-                nocolor.wasSetByCode = true;
+                nocolor.wasSetByCode = code;
                 nocolor.type = 'change';
                 this.updateColorSelected('nocolor', nocolor);
         }
@@ -310,29 +310,29 @@ exports.ColorModel = Montage.create(Component, {
                         case 'hex':
                                 switch (color.length) {
                                         case 1:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 2:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 3:
                                                 color = color[0]+color[0]+color[1]+color[1]+color[2]+color[2];
                                                 break;
                                         case 4:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 5:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                         case 6:
                                                 //Nothing
                                                 break;
                                         default:
-                                                this.applyNoColor();
+                                                this.applyNoColor(false);
                                                 return;
                                                 break;
                                 }
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 44364aa2..7d9f33b4 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -16,12 +16,14 @@ var LinearGradientMaterial = require("js/lib/rdge/materials/linear-gradient-mate
 var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-material").RadialGradientMaterial;
 var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial;
 var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial;
+//var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial;
 var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
 var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial;
 var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial;
 var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial;
 var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial;
 var ReliefTunnelMaterial = require("js/lib/rdge/materials/relief-tunnel-material").ReliefTunnelMaterial;
+var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial;
 var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial;
 var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial;
 var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial;
@@ -30,6 +32,8 @@ var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvert
 var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
 var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
 var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
+var TwistVertMaterial = require("js/lib/rdge/materials/twist-vert-material").TwistVertMaterial;
+var TaperMaterial = require("js/lib/rdge/materials/taper-material").TaperMaterial;
 var JuliaMaterial = require("js/lib/rdge/materials/julia-material").JuliaMaterial;
 var KeleidoscopeMaterial = require("js/lib/rdge/materials/keleidoscope-material").KeleidoscopeMaterial;
 var MandelMaterial = require("js/lib/rdge/materials/mandel-material").MandelMaterial;
@@ -41,33 +45,37 @@ exports.MaterialsModel = Montage.create(Component, {
         value: false
     },
 
-    deserializedFromTemplate: {
-        value: function() {
-            // Load all the materials
-            this.addMaterial(new FlatMaterial());
-            this.addMaterial(new LinearGradientMaterial());
-            this.addMaterial(new RadialGradientMaterial());
-            this.addMaterial(new BumpMetalMaterial());
-            this.addMaterial(new UberMaterial());
-            this.addMaterial(new RadialBlurMaterial());
-            this.addMaterial(new RaidersMaterial());
-            this.addMaterial(new PlasmaMaterial());
-            this.addMaterial(new PulseMaterial());
-            this.addMaterial(new TunnelMaterial());
-            this.addMaterial(new ReliefTunnelMaterial());
-            this.addMaterial(new SquareTunnelMaterial());
-            this.addMaterial(new FlyMaterial());
-            this.addMaterial(new WaterMaterial());
-            this.addMaterial(new ParisMaterial());
-            this.addMaterial(new ZInvertMaterial());
-            this.addMaterial(new DeformMaterial());
-            this.addMaterial(new StarMaterial());
-            this.addMaterial(new TwistMaterial());
-            this.addMaterial(new JuliaMaterial());
-            this.addMaterial(new KeleidoscopeMaterial());
-            this.addMaterial(new MandelMaterial());
-        }
-    },
+        deserializedFromTemplate: {
+                value: function() {
+                        // Load all the materials
+                        this.addMaterial(new FlatMaterial());
+                        this.addMaterial(new BumpMetalMaterial());
+                        //this.addMaterial(new CloudMaterial());
+                        this.addMaterial(new DeformMaterial());
+                        this.addMaterial(new FlagMaterial());
+                        this.addMaterial(new FlyMaterial());
+                        this.addMaterial(new JuliaMaterial());
+                        this.addMaterial(new KeleidoscopeMaterial());
+                        this.addMaterial(new LinearGradientMaterial());
+                        this.addMaterial(new MandelMaterial());
+                        this.addMaterial(new ParisMaterial());
+                        this.addMaterial(new PlasmaMaterial());
+                        this.addMaterial(new PulseMaterial());
+                        this.addMaterial(new RadialBlurMaterial());
+                        this.addMaterial(new RadialGradientMaterial());
+                        this.addMaterial(new RaidersMaterial());
+                        this.addMaterial(new ReliefTunnelMaterial());
+                        this.addMaterial(new SquareTunnelMaterial());
+                        this.addMaterial(new StarMaterial());
+                        this.addMaterial(new TaperMaterial());
+                        this.addMaterial(new TunnelMaterial());
+                        this.addMaterial(new TwistMaterial());
+                        this.addMaterial(new TwistVertMaterial());
+                        this.addMaterial(new UberMaterial());
+                        this.addMaterial(new WaterMaterial());
+                        this.addMaterial(new ZInvertMaterial());
+                }
+        },
 
     _materials : {
         value: AppModel.materials
@@ -116,7 +124,7 @@ exports.MaterialsModel = Montage.create(Component, {
         value: function (materialName) {
             var index = this.getIndexOfMaterial(materialName);
             if(index !== -1) {
-                return this._materials[index].dup();
+                return this._materials[index];
             }
         }
     },
@@ -127,7 +135,7 @@ exports.MaterialsModel = Montage.create(Component, {
                 {
                         var index = this.getIndexOfMaterialByShader( shaderName );
                         if (index >= 0)
-                                return this._materials[index].dup();
+                                return this._materials[index];
                 }
         },              
 
@@ -173,7 +181,7 @@ exports.MaterialsModel = Montage.create(Component, {
 
         getDefaultMaterialName: {
                 value: function() {
-                        return "FlatMaterial";
+                        return "Flat";
                 }
         },
 
@@ -202,6 +210,51 @@ exports.MaterialsModel = Montage.create(Component, {
                 }
         },
 
+        createMaterialByShaderName:
+        {
+                value: function(shaderName)
+                {
+                        var mat;
+                        switch (shaderName)
+                        {
+                                case "flat":                            mat = new FlatMaterial();                               break;
+                                case "linearGradient":          mat = new LinearGradientMaterial();             break;
+                                case "radialGradient":          mat = new RadialGradientMaterial();             break;
+                                case "bumpMetal":                       mat = new BumpMetalMaterial();                  break;
+                                case "uber":                            mat = new UberMaterial();                               break;
+                                //case "cloud":                         mat = new CloudMaterial();                              break;
+
+                                case "taper":                           mat = new TaperMaterial();                              break;
+                                case "twistVert":                       mat = new TwistVertMaterial();                  break;
+                                case "radialBlur":                      mat = new RadialBlurMaterial();                 break;
+                                case "plasma":                          mat = new PlasmaMaterial();                             break;
+                                case "pulse":                           mat = new PulseMaterial();                              break;
+                                case "tunnel":                          mat = new TunnelMaterial();                             break;
+                                case "reliefTunnel":            mat = new ReliefTunnelMaterial();               break;
+                                case