Fix for line color.

Name change for all materials

25 files changed, 26 insertions, 25 deletions

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/