aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
Diffstat (limited to 'js/lib')
-rwxr-xr-xjs/lib/geom/line.js1
-rwxr-xr-xjs/lib/rdge/materials/bump-metal-material.js2
-rw-r--r--js/lib/rdge/materials/cloud-material.js2
-rw-r--r--js/lib/rdge/materials/deform-material.js2
-rw-r--r--js/lib/rdge/materials/flag-material.js2
-rwxr-xr-xjs/lib/rdge/materials/flat-material.js2
-rw-r--r--js/lib/rdge/materials/fly-material.js2
-rw-r--r--js/lib/rdge/materials/julia-material.js2
-rw-r--r--js/lib/rdge/materials/keleidoscope-material.js2
-rwxr-xr-xjs/lib/rdge/materials/linear-gradient-material.js2
-rw-r--r--js/lib/rdge/materials/mandel-material.js2
-rw-r--r--js/lib/rdge/materials/plasma-material.js2
-rw-r--r--js/lib/rdge/materials/pulse-material.js2
-rw-r--r--js/lib/rdge/materials/radial-blur-material.js4
-rwxr-xr-xjs/lib/rdge/materials/radial-gradient-material.js2
-rw-r--r--js/lib/rdge/materials/relief-tunnel-material.js2
-rw-r--r--js/lib/rdge/materials/square-tunnel-material.js2
-rw-r--r--js/lib/rdge/materials/star-material.js2
-rw-r--r--js/lib/rdge/materials/taper-material.js2
-rw-r--r--js/lib/rdge/materials/tunnel-material.js2
-rw-r--r--js/lib/rdge/materials/twist-material.js2
-rw-r--r--js/lib/rdge/materials/twist-vert-material.js2
-rwxr-xr-xjs/lib/rdge/materials/uber-material.js2
-rw-r--r--js/lib/rdge/materials/water-material.js2
-rw-r--r--js/lib/rdge/materials/z-invert-material.js2
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, {
64 64
65 if(strokeMaterial) { 65 if(strokeMaterial) {
66 this._strokeMaterial = strokeMaterial; 66 this._strokeMaterial = strokeMaterial;
67 if (strokeColor && this._strokeMaterial.hasProperty( "color" )) this._strokeMaterial.setProperty( "color", this._strokeColor );
67 } 68 }
68 } 69 }
69 }, 70 },
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() {
16 /////////////////////////////////////////////////////////////////////// 16 ///////////////////////////////////////////////////////////////////////
17 // Instance variables 17 // Instance variables
18 /////////////////////////////////////////////////////////////////////// 18 ///////////////////////////////////////////////////////////////////////
19 this._name = "BumpMetalMaterial"; 19 this._name = "Bump Metal";
20 this._shaderName = "bumpMetal"; 20 this._shaderName = "bumpMetal";
21 21
22 22
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()
20 /////////////////////////////////////////////////////////////////////// 20 ///////////////////////////////////////////////////////////////////////
21 // Instance variables 21 // Instance variables
22 /////////////////////////////////////////////////////////////////////// 22 ///////////////////////////////////////////////////////////////////////
23 this._name = "CloudMaterial"; 23 this._name = "Cloud";
24 this._shaderName = "cloud"; 24 this._shaderName = "cloud";
25 25
26 this._texMap = 'assets/images/cloud10.png'; 26 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() {
11 /////////////////////////////////////////////////////////////////////// 11 ///////////////////////////////////////////////////////////////////////
12 // Instance variables 12 // Instance variables
13 /////////////////////////////////////////////////////////////////////// 13 ///////////////////////////////////////////////////////////////////////
14 this._name = "DeformMaterial"; 14 this._name = "Deform";
15 this._shaderName = "deform"; 15 this._shaderName = "deform";
16 16
17 this._defaultTexMap = 'assets/images/rocky-normal.jpg'; 17 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() {
13 /////////////////////////////////////////////////////////////////////// 13 ///////////////////////////////////////////////////////////////////////
14 // Instance variables 14 // Instance variables
15 /////////////////////////////////////////////////////////////////////// 15 ///////////////////////////////////////////////////////////////////////
16 this._name = "FlagMaterial"; 16 this._name = "Flag";
17 this._shaderName = "flag"; 17 this._shaderName = "flag";
18 18
19 this._texMap = 'assets/images/us_flag.png'; 19 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()
15 /////////////////////////////////////////////////////////////////////// 15 ///////////////////////////////////////////////////////////////////////
16 // Instance variables 16 // Instance variables
17 /////////////////////////////////////////////////////////////////////// 17 ///////////////////////////////////////////////////////////////////////
18 this._name = "FlatMaterial"; 18 this._name = "Flat";
19 this._shaderName = "flat"; 19 this._shaderName = "flat";
20 20
21 this._color = [1, 0, 0, 1]; 21 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() {
11 /////////////////////////////////////////////////////////////////////// 11 ///////////////////////////////////////////////////////////////////////
12 // Instance variables 12 // Instance variables
13 /////////////////////////////////////////////////////////////////////// 13 ///////////////////////////////////////////////////////////////////////
14 this._name = "FlyMaterial"; 14 this._name = "Fly";
15 this._shaderName = "fly"; 15 this._shaderName = "fly";
16 16
17 this._defaultTexMap = 'assets/images/rocky-normal.jpg'; 17 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() {
11 /////////////////////////////////////////////////////////////////////// 11 ///////////////////////////////////////////////////////////////////////
12 // Instance variables 12 // Instance variables
13 /////////////////////////////////////////////////////////////////////// 13 ///////////////////////////////////////////////////////////////////////
14 this._name = "JuliaMaterial"; 14 this._name = "Julia";
15 this._shaderName = "julia"; 15 this._shaderName = "julia";
16 16
17 this._defaultTexMap = 'assets/images/rocky-normal.jpg'; 17 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() {
11 /////////////////////////////////////////////////////////////////////// 11 ///////////////////////////////////////////////////////////////////////
12 // Instance variables 12 // Instance variables
13 /////////////////////////////////////////////////////////////////////// 13 ///////////////////////////////////////////////////////////////////////
14 this._name = "KeleidoscopeMaterial"; 14 this._name = "Keleidoscope";
15 this._shaderName = "keleidoscope"; 15 this._shaderName = "keleidoscope";
16 16
17 this._defaultTexMap = 'assets/images/rocky-normal.jpg'; 17 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() {
12 /////////////////////////////////////////////////////////////////////// 12 ///////////////////////////////////////////////////////////////////////
13 // Instance variables 13 // Instance variables
14 /////////////////////////////////////////////////////////////////////// 14 ///////////////////////////////////////////////////////////////////////
15 this._name = "LinearGradientMaterial"; 15 this._name = "Linear Gradient";
16 this._shaderName = "linearGradient"; 16 this._shaderName = "linearGradient";
17 17
18 this._color1 = [1, 0, 0, 1]; 18 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() {
11 /////////////////////////////////////////////////////////////////////// 11 ///////////////////////////////////////////////////////////////////////
12 // Instance variables 12 // Instance variables
13 /////////////////////////////////////////////////////////////////////// 13 ///////////////////////////////////////////////////////////////////////
14 this._name = "MandelMaterial"; 14 this._name = "Mandel";
15 this._shaderName = "mandel"; 15 this._shaderName = "mandel";
16 16
17 this._time = 0.0; 17 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() {
10 /////////////////////////////////////////////////////////////////////// 10 ///////////////////////////////////////////////////////////////////////
11 // Instance variables 11 // Instance variables
12 /////////////////////////////////////////////////////////////////////// 12 ///////////////////////////////////////////////////////////////////////
13 this._name = "PlasmaMaterial"; 13 this._name = "Plasma";
14 this._shaderName = "plasma"; 14 this._shaderName = "plasma";
15 15
16 this._time = 0.0; 16 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()
22 /////////////////////////////////////////////////////////////////////// 22 ///////////////////////////////////////////////////////////////////////
23 // Instance variables 23 // Instance variables
24 /////////////////////////////////////////////////////////////////////// 24 ///////////////////////////////////////////////////////////////////////
25 this._name = "PulseMaterial"; 25 this._name = "Pulse";
26 this._shaderName = "pulse"; 26 this._shaderName = "pulse";
27 27
28 this._texMap = 'assets/images/cubelight.png'; 28 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() {
10 /////////////////////////////////////////////////////////////////////// 10 ///////////////////////////////////////////////////////////////////////
11 // Instance variables 11 // Instance variables
12 ///////////////////////////////////////////////////////////////////////