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/lib/geom/line.js | 1 + js/lib/rdge/materials/bump-metal-material.js | 2 +- js/lib/rdge/materials/cloud-material.js | 2 +- js/lib/rdge/materials/deform-material.js | 2 +- js/lib/rdge/materials/flag-material.js | 2 +- js/lib/rdge/materials/flat-material.js | 2 +- js/lib/rdge/materials/fly-material.js | 2 +- js/lib/rdge/materials/julia-material.js | 2 +- js/lib/rdge/materials/keleidoscope-material.js | 2 +- js/lib/rdge/materials/linear-gradient-material.js | 2 +- js/lib/rdge/materials/mandel-material.js | 2 +- js/lib/rdge/materials/plasma-material.js | 2 +- js/lib/rdge/materials/pulse-material.js | 2 +- js/lib/rdge/materials/radial-blur-material.js | 4 +- js/lib/rdge/materials/radial-gradient-material.js | 2 +- js/lib/rdge/materials/relief-tunnel-material.js | 2 +- js/lib/rdge/materials/square-tunnel-material.js | 2 +- js/lib/rdge/materials/star-material.js | 2 +- js/lib/rdge/materials/taper-material.js | 2 +- js/lib/rdge/materials/tunnel-material.js | 2 +- js/lib/rdge/materials/twist-material.js | 2 +- js/lib/rdge/materials/twist-vert-material.js | 2 +- js/lib/rdge/materials/uber-material.js | 2 +- js/lib/rdge/materials/water-material.js | 2 +- js/lib/rdge/materials/z-invert-material.js | 2 +- js/models/materials-model.js | 2 +- js/panels/Materials/materials-data.json | 46 +++++++++++----------- .../materials-popup.reel/materials-popup.js | 46 +++++++++++----------- 28 files changed, 73 insertions(+), 72 deletions(-) (limited to 'js') diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index 3c811698..a016d7a3 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js @@ -64,6 +64,7 @@ exports.Line = Object.create(GeomObj, { if(strokeMaterial) { this._strokeMaterial = strokeMaterial; + if (strokeColor && this._strokeMaterial.hasProperty( "color" )) this._strokeMaterial.setProperty( "color", this._strokeColor ); } } }, diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js index 4604a89d..99a80da2 100755 --- a/js/lib/rdge/materials/bump-metal-material.js +++ b/js/lib/rdge/materials/bump-metal-material.js @@ -16,7 +16,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "BumpMetalMaterial"; + this._name = "Bump Metal"; this._shaderName = "bumpMetal"; diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js index 2153b857..fc833565 100644 --- a/js/lib/rdge/materials/cloud-material.js +++ b/js/lib/rdge/materials/cloud-material.js @@ -20,7 +20,7 @@ var CloudMaterial = function CloudMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "CloudMaterial"; + this._name = "Cloud"; this._shaderName = "cloud"; this._texMap = 'assets/images/cloud10.png'; diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js index 7ff5b3e3..4354408d 100644 --- a/js/lib/rdge/materials/deform-material.js +++ b/js/lib/rdge/materials/deform-material.js @@ -11,7 +11,7 @@ var DeformMaterial = function DeformMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "DeformMaterial"; + this._name = "Deform"; this._shaderName = "deform"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js index d0bf522f..7e3c17f9 100644 --- a/js/lib/rdge/materials/flag-material.js +++ b/js/lib/rdge/materials/flag-material.js @@ -13,7 +13,7 @@ var FlagMaterial = function FlagMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "FlagMaterial"; + this._name = "Flag"; this._shaderName = "flag"; this._texMap = 'assets/images/us_flag.png'; diff --git a/js/lib/rdge/materials/flat-material.js b/js/lib/rdge/materials/flat-material.js index 579813b8..791dcc27 100755 --- a/js/lib/rdge/materials/flat-material.js +++ b/js/lib/rdge/materials/flat-material.js @@ -15,7 +15,7 @@ var FlatMaterial = function FlatMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "FlatMaterial"; + this._name = "Flat"; this._shaderName = "flat"; this._color = [1, 0, 0, 1]; diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js index 8fa2b614..4e8bd9b5 100644 --- a/js/lib/rdge/materials/fly-material.js +++ b/js/lib/rdge/materials/fly-material.js @@ -11,7 +11,7 @@ var FlyMaterial = function FlyMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "FlyMaterial"; + this._name = "Fly"; this._shaderName = "fly"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js index 63367e16..d89fa594 100644 --- a/js/lib/rdge/materials/julia-material.js +++ b/js/lib/rdge/materials/julia-material.js @@ -11,7 +11,7 @@ var JuliaMaterial = function JuliaMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "JuliaMaterial"; + this._name = "Julia"; this._shaderName = "julia"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js index 0696063d..b16d9022 100644 --- a/js/lib/rdge/materials/keleidoscope-material.js +++ b/js/lib/rdge/materials/keleidoscope-material.js @@ -11,7 +11,7 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "KeleidoscopeMaterial"; + this._name = "Keleidoscope"; this._shaderName = "keleidoscope"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js index 80824ee3..7e53db84 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js @@ -12,7 +12,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "LinearGradientMaterial"; + this._name = "Linear Gradient"; this._shaderName = "linearGradient"; this._color1 = [1, 0, 0, 1]; diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js index af477f2b..4f3def4a 100644 --- a/js/lib/rdge/materials/mandel-material.js +++ b/js/lib/rdge/materials/mandel-material.js @@ -11,7 +11,7 @@ var MandelMaterial = function MandelMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "MandelMaterial"; + this._name = "Mandel"; this._shaderName = "mandel"; this._time = 0.0; diff --git a/js/lib/rdge/materials/plasma-material.js b/js/lib/rdge/materials/plasma-material.js index c1e5524c..10c29c99 100644 --- a/js/lib/rdge/materials/plasma-material.js +++ b/js/lib/rdge/materials/plasma-material.js @@ -10,7 +10,7 @@ var PlasmaMaterial = function PlasmaMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "PlasmaMaterial"; + this._name = "Plasma"; this._shaderName = "plasma"; this._time = 0.0; diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js index 2c0fc04c..155bd8a9 100644 --- a/js/lib/rdge/materials/pulse-material.js +++ b/js/lib/rdge/materials/pulse-material.js @@ -22,7 +22,7 @@ var PulseMaterial = function PulseMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "PulseMaterial"; + this._name = "Pulse"; this._shaderName = "pulse"; this._texMap = 'assets/images/cubelight.png'; diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js index 0eb13631..c130544f 100644 --- a/js/lib/rdge/materials/radial-blur-material.js +++ b/js/lib/rdge/materials/radial-blur-material.js @@ -10,7 +10,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "RadialBlurMaterial"; + this._name = "Radial Blur"; this._shaderName = "radialBlur"; this._defaultTexMap = 'assets/images/cubelight.png'; @@ -146,7 +146,7 @@ var RaidersMaterial = function RaidersMaterial() { this.inheritedFrom = RadialBlurMaterial; this.inheritedFrom(); - this._name = "RaidersMaterial"; + this._name = "Raiders Material"; this._shaderName = "raiders"; this._texMap = 'assets/images/raiders.png'; diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js index 0e67daf0..c9c2536f 100755 --- a/js/lib/rdge/materials/radial-gradient-material.js +++ b/js/lib/rdge/materials/radial-gradient-material.js @@ -12,7 +12,7 @@ var RadialGradientMaterial = function RadialGradientMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "RadialGradientMaterial"; + this._name = "Radial Gradient"; this._shaderName = "radialGradient"; this._defaultColor1 = [1, 0, 0, 1]; diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js index 0390337e..ab6b142e 100644 --- a/js/lib/rdge/materials/relief-tunnel-material.js +++ b/js/lib/rdge/materials/relief-tunnel-material.js @@ -13,7 +13,7 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "ReliefTunnelMaterial"; + this._name = "Relief Tunnel"; this._shaderName = "reliefTunnel"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/square-tunnel-material.js b/js/lib/rdge/materials/square-tunnel-material.js index df2193c4..1f049a2c 100644 --- a/js/lib/rdge/materials/square-tunnel-material.js +++ b/js/lib/rdge/materials/square-tunnel-material.js @@ -11,7 +11,7 @@ var SquareTunnelMaterial = function SquareTunnelMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "SquareTunnelMaterial"; + this._name = "Square Tunnel"; this._shaderName = "squareTunnel"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/star-material.js b/js/lib/rdge/materials/star-material.js index c99a1639..760cf128 100644 --- a/js/lib/rdge/materials/star-material.js +++ b/js/lib/rdge/materials/star-material.js @@ -11,7 +11,7 @@ var StarMaterial = function StarMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "StarMaterial"; + this._name = "Star"; this._shaderName = "star"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/taper-material.js b/js/lib/rdge/materials/taper-material.js index 0ae039f7..f6aa782c 100644 --- a/js/lib/rdge/materials/taper-material.js +++ b/js/lib/rdge/materials/taper-material.js @@ -20,7 +20,7 @@ var TaperMaterial = function TaperMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "TaperMaterial"; + this._name = "Taper"; this._shaderName = "taper"; this._deltaTime = 0.0; diff --git a/js/lib/rdge/materials/tunnel-material.js b/js/lib/rdge/materials/tunnel-material.js index ec5eff99..34e96ef9 100644 --- a/js/lib/rdge/materials/tunnel-material.js +++ b/js/lib/rdge/materials/tunnel-material.js @@ -12,7 +12,7 @@ var TunnelMaterial = function TunnelMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "TunnelMaterial"; + this._name = "Tunnel"; this._shaderName = "tunnel"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/twist-material.js b/js/lib/rdge/materials/twist-material.js index 9a78914d..b757afb8 100644 --- a/js/lib/rdge/materials/twist-material.js +++ b/js/lib/rdge/materials/twist-material.js @@ -13,7 +13,7 @@ var TwistMaterial = function TwistMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "TwistMaterial"; + this._name = "Twist"; this._shaderName = "twist"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/twist-vert-material.js b/js/lib/rdge/materials/twist-vert-material.js index 6cffa29f..7c2dae5e 100644 --- a/js/lib/rdge/materials/twist-vert-material.js +++ b/js/lib/rdge/materials/twist-vert-material.js @@ -20,7 +20,7 @@ var TwistVertMaterial = function TwistVertMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "TwistVertMaterial"; + this._name = "Twist Vertex"; this._shaderName = "twistVert"; this._tex0 = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js index 3dffb238..febf765f 100755 --- a/js/lib/rdge/materials/uber-material.js +++ b/js/lib/rdge/materials/uber-material.js @@ -12,7 +12,7 @@ var UberMaterial = function UberMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "UberMaterial"; + this._name = "Uber"; this._shaderName = "uber"; this.getShaderName = function () { return this._shaderName; }; diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js index 1dd127fc..f2ef0e49 100644 --- a/js/lib/rdge/materials/water-material.js +++ b/js/lib/rdge/materials/water-material.js @@ -16,7 +16,7 @@ var WaterMaterial = function WaterMaterial() /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "WaterMaterial"; + this._name = "Water"; this._shaderName = "water"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/lib/rdge/materials/z-invert-material.js b/js/lib/rdge/materials/z-invert-material.js index f1526b39..b8870eb4 100644 --- a/js/lib/rdge/materials/z-invert-material.js +++ b/js/lib/rdge/materials/z-invert-material.js @@ -12,7 +12,7 @@ var ZInvertMaterial = function ZInvertMaterial() { /////////////////////////////////////////////////////////////////////// // Instance variables /////////////////////////////////////////////////////////////////////// - this._name = "ZInvertMaterial"; + this._name = "Z-Invert"; this._shaderName = "zinvert"; this._defaultTexMap = 'assets/images/rocky-normal.jpg'; diff --git a/js/models/materials-model.js b/js/models/materials-model.js index f18f086e..d8f9a9e2 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -61,8 +61,8 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new PlasmaMaterial()); this.addMaterial(new PulseMaterial()); //this.addMaterial(new ParisMaterial()); - this.addMaterial(new RadialGradientMaterial()); this.addMaterial(new RadialBlurMaterial()); + this.addMaterial(new RadialGradientMaterial()); this.addMaterial(new RaidersMaterial()); this.addMaterial(new ReliefTunnelMaterial()); this.addMaterial(new SquareTunnelMaterial()); 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" } ] } diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index 75843b66..38a6865c 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js @@ -282,29 +282,29 @@ exports.MaterialsPopup = Montage.create(Component, { this._useSelection = false; 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") + (materialID === "Bump Metal") || + (materialID === "Deform") || + (materialID === "Flat") || + (materialID === "Flag") || + (materialID === "Fly") || + (materialID === "Julia") || + (materialID === "Keleidoscope") || + (materialID === "Linear Gradient") || + (materialID === "Mandel") || + (materialID === "Plasma") || + (materialID === "Pulse") || + (materialID === "Radial Blur") || + (materialID === "Radial Gradient") || + (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 ); -- cgit v1.2.3