From 5a1965bf2ed9a54601ca16fd67555335c510ce08 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 26 Apr 2012 16:40:05 -0700
Subject: Update materials to the new texture model.

Create local world for deleted source canvases
---
 js/panels/Materials/materials-data.json            | 84 ++++++++++++++++++++--
 .../materials-popup.reel/materials-popup.js        | 56 ++++++++++-----
 2 files changed, 116 insertions(+), 24 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index f06ab6c8..5e86793e 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -4,25 +4,97 @@
         {
             "label": "Ninja Materials",
             "children": [
-                {
-                    "label": "Uber",
-                    "id" : "UberMaterial"
-                },
                 {
                     "label": "Bump Metal",
                     "id" : "BumpMetalMaterial"
                 },
+                {
+                    "label": "Deform",
+                    "id" : "DeformMaterial"
+                },
+                {
+                    "label": "Flat",
+                    "id" : "FlatMaterial"
+                },
+                {
+                    "label": "Flag",
+                    "id" : "FlagMaterial"
+                },
+                {
+                    "label": "Fly",
+                    "id" : "FlyMaterial"
+                },
+                {
+                    "label": "Julia",
+                    "id" : "JuliaMaterial"
+                },
+                {
+                    "label": "Keleidoscope",
+                    "id" : "KeleidoscopeMaterial"
+                },
                 {
                     "label": "Linear Gradient",
                     "id" : "LinearGradientMaterial"
                 },
+                {
+                    "label": "Mandel",
+                    "id" : "MandelMaterial"
+                },
+                {
+                    "label": "Plasma",
+                    "id" : "PlasmaMaterial"
+                },
+                {
+                    "label": "Pulse",
+                    "id" : "PulseMaterial"
+                },
+                {
+                    "label": "Radial Blur",
+                    "id" : "RadialBlurMaterial"
+                },
                 {
                     "label": "Radial Gradient",
                     "id" : "RadialGradientMaterial"
                 },
                 {
-                    "label": "Flat",
-                    "id" : "FlatMaterial"
+                    "label": "Relief Tunnel",
+                    "id" : "ReliefTunnelMaterial"
+                },
+                {
+                    "label": "Square Tunnel",
+                    "id" : "SquareTunnelMaterial"
+                },
+                {
+                    "label": "Star",
+                    "id" : "StarMaterial"
+                },
+                {
+                    "label": "Taper",
+                    "id" : "TaperMaterial"
+                },
+                {
+                    "label": "Tunnel",
+                    "id" : "TunnelMaterial"
+                },
+                {
+                    "label": "Twist",
+                    "id" : "TwistMaterial"
+                },
+                {
+                    "label": "Twist Vertex",
+                    "id" : "TwistVertMaterial"
+                },
+                {
+                    "label": "Uber",
+                    "id" : "UberMaterial"
+                },
+                {
+                    "label": "Water",
+                    "id" : "WaterMaterial"
+                },
+                {
+                    "label": "Z-Invert",
+                    "id" : "ZInvertMaterial"
                 }
             ]
         },
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index bd10f7a5..9220659e 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -164,8 +164,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;
@@ -214,30 +216,48 @@ exports.MaterialsPopup = Montage.create(Component, {
 		enumerable: true,
 		value: function(materialID)
 		{
-            //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 = [];
+
+			this._materialName = materialID;
+			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")
 				)
 			{
 				var material = MaterialsModel.getMaterial( materialID );
 				if (material)
 				{
 					this._material = material;
-                    this.materialsData = this.getMaterialData( material );
+					this.materialsData = this.getMaterialData( material );
 				}
-            }
-            else
-            {
-                this.materialsData = this[materialID];
-            }
-            this.needsDraw = true;
+			}
+			else
+			{
+				this.materialsData = this[materialID];
+			}
+			this.needsDraw = true;
 		}
 	},
 
-- 
cgit v1.2.3