Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

2 files changed, 9 insertions, 22 deletions

diff --git a/js/models/app-model.js b/js/models/app-model.js
index 52e298a5..1351921b 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -34,19 +34,6 @@ var Montage = require("montage/core/core").Montage,
 
 exports.AppModel = Montage.create(Component, {
 
-    _livePreview: {
-        value: false
-    },
-
-    livePreview: {
-        get: function() {
-            return this._livePreview;
-        },
-        set: function(value) {
-            this._livePreview = value;
-        }
-    },
-
     _layoutView: {
         value: "layoutAll"
     },
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index cc3c3fa1..ec481933 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -42,8 +42,8 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate
 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 RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial;
+var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial;
 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;
@@ -52,7 +52,7 @@ 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;
-var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial;
+var BlueSkyMaterial = require("js/lib/rdge/materials/water-material").BlueSkyMaterial;
 //var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial;
 //var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial;
 //var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial;
@@ -74,8 +74,10 @@ exports.MaterialsModel = Montage.create(Component, {
         value: function() {
             // Load all the materials
             this.addMaterial(new FlatMaterial());
+            this.addMaterial(new BlueSkyMaterial());
             this.addMaterial(new BumpMetalMaterial());
             //this.addMaterial(new CloudMaterial());
+            this.addMaterial(new DarkBlurMaterial());
             //this.addMaterial(new DeformMaterial());
             this.addMaterial(new FlagMaterial());
             //this.addMaterial(new FlyMaterial());
@@ -83,12 +85,10 @@ exports.MaterialsModel = Montage.create(Component, {
             //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 RadialBlurMaterial());
             this.addMaterial(new RadialGradientMaterial());
-            //this.addMaterial(new RaidersMaterial());
             //this.addMaterial(new ReliefTunnelMaterial());
             //this.addMaterial(new SquareTunnelMaterial());
             //this.addMaterial(new StarMaterial());
@@ -251,7 +251,7 @@ exports.MaterialsModel = Montage.create(Component, {
 
                 case "taper":               mat = new TaperMaterial();              break;
                 case "twistVert":           mat = new TwistVertMaterial();          break;
-                //case "radialBlur":          mat = new RadialBlurMaterial();         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;
@@ -260,8 +260,8 @@ exports.MaterialsModel = Montage.create(Component, {
                 case "flag":                mat = new FlagMaterial();               break;
                 //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 "blueSky":               mat = new BlueSkyMaterial();              break;
+                case "darkBlur":             mat = new DarkBlurMaterial();            break;
                 //case "zinvert":             mat = new ZInvertMaterial();            break;
                 //case "deform":              mat = new DeformMaterial();             break;
                 //case "star":                mat = new StarMaterial();               break;