Disabled environment mapping on main color/entity materials.

Added glass materials.

3 files changed, 97 insertions, 14 deletions

diff --git a/base/materials/colors.shader b/base/materials/colors.shader
index 502d062..58b1924 100644
--- a/base/materials/colors.shader
+++ b/base/materials/colors.shader
@@ -8,7 +8,6 @@ textures/colors/black_bright
 {
 	qer_editorimage textures/colors/black
 	color 0.00 0.00 0.00
-	environment
 	bright
 }
 
@@ -22,7 +21,6 @@ textures/colors/white_bright
 {
 	qer_editorimage textures/colors/white
 	color 1.00 1.00 1.00
-	environment
 	bright
 }
 
@@ -36,7 +34,6 @@ textures/colors/red_bright
 {
 	qer_editorimage textures/colors/red
 	color 1.00 0.00 0.00
-	environment
 	bright
 }
 
@@ -44,14 +41,12 @@ textures/colors/orange
 {
 	qer_editorimage textures/colors/orange
 	color 1.00 0.50 0.00
-	environment
 }
 
 textures/colors/orange_bright
 {
 	qer_editorimage textures/colors/orange
 	color 1.00 0.50 0.00
-	environment
 	bright
 }
 
@@ -65,7 +60,6 @@ textures/colors/green_bright
 {
 	qer_editorimage textures/colors/green
 	color 0.00 1.00 0.00
-	environment
 	bright
 }
 
@@ -73,14 +67,12 @@ textures/colors/yellow
 {
 	qer_editorimage textures/colors/yellow
 	color 1.00 1.00 0.00
-	environment
 }
 
 textures/colors/yellow_bright
 {
 	qer_editorimage textures/colors/yellow
 	color 1.00 1.00 0.00
-	environment
 	bright
 }
 
@@ -94,7 +86,6 @@ textures/colors/blue_bright
 {
 	qer_editorimage textures/colors/blue
 	color 0.00 0.00 1.00
-	environment
 	bright
 }
 
@@ -108,7 +99,6 @@ textures/colors/grey25_bright
 {
 	qer_editorimage textures/colors/grey25
 	color 0.25 0.25 0.25
-	environment
 	bright
 }
 
@@ -122,7 +112,6 @@ textures/colors/grey50_bright
 {
 	qer_editorimage textures/colors/grey50
 	color 0.50 0.50 0.50
-	environment
 	bright
 }
 
@@ -136,7 +125,6 @@ textures/colors/grey75_bright
 {
 	qer_editorimage textures/colors/grey75
 	color 0.75 0.75 0.75
-	environment
 	bright
 }
 
@@ -150,7 +138,6 @@ textures/colors/grey90_bright
 {
 	qer_editorimage textures/colors/grey90
 	color 0.90 0.90 0.90
-	environment
 	bright
 }
 
diff --git a/base/materials/glass.shader b/base/materials/glass.shader
new file mode 100644
index 0000000..8db87d6
--- /dev/null
+++ b/base/materials/glass.shader
@@ -0,0 +1,96 @@
+textures/glass/blue
+{
+	qer_editorimage textures/glass/blue
+	color 0.00 0.00 1.00
+	environment
+}
+
+textures/glass/red
+{
+	qer_editorimage textures/glass/red
+	color 1.00 0.00 0.00
+	environment
+}
+
+textures/glass/green
+{
+	qer_editorimage textures/glass/green
+	color 0.00 1.00 0.00
+	environment
+}
+
+textures/glass/yellow
+{
+	qer_editorimage textures/glass/yellow
+	color 1.00 1.00 0.00
+	environment
+}
+
+textures/glass/orange
+{
+	qer_editorimage textures/glass/orange
+	color 1.00 0.50 0.00
+	environment
+}
+
+textures/glass/dark
+{
+	qer_editorimage textures/glass/blue
+	color 0.25 0.25 0.25
+	environment
+}
+
+textures/glass/plain
+{
+	qer_editorimage textures/glass/plain
+	color 1.00 1.00 1.00
+	environment
+}
+
+textures/glass/entity
+{
+	qer_editorimage textures/glass/entity
+	color 1.00 1.00 1.00
+	entity
+	environment
+}
+
+textures/glass/entity_dark
+{
+	qer_editorimage textures/glass/entity_dark
+	color 0.5 0.5 0.5
+	entity
+	environment
+}
+
+textures/glass/entity_second
+{
+	qer_editorimage textures/glass/entity_second
+	color 1.00 1.00 1.00
+	entitySecond
+	environment
+}
+
+textures/glass/entity_second_dark
+{
+	qer_editorimage textures/glass/entity_second_dark
+	color 0.5 0.5 0.5
+	entitySecond
+	environment
+}
+
+textures/glass/entity_third
+{
+	qer_editorimage textures/glass/entity_third
+	color 1.00 1.00 1.00
+	entityThird
+	environment
+}
+
+textures/glass/entity_third_dark
+{
+	qer_editorimage textures/glass/entity_third_dark
+	color 0.5 0.5 0.5
+	entityThird
+	environment
+}
diff --git a/base/materials/shaderlist.txt b/base/materials/shaderlist.txt
index 9aa8869..a88289d 100644
--- a/base/materials/shaderlist.txt
+++ b/base/materials/shaderlist.txt
@@ -1,3 +1,3 @@
 common
 colors
-
+glass