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 ++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-) (limited to 'js/panels/Materials/materials-data.json') 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" } ] }, -- cgit v1.2.3 From b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b Mon Sep 17 00:00:00 2001 From: hwc487 Date: Tue, 12 Jun 2012 15:44:52 -0700 Subject: Disabled the add, copy, and delete buttons in the material library panel. Also removed the Custom Materials section. --- js/panels/Materials/materials-data.json | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index 5e86793e..893489fc 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -97,19 +97,6 @@ "id" : "ZInvertMaterial" } ] - }, - { - "label": "Custom Materials", - "children": [ - { - "label": "Checker Board", - "id" : "CheckerBoard" - }, - { - "label": "Shiny Metal", - "id" : "ShinyMetal" - } - ] } ] } \ No newline at end of file -- cgit v1.2.3 From f0fc7a5678093cce986bd99fef2c5c88add19b68 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 14 Jun 2012 16:09:31 -0700 Subject: Fix for line color. Name change for all materials --- js/panels/Materials/materials-data.json | 46 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index 893489fc..ad0c1f56 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -6,95 +6,95 @@ "children": [ { "label": "Bump Metal", - "id" : "BumpMetalMaterial" + "id" : "Bump Metal" }, { "label": "Deform", - "id" : "DeformMaterial" + "id" : "Deform" }, { "label": "Flat", - "id" : "FlatMaterial" + "id" : "Flat" }, { "label": "Flag", - "id" : "FlagMaterial" + "id" : "Flag" }, { "label": "Fly", - "id" : "FlyMaterial" + "id" : "Fly" }, { "label": "Julia", - "id" : "JuliaMaterial" + "id" : "Julia" }, { "label": "Keleidoscope", - "id" : "KeleidoscopeMaterial" + "id" : "Keleidoscope" }, { "label": "Linear Gradient", - "id" : "LinearGradientMaterial" + "id" : "Linear Gradient" }, { "label": "Mandel", - "id" : "MandelMaterial" + "id" : "Mandel" }, { "label": "Plasma", - "id" : "PlasmaMaterial" + "id" : "Plasma" }, { "label": "Pulse", - "id" : "PulseMaterial" + "id" : "Pulse" }, { "label": "Radial Blur", - "id" : "RadialBlurMaterial" + "id" : "Radial Blur" }, { "label": "Radial Gradient", - "id" : "RadialGradientMaterial" + "id" : "Radial Gradient" }, { "label": "Relief Tunnel", - "id" : "ReliefTunnelMaterial" + "id" : "Relief Tunnel" }, { "label": "Square Tunnel", - "id" : "SquareTunnelMaterial" + "id" : "Square Tunnel" }, { "label": "Star", - "id" : "StarMaterial" + "id" : "Star" }, { "label": "Taper", - "id" : "TaperMaterial" + "id" : "Taper" }, { "label": "Tunnel", - "id" : "TunnelMaterial" + "id" : "Tunnel" }, { "label": "Twist", - "id" : "TwistMaterial" + "id" : "Twist" }, { "label": "Twist Vertex", - "id" : "TwistVertMaterial" + "id" : "Twist Vertex" }, { "label": "Uber", - "id" : "UberMaterial" + "id" : "Uber" }, { "label": "Water", - "id" : "WaterMaterial" + "id" : "Water" }, { "label": "Z-Invert", - "id" : "ZInvertMaterial" + "id" : "Z-Invert" } ] } -- cgit v1.2.3 From 2779b48197effabe1a975c8139c497631238f8f1 Mon Sep 17 00:00:00 2001 From: hwc487 Date: Fri, 15 Jun 2012 11:26:57 -0700 Subject: Re-added Paris material --- js/panels/Materials/materials-data.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index ad0c1f56..221fdd2b 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -40,6 +40,10 @@ "label": "Mandel", "id" : "Mandel" }, + { + "label": "Paris", + "id" : "Paris" + }, { "label": "Plasma", "id" : "Plasma" -- cgit v1.2.3 From 043ab3f0aa5099f88a32dc377e9de1011b79611f Mon Sep 17 00:00:00 2001 From: hwc487 Date: Fri, 15 Jun 2012 11:36:35 -0700 Subject: Re-added Raiders material --- js/panels/Materials/materials-data.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index 221fdd2b..8df9e600 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -60,6 +60,10 @@ "label": "Radial Gradient", "id" : "Radial Gradient" }, + { + "label": "Raiders", + "id" : "Raiders" + }, { "label": "Relief Tunnel", "id" : "Relief Tunnel" -- cgit v1.2.3 From c65c532d081afd73e4a325abe4ab97c6726c02db Mon Sep 17 00:00:00 2001 From: hwc487 Date: Fri, 15 Jun 2012 15:45:34 -0700 Subject: Removed Flat material from the materials library --- js/panels/Materials/materials-data.json | 4 ---- 1 file changed, 4 deletions(-) (limited to 'js/panels/Materials/materials-data.json') diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index 8df9e600..a5d8997b 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json @@ -12,10 +12,6 @@ "label": "Deform", "id" : "Deform" }, - { - "label": "Flat", - "id" : "Flat" - }, { "label": "Flag", "id" : "Flag" -- cgit v1.2.3