shootingstar.map: lengthened the ship, adding some detail along the way.

avenger_cockpit.map: changed glass material.
jupiter.map: various detail changes.
kvalsund.map: added a spinning fan to the side.
glass.shader: changed the plain glass material to use the skybox.

1 files changed, 22 insertions, 16 deletions

diff --git a/base/materials/glass.shader b/base/materials/glass.shader
index a39bd4f..a6de032 100644
--- a/base/materials/glass.shader
+++ b/base/materials/glass.shader
@@ -1,7 +1,14 @@
+// glass material list
+//
+// TODO:
+//   if and when multitexturing is available in the engine, the old glass_env
+// will be blended on top of the sky cubemap to hide the lack of actual objects
+// in the reflection on the surface. see textures/glass/plain for a proposed
+// material.
+
 textures/glass/blue
 {
 	qer_editorimage textures/glass/blue
-	texture textures/fx/glass_env
 	color 0.00 0.00 1.00
 	environment
 }
@@ -9,7 +16,6 @@ textures/glass/blue
 textures/glass/red
 {
 	qer_editorimage textures/glass/red
-	texture textures/fx/glass_env
 	color 1.00 0.00 0.00
 	environment
 }
@@ -17,7 +23,6 @@ textures/glass/red
 textures/glass/green
 {
 	qer_editorimage textures/glass/green
-	texture textures/fx/glass_env
 	color 0.00 1.00 0.00
 	environment
 }
@@ -25,7 +30,6 @@ textures/glass/green
 textures/glass/yellow
 {
 	qer_editorimage textures/glass/yellow
-	texture textures/fx/glass_env
 	color 1.00 1.00 0.00
 	environment
 }
@@ -33,7 +37,6 @@ textures/glass/yellow
 textures/glass/orange
 {
 	qer_editorimage textures/glass/orange
-	texture textures/fx/glass_env
 	color 1.00 0.50 0.00
 	environment
 }
@@ -41,7 +44,6 @@ textures/glass/orange
 textures/glass/brown
 {
 	qer_editorimage textures/glass/brown
-	texture textures/fx/glass_env
 	color 0.5 0.25 0.00
 	environment
 }
@@ -49,7 +51,6 @@ textures/glass/brown
 textures/glass/purple
 {
 	qer_editorimage textures/glass/purple
-	texture textures/fx/glass_env
 	color 0.5 0.00 0.50
 	environment
 }
@@ -57,24 +58,34 @@ textures/glass/purple
 textures/glass/dark
 {
 	qer_editorimage textures/glass/dark
-	texture textures/fx/glass_env
-	color 0.10 0.10 0.10
+	color 0.5 0.5 0.5
 	environment
 }
 
 textures/glass/plain
 {
 	qer_editorimage textures/glass/plain
-	texture textures/fx/glass_env
 	color 1.00 1.00 1.00
 	environment
 	bright
+
+	// this is a proposed material, assuming a multitexture implementation
+	// will be much like the quake 3 shader system.
+	// qer_editorimage textures/glass/plain
+	// bright
+	// {
+	//	map $skybox
+	//	environment
+	// }
+	// {
+	//	map textures/fx/glass_env
+	//	blend GL_DST_COLOR, GL_ONE
+	// }
 }
 
 textures/glass/entity
 {
 	qer_editorimage textures/glass/entity
-	texture textures/fx/glass_env
 	color 1.00 1.00 1.00
 	entity
 	environment
@@ -83,7 +94,6 @@ textures/glass/entity
 textures/glass/entity_dark
 {
 	qer_editorimage textures/glass/entity_dark
-	texture textures/fx/glass_env
 	color 0.5 0.5 0.5
 	entity
 	environment
@@ -92,7 +102,6 @@ textures/glass/entity_dark
 textures/glass/entity_second
 {
 	qer_editorimage textures/glass/entity_second
-	texture textures/fx/glass_env
 	color 1.00 1.00 1.00
 	entitySecond
 	environment
@@ -101,7 +110,6 @@ textures/glass/entity_second
 textures/glass/entity_second_dark
 {
 	qer_editorimage textures/glass/entity_second_dark
-	texture textures/fx/glass_env
 	color 0.5 0.5 0.5
 	entitySecond
 	environment
@@ -110,7 +118,6 @@ textures/glass/entity_second_dark
 textures/glass/entity_third
 {
 	qer_editorimage textures/glass/entity_third
-	texture textures/fx/glass_env
 	color 1.00 1.00 1.00
 	entityThird
 	environment
@@ -119,7 +126,6 @@ textures/glass/entity_third
 textures/glass/entity_third_dark
 {
 	qer_editorimage textures/glass/entity_third_dark
-	texture textures/fx/glass_env
 	color 0.5 0.5 0.5
 	entityThird
 	environment