Removed the shaders that we do not have rights to.

Conflicts:

	js/io/system/ninjalibrary.json
	js/models/materials-model.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

3 files changed, 138 insertions, 190 deletions

diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index c5ccbc82..55079e45 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"}
         ]
 }
\ No newline at end of file
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index fbc85cec..cc3c3fa1 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -42,26 +42,26 @@ 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 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 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 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 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;
-var TwistMaterial = require("js/lib/rdge/materials/twist-material").TwistMaterial;
+//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;
+//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;
+//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;
 
 
 exports.MaterialsModel = Montage.create(Component, {
@@ -70,37 +70,37 @@ exports.MaterialsModel = Montage.create(Component, {
         value: false
     },
 
-        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());
-                }
-        },
+    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
@@ -154,15 +154,15 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        getMaterialByShader:
-        {
-                value: function( shaderName )
-                {
-                        var index = this.getIndexOfMaterialByShader( shaderName );
-                        if (index >= 0)
-                                return this._materials[index];
-                }
-        },
+    getMaterialByShader:
+    {
+        value: function( shaderName )
+        {
+            var index = this.getIndexOfMaterialByShader( shaderName );
+            if (index >= 0)
+                return this._materials[index];
+        }
+    },
 
     getIndexOfMaterialByShader: {
         value: function (shaderName) {
@@ -192,11 +192,11 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        clearAllMaterials: {
-                value: function() {
-                        this._materials = [];
-                }
-        },
+    clearAllMaterials: {
+        value: function() {
+            this._materials = [];
+        }
+    },
 
     exportFlatMaterial: {
         value: function() {
@@ -204,25 +204,25 @@ exports.MaterialsModel = Montage.create(Component, {
         }
     },
 
-        getDefaultMaterialName: {
-                value: function() {
-                        return "Flat";
-                }
-        },
+    getDefaultMaterialName: {
+        value: function() {
+            return "Flat";
+        }
+    },
 
-        exportMaterials: {
-                value: function()
+    exportMaterials: {
+        value: function()
         {
             var matArray = [];
-                        var nMats = this._materials.length;
-                        for (var i=0;  i<nMats;  i++) {
-                                var material = this._materials[i];
-                                var matObj = material.exportJSON();
+            var nMats = this._materials.length;
+            for (var i=0;  i<nMats;  i++) {
+                var material = this._materials[i];
+                var matObj = material.exportJSON();
                 matArray.push( matObj );
-                        }
+            }
 
-                var jObj =
-                {
+            var jObj =
+            {
                 'materialLibrary':  1.0,
                 'materials':        matArray
             };
@@ -231,81 +231,81 @@ exports.MaterialsModel = Montage.create(Component, {
             // material model is loaded.
             var jStr = "materialLibrary;" + JSON.stringify( jObj );
 
-                        return jStr;
-                }
-        },
-
-        createMaterialByShaderName:
-        {
-                value: function(shaderName)
-                {
-                        var mat;
-                        switch (shaderName)
-                        {
-                                case "flat":                            mat = new FlatMaterial();                               break;
+            return jStr;
+        }
+    },
+
+    createMaterialByShaderName:
+    {
+        value: function(shaderName)
+        {
+            var mat;
+            switch (shaderName)
+            {
+                case "flat":