From 978b9049d057d2a0995758275f68da8641193201 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 27 Jun 2012 14:21:27 -0700
Subject: Integrating Materials UI changes. Squashed commit of the following:

commit 89ccb55130e67c4516e616ccc56d2a649a2b9160
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Wed Jun 27 14:20:01 2012 -0700

    Position Materials Editor popup and change buttons' text color.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 89bca82adc781f4913f8d302a49a8baa907631c5
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Wed Jun 27 12:00:51 2012 -0700

    Support deleting and editing custom materials.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 5be5160c4786beb70e8ad4d75562adb135718c6c
Merge: 1d9d9f6 2ebf3e3
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Wed Jun 27 11:11:37 2012 -0700

    Merge branch 'refs/heads/ninja-internal' into WebGLMaterials

    Conflicts:
    	js/data/panels-data.js

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Tue Jun 26 22:01:22 2012 -0700

    "Save as" support to duplicate material with modified settings. Also removed Add button and disabled Reset button for now.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit bf1037508dbc686f2884765344832f906cbf06d0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Tue Jun 26 17:23:31 2012 -0700

    Added UI for duplicating and deleting materials in the Materials Library.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 54930792f9c417df5f739831164aa1f96a41d67a
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Tue Jun 26 14:29:17 2012 -0700

    Added preview of material in materials editor popup and fixed some styling.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/data/panels-data.js                             |   8 +-
 js/panels/Materials/materials-data.json            |   5 +
 .../materials-library-panel.css                    |  18 +-
 .../materials-library-panel.html                   |  25 +-
 .../materials-library-panel.js                     | 109 ++++++-
 .../materials-popup.reel/materials-popup.css       |  36 ++-
 .../materials-popup.reel/materials-popup.html      |  26 +-
 .../materials-popup.reel/materials-popup.js        | 333 +++++++--------------
 8 files changed, 301 insertions(+), 259 deletions(-)

(limited to 'js')

diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index fd83d0c7..a1346ec4 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -39,12 +39,12 @@ exports.PanelsData = Montage.create(Montage, {
         {
             name: "Materials",
             groups: ["default"],
-            minHeight: 100,
-            height: 100,
+            minHeight: 270,
+            height: 270,
             maxHeight: null,
-            flexible: true,
+            flexible: false,
             collapsed: true,
-            scrollable: true,
+            scrollable: false,
             open: true,
             modulePath: "js/panels/Materials/materials-library-panel.reel",
             moduleName: "MaterialsLibraryPanel"
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json
index a5d8997b..fde82d3d 100644
--- a/js/panels/Materials/materials-data.json
+++ b/js/panels/Materials/materials-data.json
@@ -101,6 +101,11 @@
                     "id" : "Z-Invert"
                 }
             ]
+        },
+        {
+            "label": "Custom Materials",
+            "children": [
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
index bed3acfe..b5d36108 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css
@@ -15,6 +15,12 @@
     margin: 4px 0 4px 0;
 }
 
+.materials_library_panel .ml_tree_holder {
+    height: 200px;
+    min-height: 200px;
+    max-height: 200px;
+    overflow-y: scroll;
+}
 
 .ml_buttons {
     clear:both;
@@ -30,9 +36,19 @@
     cursor: pointer;
     margin: 0 1px;
     float: left;
+    width: 40px;
+}
+
+.ml_buttons .ml_duplicate_btn {
     width: 60px;
 }
 
-.ml_buttons .nj-skinned:last-child {
+.ml_buttons .ml_delete_btn {
+    width: 50px;
     float: right;
+}
+
+.ml_buttons .nj-skinned:hover,
+.ml_buttons .nj-skinned:active {
+    color: white;
 }
\ No newline at end of file
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 6fa54495..3adb2108 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -10,12 +10,12 @@
     	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">
          <script type="text/montage-serialization">
         {
-            "addButton": {
+            "duplicateButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_add_btn"},
-					"enabled": false
-                },
+                    "element": {"#": "ml_duplicate_btn"},
+ 					"enabled": true
+               },
                 "listeners": [
                     {
                         "type": "action",
@@ -23,11 +23,10 @@
                     }
                 ]
              },
-            "copyButton": {
+            "editButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_copy_btn"},
- 					"enabled": false
+                    "element": {"#": "ml_edit_btn"}
                },
                 "listeners": [
                     {
@@ -82,7 +81,9 @@
                 "prototype": "js/panels/Materials/materials-library-panel.reel[MaterialsLibraryPanels]",
                 "properties": {
                     "element": {"#": "materials_library_panel"},
-                    "_materialInfo": {"@": "materialInfo"}
+                    "_materialInfo": {"@": "materialInfo"},
+                    "materialsController": {"@": "materialsController"},
+                    "deleteButton": {"@": "deleteButton"}
                 }
             }
     	}
@@ -92,14 +93,14 @@
 	<body>
 
     	<div data-montage-id="materials_library_panel" class="materials_library_panel">
-            <section data-montage-id="ml_tree_holder" class="animationsLibrary">
+            <section data-montage-id="ml_tree_holder" class="ml_tree_holder">
                 <div data-montage-id="materials_library_tree"></div>
             </section>
             <hr />
             <div data-montage-id="ml_buttons" class="ml_buttons">
-                <button data-montage-id="ml_add_btn" class="nj-skinned">Add</button>
-                <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
-                <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
+                <button data-montage-id="ml_duplicate_btn" class="nj-skinned ml_duplicate_btn">Duplicate</button>
+                <button data-montage-id="ml_edit_btn" class="nj-skinned ml_edit_btn">Edit</button>
+                <button data-montage-id="ml_delete_btn" class="nj-skinned ml_delete_btn">Delete</button>
             </div>
     	</div>
 
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index cf0d4e93..cd933ea6 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -7,14 +7,36 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component,
     MaterialsData = require("js/panels/Materials/materials-data.json"),
-    Popup = require("montage/ui/popup/popup.reel").Popup;
+    Popup = require("montage/ui/popup/popup.reel").Popup,
+    MaterialsModel = require("js/models/materials-model").MaterialsModel,
+    LeafNode = require("js/components/treeview/ninja-leaf.reel").Leaf;
 
 exports.MaterialsLibraryPanel = Montage.create(Component, {
 
+    deleteButton: {
+        value: null
+    },
+
     materialsData: {
         value: null
     },
 
+    materialId: {
+        value: null
+    },
+
+    selectedMaterialNode: {
+        value: null
+    },
+
+    customMaterialsBranch: {
+        value: null
+    },
+
+    customMaterialsCounter: {
+        value: 2
+    },
+
     _hasFocus: {
     	enumerable: false,
     	value: false
@@ -36,21 +58,32 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
         value:function(event) {
             switch(event._currentTarget.label)
             {
-                case "Add":
-                    console.log("Add new material");
+                case "Duplicate":
+                    this.duplicateMaterial();
                     break;
-                case "Copy":
-                    console.log("Copy selected material");
+                case "Edit":
+//                    console.log("Edit selected material");
+                    this._showMaterialPopup({ materialId: this.materialId });
                     break;
                 case "Delete":
-                    console.log("Delete selected material");
+                    this.deleteMaterial();
                     break;
             }
         }
     },
 
     handleNodeActivation: {
-        value:function(obj) {
+        value: function(obj, event) {
+            this.selectedMaterialNode = event.currentTarget;
+            this.materialId = obj.id;
+            this.deleteButton.enabled = !!obj.canDelete;
+        }
+    },
+
+    handleDblclick: {
+        value:function(obj, event) {
+            this.selectedMaterialNode = event.currentTarget;
+            this.materialId = obj.id;
             this._showMaterialPopup({ materialId: obj.id });
         }
     },
@@ -58,7 +91,6 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
     handleShowMaterialPopup: {
         enumerable: false,
         value: function (event) {
-            //this._showMaterialPopup(event.detail.materialId);
             this._showMaterialPopup(event.detail);
         }
     },
@@ -80,15 +112,16 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
 			if(!this._materialPopup)
             {
                 this._materialPopup = Popup.create();
+                this._materialInfo.materialsLibraryRef = this;
                 this._materialPopup.content = this._materialInfo;
+                this._materialPopup.delegate = this;
                 this._materialPopup.modal = false;
                 this.eventManager.addEventListener("hideMaterialPopup", this, false);
                 this._materialPopup.addEventListener("show", this, false);
             }
             this._materialPopup.show();
 
-            materialID = materialObj.materialId;
-            this._materialInfo.loadMaterials(materialID,  materialObj.useSelection, materialObj.whichMaterial);
+            this._materialInfo.loadMaterials(materialObj.materialId,  materialObj.useSelection, materialObj.whichMaterial);
     	}
     },
 
@@ -99,5 +132,61 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
                 this._materialPopup.hide();
             }
     	}
+    },
+
+    duplicateMaterial: {
+        enumerable: false,
+        value: function (matCopyName) {
+//            console.log("Duplicate selected material");
+            var mat = MaterialsModel.getMaterial(this.materialId);
+            if(mat) {
+                var matCopy = mat.dup();
+                if(!matCopyName) {
+                    matCopyName = this.materialId + "_" + this.customMaterialsCounter++;
+                }
+                matCopy.setName(matCopyName);
+                MaterialsModel.addMaterial(matCopy);
+
+                var leaf = LeafNode.create();
+                leaf.id = matCopyName;
+                leaf.label = matCopyName;
+                leaf.treeNodeType = "leaf";
+                leaf.canDelete = true;
+                if(!this.customMaterialsBranch) {
+                    this.customMaterialsBranch = this.materialsController.branchControllers[2];
+                }
+                this.customMaterialsBranch.content.push(leaf);
+            }
+        }
+    },
+
+    deleteMaterial: {
+        enumerable: false,
+        value: function () {
+//            console.log("Delete selected material");
+            if(!this.customMaterialsBranch) {
+                this.customMaterialsBranch = this.materialsController.branchControllers[2];
+            }
+
+            var mat = MaterialsModel.getMaterial(this.materialId);
+            if(mat) {
+                MaterialsModel.removeMaterial(this.materialId);
+
+                var index = this.customMaterialsBranch.selectedIndexes[0];
+                this.customMaterialsBranch.content.splice(index, 1);
+            }
+
+            this.deleteButton.enabled = false;
+        }
+    },
+
+    willPositionPopup: {
+        value: function(popup, defaultPosition) {
+            var content = popup.content.element,
+                contentHt = parseFloat(content.style.height) || content.offsetHeight || 0,
+                contentWd = parseFloat(content.style.width) || content.offsetWidth || 0,
+                pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0));
+            return {top: pt.y - contentHt + 10, left: pt.x - contentWd + 10};
+        }
     }
 });
\ No newline at end of file
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css
index 943d9bcb..2de03e91 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.css
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.css
@@ -6,7 +6,8 @@
  </copyright> */
 
 .materials_popup {
-    width:400px;
+    width:auto;
+    min-width: 300px;
     font-size: 12px;
     overflow: hidden;
     background: #494949;
@@ -32,6 +33,7 @@
 .mp_preview {
     height: 100px;
     text-align: center;
+    margin: 20px 0 10px 0;
 }
 
 .mp_property
@@ -59,7 +61,19 @@
 .mp_property .hottext,
 .mp_property .hottextInput
 {
-    width: 30px;
+    width: 23px;
+}
+
+.mp_property .hottext
+{
+    color: white;
+    background: none;
+}
+
+.mp_property .hottextInput
+{
+    color: black;
+    background: white;
 }
 
 .mp_property .button
@@ -76,7 +90,8 @@
 
 .mp_properties_list
 {
-   padding-bottom: 8px;
+    padding-bottom: 8px;
+    padding-right: 20px;
 }
 
 .mp_properties_list > .mp_property > .colortoolbar
@@ -104,13 +119,28 @@
   display: block;
   cursor: pointer;
 }
+.mp_buttons button:hover,
+.mp_buttons button:active {
+    color: white;
+}
 
 .mp_buttons .mp_cancel_btn {
     float: left;
     width: 60px;
 }
 
+.mp_buttons .mp_saveAs_btn {
+    float: right;
+    width: 60px;
+}
+
 .mp_buttons .mp_ok_btn {
     float: right;
     width: 30px;
+    margin-left:4px;
+}
+
+.materials_popup .mp_reset_btn {
+    float: right;
+    margin-right: 8px;
 }
\ No newline at end of file
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index bac722cd..c2f3af4e 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -27,6 +27,21 @@
                     "label": "Cancel"
                 }
             },
+            "saveAsButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "mp_saveAs_btn"},
+                    "label": "Save As..."
+                }
+            },
+            "resetButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "mp_reset_btn"},
+                    "label": "Reset",
+                    "enabled": false
+                }
+            },
             "eventDelegator": {
                 "prototype": "montage/core/event/action-event-listener",
                 "properties": {
@@ -79,7 +94,10 @@
                     "element": {"#": "materials_popup"},
                     "okButton": {"@": "okButton"},
                     "cancelButton": {"@": "cancelButton"},
-                    "materialTitle": {"#": "mp_title"}
+                    "saveAsButton": {"@": "saveAsButton"},
+                    "resetButton": {"@": "resetButton"},
+                    "materialTitle": {"#": "mp_title"},
+                    "previewCanvas": {"#": "mp_preview_canvas"}
                 }
             }
         }
@@ -91,15 +109,19 @@
     	<div data-montage-id="materials_popup" class="materials_popup">
             <div data-montage-id="mp_title" class="mp_title">Material Name</div>
             <hr />
-    		<div data-montage-id="mp_preview" class="mp_preview">Preview Pane</div>
+    		<div data-montage-id="mp_preview" class="mp_preview">
+                <canvas data-montage-id="mp_preview_canvas" width="200" height="100"/>
+            </div>
             <hr />
             <div data-montage-id="mp_properties_list" class="mp_properties_list">
                 <div data-montage-id="mp_property" class="mp_property"></div>
             </div>
+            <button data-montage-id="mp_reset_btn" class="mp_reset_btn nj-skinned"></button>
             <hr />
             <div data-montage-id="mp_buttons" class="mp_buttons">
                 <button data-montage-id="mp_cancel_btn" class="mp_cancel_btn nj-skinned"></button>
                 <button data-montage-id="mp_ok_btn" class="mp_ok_btn nj-skinned"></button>
+                <button data-montage-id="mp_saveAs_btn" class="mp_saveAs_btn nj-skinned"></button>
             </div>
     	</div>
 	</body>
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index 40f07509..3f702459 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -6,7 +6,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component,
-    MaterialsModel = require("js/models/materials-model").MaterialsModel;
+    MaterialsModel = require("js/models/materials-model").MaterialsModel,
+    NJUtils = require("js/lib/NJUtils").NJUtils,
+    World = require("js/lib/drawing/world").World,
+    Rectangle = require("js/lib/geom/rectangle").Rectangle;
 
 ////////////////////////////////////////////////////////////////////////
 //Exporting as MaterialsPopup
@@ -22,11 +25,35 @@ exports.MaterialsPopup = Montage.create(Component, {
         serializable: true
     },
 
+    saveAsButton: {
+        value: null,
+        serializable: true
+    },
+
+    resetButton: {
+        value: null,
+        serializable: true
+    },
+
+    materialsLibraryRef: {
+        value: null
+    },
+
     materialTitle: {
         value: null,
         serializable: true
     },
 
+    previewCanvas: {
+        value: null,
+        serializable: true
+    },
+
+    previewShape: {
+        value: null,
+        serializable: true
+    },
+
 	// Material Properties
     _materialName: {
         enumerable: true,
@@ -65,6 +92,12 @@ exports.MaterialsPopup = Montage.create(Component, {
 
                     }
 					break;
+                case "Save As...":
+                    this.saveAs();
+                    break;
+                case "Reset":
+                    this.reset();
+                    break;
 			}
 
             // Notify Materials Library to close popup
@@ -72,6 +105,28 @@ exports.MaterialsPopup = Montage.create(Component, {
 		}
 	},
 
+    saveAs:
+    {
+        value: function()
+        {
+            console.log("Save As...");
+            var materialCopy = prompt("Save material as", this._materialName + "_Copy");
+
+            if (materialCopy)
+            {
+                this.materialsLibraryRef.duplicateMaterial(materialCopy);
+            }
+        }
+    },
+
+    reset:
+    {
+        value: function()
+        {
+            console.log("Reset");
+        }
+    },
+
 	revertToOriginalValues:
 	{
 		value: function()
@@ -195,6 +250,7 @@ exports.MaterialsPopup = Montage.create(Component, {
 					this._material.setProperty( this._propNames[index],  value );
 				}
 
+                var obj, matArray, matTypeArray, nMats, iMat, world;
 				if (this._useSelection)
 				{
 					console.log( "apply to selection" );
@@ -206,25 +262,38 @@ exports.MaterialsPopup = Montage.create(Component, {
 						for (var iObj=0;  iObj<nObjs;  iObj++)
 						{
 							var canvas = selection[iObj];
-							var obj;
 							if (canvas.elementModel && canvas.elementModel.shapeModel)  obj = canvas.elementModel.shapeModel.GLGeomObj;
 							if (obj)
 							{
-								var matArray = obj._materialArray;
-								var matTypeArray = obj._materialTypeArray;
-								var nMats = matArray.length;
-								for (var iMat=0;  iMat<nMats;  iMat++)
+								matArray = obj._materialArray;
+								matTypeArray = obj._materialTypeArray;
+								nMats = matArray.length;
+								for (iMat=0;  iMat<nMats;  iMat++)
 								{
 									if (matTypeArray[iMat] === this._whichMaterial)
 										matArray[iMat].setProperty( this._propNames[index], value );
 								}
-								var world = obj.getWorld();
+								world = obj.getWorld();
 								if (world)
 									world.restartRenderLoop();
 							}
 						}
 					}
 				}
+
+                // Update preview material
+                obj = this.previewShape;
+                matArray = obj._materialArray;
+                matTypeArray = obj._materialTypeArray;
+                nMats = matArray.length;
+                for (iMat=0;  iMat<nMats;  iMat++)
+                {
+                    if (matTypeArray[iMat] === "fill")
+                        matArray[iMat].setProperty( this._propNames[index], value );
+                }
+                world = obj.getWorld();
+                if (world)
+                    world.restartRenderLoop();
 			}
 		}
 	},
@@ -286,8 +355,13 @@ exports.MaterialsPopup = Montage.create(Component, {
 		enumerable: false,
 		value: function() {
             this.cancelButton.addEventListener("action", this, true);
-
             this.okButton.addEventListener("action", this, true);
+            this.saveAsButton.addEventListener("action", this, true);
+            this.resetButton.addEventListener("action", this, true);
+
+            if (!this.previewCanvas.getAttribute( "data-RDGE-id" )) {
+                this.previewCanvas.setAttribute( "data-RDGE-id", NJUtils.generateRandom() );
+            }
         }
     },
 	////////////////////////////////////////////////////////////////////
@@ -295,7 +369,23 @@ exports.MaterialsPopup = Montage.create(Component, {
 	didDraw: {
 		enumerable: false,
 		value: function() {
-           this.materialTitle.innerHTML = this._materialName;
+
+            var world;
+            if(!this.previewShape) {
+                world = new World(this.previewCanvas, true);
+                this.previewShape = Object.create(Rectangle, {});
+                this.previewShape.init(world, 0, 0, 200, 100, 1, [0,0,0,1], [1,1,1,1],
+                                            0, 0, 0, 0, null, null, "Solid");
+                world.addObject(this.previewShape);
+            } else {
+                world = this.previewShape.getWorld();
+            }
+
+            this.materialTitle.innerHTML = this._materialName;
+
+            this.previewShape.setFillMaterial(this._material);
+            this.previewShape.buildBuffers();
+            world.render();
 		}
 	},
 
@@ -334,37 +424,7 @@ exports.MaterialsPopup = Montage.create(Component, {
 			else
 			{
 				this._useSelection = false;
-
-				if(
-						(materialID ===  "Bump Metal")		||
-						(materialID ===  "Deform")			||
-						(materialID ===  "Flat")			||
-						(materialID ===  "Flag")			||
-						(materialID ===  "Fly")				||
-						(materialID ===  "Julia")			||
-						(materialID ===  "Keleidoscope")	||
-						(materialID ===  "Linear Gradient")	||
-						(materialID ===  "Mandel")			||
-						(materialID ===  "Paris")			||
-						(materialID ===  "Plasma")			||
-						(materialID ===  "Pulse")			||
-						(materialID ===  "Radial Blur")		||
-						(materialID ===  "Radial Gradient")	||
-						(materialID ===  "Raiders")			||
-						(materialID ===  "Relief Tunnel")	||
-						(materialID ===  "Square Tunnel")	||
-						(materialID ===  "Star")			||
-						(materialID ===  "Taper")			||
-						(materialID ===  "Tunnel")			||
-						(materialID ===  "Twist")			||
-						(materialID ===  "Twist Vertex")	||
-						(materialID ===  "Uber")			||
-						(materialID ===  "Water")			||
-						(materialID ===  "Z-Invert")
-					)
-				{
-					material = MaterialsModel.getMaterial( materialID );
-				}
+                material = MaterialsModel.getMaterial( materialID );
 			}
 				
 			if (material)
@@ -479,7 +539,8 @@ exports.MaterialsPopup = Montage.create(Component, {
                     "minValue": 0,
                     "maxValue": 400,
                     "decimalPlace": 100,
-					"value": value
+					"value": value,
+                    "stepSize": 0.1
                 }
 			}
 
@@ -547,7 +608,8 @@ exports.MaterialsPopup = Montage.create(Component, {
 								"decimalPlace": 100,
 								"minValue": -10,
                                 "maxValue":  10,
-                                "value": value[0]
+                                "value": value[0],
+                                "stepSize": 0.1
                             }
                         },
                         {
@@ -559,7 +621,8 @@ exports.MaterialsPopup = Montage.create(Component, {
 								"decimalPlace": 100,
 								"minValue": -100,
                                 "maxValue":  100,
-								"value":	value[1]
+								"value":	value[1],
+                                "stepSize": 0.1
                            }
                         }
                     ]
@@ -586,190 +649,6 @@ exports.MaterialsPopup = Montage.create(Component, {
 		}
 	},
 
-    // _dummyData1
-    CheckerBoard: {
-        value: [
-            {
-                "label":         "Texture1",
-                "description":   "Texture1 value",
-                "controlType":   "FileInput",
-                "defaults":
-                {
-                    "filePath": "http://localhost/"
-                }
-            },
-            {
-                "label":         "Diffuse",
-                "description":   "Diffuse value",
-                "controlType":   "ColorChip",
-                "defaults":
-                {
-                }
-            },
-            {
-                "label":         "Specular",
-                "description":   "Specular value",
-                "controlType":   "Button",
-                "defaults":
-                {
-                    "isToggleButton": true
-                }
-            },
-            {
-                "label":         "Shininess",
-                "description":   "Shininess value",
-                "controlType":   "HotText",
-                "defaults":
-                {
-                    "minValue": 0,
-                    "maxValue": 128,
-                    "decimalPlace": 100
-                }
-            },
-            {
-                "label":         "RGB",
-                "description":   "RGB value",
-                "controlType":   "InputGroup",
-                "defaults":
-                {
-                    data:[
-                        {
-                            "label":         "R",
-                            "description":   "R value",
-                            "controlType":   "HotText",
-                            "defaults":
-                            {
-                                "minValue": 0,
-                                "maxValue": 255,
-                                "value": 255
-                            }
-                        },
-                        {
-                            "label":         "G",
-                            "description":   "G value",
-                            "controlType":   "HotText",
-                            "defaults":
-                            {
-                                "minValue": 0,
-                                "maxValue": 255
-                            }
-                        },
-                        {
-                            "label":         "B",
-                            "description":   "B value",
-                            "controlType":   "HotText",
-                            "defaults":
-                            {
-                                "minValue": 0,
-                                "maxValue": 255
-                            }
-                        }
-                    ]
-                }
-            },
-            {
-                "label":         "XYZ",
-                "description":   "XYZ value",
-                "controlType":   "InputGroup",
-                "defaults":
-                {
-                    data:[
-                        {
-                            "label":         "X",
-                            "description":   "X value",
-                            "controlType":   "TextField",
-                            "defaults":
-                            {
-                                "text": "0"
-                            }
-                        },
-                        {
-                            "label":         "Y",
-                            "description":   "Y value",
-                            "controlType":   "TextField",
-                            "defaults":
-                            {
-                                "text": "0"
-                            }
-                        },
-                        {
-                            "label":         "Z",
-                            "description":   "Z value",
-                            "controlType":   "TextField",
-                            "defaults":
-                            {
-                                "text": "1"
-                            }
-                        }
-                    ]
-                }
-            },
-            {
-                "label":         "Foo",
-                "description":   "Foo value",
-                "controlType":   "Slider",
-                "defaults":
-                {
-                    "minValue":    0,
-                    "maxValue":    100,
-                    "value":    50,
-                    "allowTrackClick": true
-                }
-            },
-            {
-                "label":         "Bar",
-                "description":   "Bar value",
-                "controlType":   "HotTextUnit",
-                "defaults":
-                {
-                    "acceptableUnits": ["%"],
-                    "value":    50,
-                    "units": "%"
-                }
-            }
-        ]
-    },
-
-    // _dummyData2
-    ShinyMetal: {
-        value: [
-                    {
-                        "label":         "Diffuse",
-                        "description":   "Diffuse value",
-                        "controlType":   "ColorChip",
-                        "defaults":
-                        {
-                        }
-                    },
-                    {
-                        "label":         "Ambient",
-                        "description":   "Ambient value",
-                        "controlType":   "ColorChip",
-                        "defaults":
-                        {
-                        }
-                    },
-                    {
-                        "label":         "Specular",
-                        "description":   "Specular value",
-                        "controlType":   "ColorChip",
-                        "defaults":
-                        {
-                        }
-                    },
-                    {
-                        "label":         "Shininess",
-                        "description":   "Shininess value",
-                        "controlType":   "HotText",
-                        "defaults":
-                            {
-                                "minValue": 0,
-                                "maxValue": 128
-                            }
-                    }
-                ]
-    },
-
     materialsProperties: {
         serializable: true,
         value: null
-- 
cgit v1.2.3