Adapt material shaders to be cache-friendly. (Less defines, more uniforms)

gldefs/demolitionist.txt

@@ -7,10 +7,9 @@ Material Texture "models/DemoFace_Blank.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Blink.png"
 {
@@ -19,10 +18,9 @@ Material Texture "models/DemoFace_Blink.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Booty.png"
 {
@@ -31,10 +29,9 @@ Material Texture "models/DemoFace_Booty.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Dead.png"
 {
@@ -43,10 +40,9 @@ Material Texture "models/DemoFace_Dead.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Default.png"
 {
@@ -55,10 +51,9 @@ Material Texture "models/DemoFace_Default.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Dizzy.png"
 {
@@ -67,10 +62,9 @@ Material Texture "models/DemoFace_Dizzy.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Evil.png"
 {
@@ -79,10 +73,9 @@ Material Texture "models/DemoFace_Evil.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Grin.png"
 {
@@ -91,10 +84,9 @@ Material Texture "models/DemoFace_Grin.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Hurt.png"
 {
@@ -103,10 +95,9 @@ Material Texture "models/DemoFace_Hurt.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_HurtLeft.png"
 {
@@ -115,10 +106,9 @@ Material Texture "models/DemoFace_HurtLeft.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_HurtRight.png"
 {
@@ -127,10 +117,9 @@ Material Texture "models/DemoFace_HurtRight.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Off.png"
 {
@@ -138,10 +127,9 @@ Material Texture "models/DemoFace_Off.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Ouch.png"
 {
@@ -150,10 +138,9 @@ Material Texture "models/DemoFace_Ouch.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Sad.png"
 {
@@ -162,10 +149,9 @@ Material Texture "models/DemoFace_Sad.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Smug.png"
 {
@@ -174,10 +160,9 @@ Material Texture "models/DemoFace_Smug.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Unamused.png"
 {
@@ -186,10 +171,9 @@ Material Texture "models/DemoFace_Unamused.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoFace_Wink.png"
 {
@@ -198,10 +182,9 @@ Material Texture "models/DemoFace_Wink.png"
 	Texture "masktex" "models/DemoFace_mask.png"
 	Texture "envtex" "models/envmap/glss4env.png"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".6" "1." "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTags.png"
 {
@@ -210,10 +193,9 @@ Material Texture "models/DemoTags.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsBlue.png"
 {
@@ -222,10 +204,9 @@ Material Texture "models/DemoTagsBlue.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsCyan.png"
 {
@@ -234,10 +215,9 @@ Material Texture "models/DemoTagsCyan.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsDragonfly.png"
 {
@@ -246,10 +226,9 @@ Material Texture "models/DemoTagsDragonfly.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsGold.png"
 {
@@ -258,10 +237,9 @@ Material Texture "models/DemoTagsGold.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsMagenta.png"
 {
@@ -270,10 +248,9 @@ Material Texture "models/DemoTagsMagenta.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsOrange.png"
 {
@@ -282,10 +259,9 @@ Material Texture "models/DemoTagsOrange.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsPeach.png"
 {
@@ -294,10 +270,9 @@ Material Texture "models/DemoTagsPeach.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsPink.png"
 {
@@ -306,10 +281,9 @@ Material Texture "models/DemoTagsPink.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsPurple.png"
 {
@@ -318,10 +292,9 @@ Material Texture "models/DemoTagsPurple.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsRed.png"
 {
@@ -330,10 +303,9 @@ Material Texture "models/DemoTagsRed.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsViolet.png"
 {
@@ -342,10 +314,9 @@ Material Texture "models/DemoTagsViolet.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsWhite.png"
 {
@@ -354,10 +325,9 @@ Material Texture "models/DemoTagsWhite.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsYellow.png"
 {
@@ -366,10 +336,9 @@ Material Texture "models/DemoTagsYellow.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsBlack.png"
 {
@@ -378,10 +347,9 @@ Material Texture "models/DemoTagsBlack.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoTagsRust.png"
 {
@@ -390,10 +358,9 @@ Material Texture "models/DemoTagsRust.png"
 	Texture "masktex" "models/DemoTags_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.4" "1." "1."
-	Define "RIMFACT" = "1.4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/DemoArms.png"
 {
@@ -403,14 +370,10 @@ Material Texture "models/DemoArms.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
 	Texture "envtex2" "models/envmap/iceenv.png"
 	Texture "rimtex2" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "EnvFact" = "1.5" "1.2" "1."
-	Define "RIMFACT" = "1.3"
+	Uniform vec3 "RimFact" = "1.3" "1.4" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
-	Define "RIMSTEP2" = "0."
 }
 Material Texture "models/DemoBody.png"
 {
@@ -422,17 +385,10 @@ Material Texture "models/DemoBody.png"
 	Texture "rimtex2" "models/envmap/icerim.png"
 	Texture "envtex3" "models/envmap/ekaenv.png"
 	Texture "rimtex3" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "EnvFact" = "1.5" "1.2" ".8"
-	Define "RIMFACT" = "1.3"
+	Uniform vec3 "RimFact" = "1.3" "1.4" ".9"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." "0."
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
-	Define "RIMSTEP2" = "0."
-	Define "ENVFACT3" = ".8"
-	Define "RIMFACT3" = ".9"
-	Define "RIMSTEP3" = "0."
 }
 Material Texture "models/DemoHead.png"
 {
@@ -442,14 +398,10 @@ Material Texture "models/DemoHead.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
 	Texture "envtex2" "models/envmap/iceenv.png"
 	Texture "rimtex2" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "EnvFact" = "1.5" "1.2" "1."
-	Define "RIMFACT" = "1.3"
+	Uniform vec3 "RimFact" = "1.3" "1.4" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
-	Define "RIMSTEP2" = "0."
 }
 Material Texture "models/DemoLegs.png"
 {
@@ -461,17 +413,10 @@ Material Texture "models/DemoLegs.png"
 	Texture "rimtex2" "models/envmap/icerim.png"
 	Texture "envtex3" "models/envmap/lavaenv.png"
 	Texture "rimtex3" "models/envmap/lavarim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "EnvFact" = "1.5" "1.2" ".8"
-	Define "RIMFACT" = "1.3"
+	Uniform vec3 "RimFact" = "1.3" "1.4" ".9"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." "0."
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
-	Define "RIMSTEP2" = "0."
-	Define "ENVFACT3" = ".8"
-	Define "RIMFACT3" = ".9"
-	Define "RIMSTEP3" = "0."
 }
 Material Texture "models/DemoKeys.png"
 {
@@ -483,17 +428,10 @@ Material Texture "models/DemoKeys.png"
 	Texture "rimtex2" "models/envmap/goldrim.png"
 	Texture "envtex3" "models/envmap/iceenv.png"
 	Texture "rimtex3" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = ".9"
+	Uniform vec3 "EnvFact" = ".9" ".8" ".5"
-	Define "RIMFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.2" ".9" ".8"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." ".5"
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = "0."
-	Define "ENVFACT3" = ".5"
-	Define "RIMFACT3" = ".8"
-	Define "RIMSTEP3" = "0."
 }
 Material Texture "models/DemoMisc.png"
 {
@@ -505,17 +443,10 @@ Material Texture "models/DemoMisc.png"
 	Texture "rimtex2" "models/envmap/silverrim.png"
 	Texture "envtex3" "models/envmap/iceenv.png"
 	Texture "rimtex3" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "EnvFact" = "1.2" ".9" ".5"
-	Define "RIMFACT" = "1.1"
+	Uniform vec3 "RimFact" = "1.1" "1.2" ".8"
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" "0." "0."
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = ".9"
-	Define "RIMFACT2" = "1.2"
-	Define "RIMSTEP2" = "0."
-	Define "ENVFACT3" = ".5"
-	Define "RIMFACT3" = ".8"
-	Define "RIMSTEP3" = "0."
 }
 Material Texture "models/DemoSoft.png"
 {
@@ -523,6 +454,9 @@ Material Texture "models/DemoSoft.png"
 	Texture "masktex" "models/DemoSoft_mask.png"
 	Texture "envtex" "models/envmap/darkenv.png"
 	Texture "rimtex" "models/envmap/darkrim.png"
+	Uniform vec3 "EnvFact" = ".3" "1." "1."
+	Uniform vec3 "RimFact" = ".5" "1." "1."
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
 	Define "RIM_LIGHTING"
 	Define "ENVFACT" = ".3"
 	Define "RIMFACT" = ".5"

gldefs/dlc/dlcammo.txt

@@ -8,14 +8,10 @@ Material Texture "models/SheenBullet.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Texture "envtex2" "models/envmap/telenv.png"
 	Texture "rimtex2" "models/envmap/telrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".9"
+	Uniform vec3 "EnvFact" = ".9" "1.1" "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimFact" = ".8" "1.3" "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" "0." ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = "1.1"
-	Define "RIMFACT2" = "1.3"
-	Define "RIMSTEP2" = "0."
 }
 Material Texture "models/SheenBullet_Fired.png"
 {
@@ -25,14 +21,10 @@ Material Texture "models/SheenBullet_Fired.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Texture "envtex2" "models/envmap/telenv.png"
 	Texture "rimtex2" "models/envmap/telrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".9"
+	Uniform vec3 "EnvFact" = ".9" "1.1" "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimFact" = ".8" "1.3" "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" "0." ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = "1.1"
-	Define "RIMFACT2" = "1.3"
-	Define "RIMSTEP2" = "0."
 }
 Material Texture "models/SheenAmmoBox.png"
 {
@@ -42,14 +34,10 @@ Material Texture "models/SheenAmmoBox.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Texture "envtex2" "models/envmap/telenv.png"
 	Texture "rimtex2" "models/envmap/telrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".7"
+	Uniform vec3 "EnvFact" = ".7" ".8" "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimFact" = ".8" ".9" "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" "0." ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = "0."
 }
 Material Texture "models/QuadCell.png"
 {
@@ -60,14 +48,10 @@ Material Texture "models/QuadCell.png"
 	Texture "rimtex" "models/envmap/lavarim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "EnvFact" = ".8" ".8" "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimFact" = ".9" ".9" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".2" ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".2"
 }
 Material Texture "models/QuadCell_Used.png"
 {
@@ -77,14 +61,10 @@ Material Texture "models/QuadCell_Used.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "EnvFact" = ".8" ".8" "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimFact" = ".9" ".9" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".2" ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".2"
 }
 
 PointLight QUADAMMOLIGHT

gldefs/dlc/hammer.txt

@@ -6,8 +6,7 @@ Material Texture "models/CombatHammer.png"
 	Texture "masktex" "models/CombatHammer_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.2" "1." "1."
-	Define "ENVFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.5" "1." "1."
-	Define "RIMFACT" = "1.5"
+	Uniform vec3 "RimStep" = ".4" ".5" ".5"
-	Define "RIMSTEP" = ".4"
 }

gldefs/dlc/mortalrifle.txt

@@ -4,7 +4,7 @@ Material Texture "models/MortalSight.png"
 {
 	Brightmap "brightmaps/fullbright.png"
 	Shader "shaders/glsl/Overbright.fp"
-	Define "OVERFACT" = "4."
+	Uniform float "OverFact" = "4."
 }
 Material Texture "models/MortalRifle.png"
 {
@@ -14,11 +14,10 @@ Material Texture "models/MortalRifle.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
 	Texture "envtex2" "models/envmap/iceenv.png"
 	Texture "rimtex2" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "EnvFact" = "1.5" "1." "1."
-	Define "RIMFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.2" "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "ENV_TWOLAYER"
 }
 Material Texture "models/MortalMag.png"
 {
@@ -29,11 +28,10 @@ Material Texture "models/MortalMag.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
 	Texture "envtex2" "models/envmap/iceenv.png"
 	Texture "rimtex2" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "EnvFact" = "1.5" "1." "1."
-	Define "RIMFACT" = "1.2"
+	Uniform vec3 "RimFact" = "1.2" "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "ENV_TWOLAYER"
 }
 Material Texture "models/MortalMag_Empty.png"
 {
@@ -42,10 +40,9 @@ Material Texture "models/MortalMag_Empty.png"
 	Texture "masktex" "models/MortalMag_Empty_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1.5" "1." "1."
-	Define "ENVFACT" = "1.5"
+	Uniform vec3 "RimFact" = "1.2" "1." "1."
-	Define "RIMFACT" = "1.2"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "RIMSTEP" = ".2"
 }
 Material Texture "models/MortalRound.png"
 {
@@ -53,7 +50,9 @@ Material Texture "models/MortalRound.png"
 	Texture "masktex" "models/MortalRound_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/MortalRound_Used.png"
 {
@@ -61,7 +60,9 @@ Material Texture "models/MortalRound_Used.png"
 	Texture "masktex" "models/MortalRound_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/MortalGrenade.png"
 {
@@ -70,7 +71,9 @@ Material Texture "models/MortalGrenade.png"
 	Texture "masktex" "models/MortalGrenade_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/MortalGrenade_Used.png"
 {
@@ -79,18 +82,21 @@ Material Texture "models/MortalGrenade_Used.png"
 	Texture "masktex" "models/MortalGrenade_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/MortalLED.png"
 {
 	Shader "shaders/glsl/CanvasProxy.fp"
 	Texture "scrtex" "MORTLED1"
+	Uniform int "CanvasFlags" = "0x00"
 }
 Material Texture "models/MortalLED2.png"
 {
 	Shader "shaders/glsl/CanvasProxy.fp"
 	Texture "scrtex" "MORTLED2"
-	Define "ALPHA_KEY" = "vec3(0.)"	// key out pure black
+	Uniform int "CanvasFlags" = "0x04"	// key out pure black
 }
 
 PointLight MISTERRIFLELIGHT

gldefs/dlc/plasmablast.txt

@@ -7,20 +7,21 @@ Material Texture "models/PlasmaBlast.png"
 	Texture "masktex" "models/PlasmaBlast_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "ENVFACT" = "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
-	Define "RIMFACT" = "1."
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/PlasmaLED_R.png"
 {
 	Shader "shaders/glsl/CanvasProxy.fp"
 	Texture "scrtex" "PLASBLDR"
+	Uniform int "CanvasFlags" = "0x00"
 }
 Material Texture "models/PlasmaLED_L.png"
 {
 	Shader "shaders/glsl/CanvasProxy.fp"
 	Texture "scrtex" "PLASBLDL"
+	Uniform int "CanvasFlags" = "0x00"
 }
 Material Texture "models/PlasmaBlast_1stR.png"
 {
@@ -28,15 +29,12 @@ Material Texture "models/PlasmaBlast_1stR.png"
 	Texture "masktex" "models/PlasmaBlast_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
-	Define "ENVFACT" = "1."
-	Define "RIMFACT" = "1."
-	Define "RIMSTEP" = "0."
 	Texture "fadetex" "PLASBFDR"
 	Texture "battex" "models/PlasmaBlast_battery.png"
 	Texture "chgtex" "models/PlasmaBlast_charge.png"
 	Texture "gradtex" "models/PlasmaBlast_grad.png"
 	Texture "noisetex" "textures/roughwarp.png"
+	Uniform vec3 "EnvParams" = "1." "1." "0."
 }
 Material Texture "models/PlasmaBlast_1stL.png"
 {
@@ -44,13 +42,10 @@ Material Texture "models/PlasmaBlast_1stL.png"
 	Texture "masktex" "models/PlasmaBlast_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
-	Define "ENVFACT" = "1."
-	Define "RIMFACT" = "1."
-	Define "RIMSTEP" = "0."
 	Texture "fadetex" "PLASBFDL"
 	Texture "battex" "models/PlasmaBlast_battery.png"
 	Texture "chgtex" "models/PlasmaBlast_charge.png"
 	Texture "gradtex" "models/PlasmaBlast_grad.png"
 	Texture "noisetex" "textures/roughwarp.png"
+	Uniform vec3 "EnvParams" = "1." "1." "0."
 }

gldefs/dlc/quadravol.txt

@@ -8,19 +8,16 @@ Material Texture "models/Quadravol.png"
 	Texture "rimtex" "models/envmap/darkrim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "EnvFact" = ".4" ".8" "1."
-	Define "RIMFACT" = ".6"
+	Uniform vec3 "RimFact" = ".6" ".9" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".2" ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".2"
 }
 Material Texture "models/QuadLED.png"
 {
 	Shader "shaders/glsl/CanvasProxy.fp"
 	Texture "scrtex" "QUADRLED"
+	Uniform int "CanvasFlags" = "0x00"
 }
 
 PointLight QUADP1LIGHT

gldefs/dlc/sheenhmg.txt

@@ -8,19 +8,16 @@ Material Texture "models/SheenHMG.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".7"
+	Uniform vec3 "EnvFact" = ".7" ".6" "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimFact" = ".9" ".4" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".2" ".5"
-	Define "ENV_TWOLAYER"
-	Define "ENVFACT2" = ".6"
-	Define "RIMFACT2" = ".4"
-	Define "RIMSTEP2" = ".2"
 }
 Material Texture "models/SheenLED.png"
 {
 	Shader "shaders/glsl/CanvasProxy.fp"
 	Texture "scrtex" "SHEENLED"
+	Uniform int "CanvasFlags" = "0x00"
 }
 
 PointLight SHEENTLIGHT

gldefs/envmaps.txt

@@ -4,208 +4,187 @@ Material Texture "models/envmap/blodenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/blodrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1.5" ".35"
-	Define "ENVFACT" = ".5"
-	Define "RIMFACT" = "1.5"
-	Define "RIMSTEP" = ".35"
 }
 Material Texture "models/envmap/bluenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/darkenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/darkrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".3" "1.1" ".5"
-	Define "ENVFACT" = ".3"
-	Define "RIMFACT" = "1.1"
 }
 Material Texture "models/envmap/dekaenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/dekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/ekaenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/glassenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glassrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1." ".5"
-	Define "ENVFACT" = ".5"
 }
 Material Texture "models/envmap/glss2env.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glss2rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1." ".5"
-	Define "ENVFACT" = ".5"
 }
 Material Texture "models/envmap/glss3env.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glss3rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1." ".5"
-	Define "ENVFACT" = ".5"
 }
 Material Texture "models/envmap/glss4env.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glss4rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1." ".5"
-	Define "ENVFACT" = ".5"
 }
 Material Texture "models/envmap/glss5env.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glss5rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1." ".5"
-	Define "ENVFACT" = ".5"
 }
 Material Texture "models/envmap/glss6env.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glss6rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "1." ".5"
-	Define "ENVFACT" = ".5"
 }
 Material Texture "models/envmap/goldenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/greenenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/greenrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/iceenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".6" "1." ".5"
-	Define "ENVFACT" = ".6"
 }
 Material Texture "models/envmap/kinyenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/kinyrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1.5" "0."
-	Define "RIMFACT" = "1.5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/envmap/lavaenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/lavarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1.5" ".35"
-	Define "RIMFACT" = "1.5"
-	Define "RIMSTEP" = ".35"
 }
 Material Texture "models/envmap/leadenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/nokrenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/nokrrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1.5" "0."
-	Define "RIMFACT" = "1.5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/envmap/nukenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/nukrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".25"
-	Define "RIMSTEP" = ".25"
 }
 Material Texture "models/envmap/ockoenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/ockorim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/pronoenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/pronorim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/puroenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/purorim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/purpenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/redenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/redrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/reflenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/reflrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/rfl2env.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/rfl2rim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/silverenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/tarenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/tarrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1.5" ".25"
-	Define "RIMFACT" = "1.5"
-	Define "RIMSTEP" = ".25"
 }
 Material Texture "models/envmap/telenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/telrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "models/envmap/watrenv.png"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/watrrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 }
 Material Texture "ERRORENV"
 {
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/redrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = "1." "1." ".5"
 	Define "AMBIENT_GLOW"
 }
 Material Texture "BARRIENV"
@@ -213,9 +192,6 @@ Material Texture "BARRIENV"
 	Shader "shaders/glsl/Envmap.fp"
 	Texture "rimtex" "models/envmap/glss3rim.png"
 	Texture "bartex" "models/barrierbar.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvParams" = ".5" "2." ".3"
 	Define "BARRIER_MAP"
-	Define "ENVFACT" = ".5"
-	Define "RIMFACT" = "2."
-	Define "RIMSTEP" = ".3"
 }

gldefs/items/ammo.txt

@@ -6,10 +6,9 @@ Material Texture "models/ExplodiumBullet.png"
 	Texture "masktex" "models/ExplodiumBullet_mask.png"
 	Texture "envtex" "models/envmap/lavaenv.png"
 	Texture "rimtex" "models/envmap/lavarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".8" "1." "1."
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "RIMSTEP" = ".2"
 }
 Material Texture "models/ExplodiumCasing.png"
 {
@@ -17,9 +16,9 @@ Material Texture "models/ExplodiumCasing.png"
 	Texture "masktex" "models/ExplodiumCasing_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/ExplodiumCasing_Used.png"
 {
@@ -27,9 +26,9 @@ Material Texture "models/ExplodiumCasing_Used.png"
 	Texture "masktex" "models/ExplodiumCasing_Used_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Shell_Normal.png"
 {
@@ -37,9 +36,9 @@ Material Texture "models/Shell_Normal.png"
 	Texture "masktex" "models/Shell_Normal_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Shell_Normal_Used.png"
 {
@@ -47,9 +46,9 @@ Material Texture "models/Shell_Normal_Used.png"
 	Texture "masktex" "models/Shell_Normal_Used_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Shell_Gold.png"
 {
@@ -59,12 +58,10 @@ Material Texture "models/Shell_Gold.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
 	Texture "envtex2" "models/envmap/goldenv.png"
 	Texture "rimtex2" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "EnvFact" = ".4" ".6" "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimFact" = ".8" ".9" "1."
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
-	Define "ENVFACT2" = ".6"
-	Define "RIMFACT2" = ".9"
 }
 Material Texture "models/Shell_Gold_Used.png"
 {
@@ -74,12 +71,10 @@ Material Texture "models/Shell_Gold_Used.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
 	Texture "envtex2" "models/envmap/goldenv.png"
 	Texture "rimtex2" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "EnvFact" = ".4" ".6" "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimFact" = ".8" ".9" "1."
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
-	Define "ENVFACT2" = ".6"
-	Define "RIMFACT2" = ".9"
 }
 Material Texture "models/EvisceratorShell.png"
 {
@@ -87,10 +82,9 @@ Material Texture "models/EvisceratorShell.png"
 	Texture "masktex" "models/EvisceratorShell_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".8" "1." "1."
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/HellblazerMissile.png"
 {
@@ -98,10 +92,9 @@ Material Texture "models/HellblazerMissile.png"
 	Texture "masktex" "models/HellblazerMissile_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".4" "1." "1."
-	Define "RIMFACT" = ".4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/SparksterAmmo.png"
 {
@@ -110,9 +103,9 @@ Material Texture "models/SparksterAmmo.png"
 	Texture "masktex" "models/SparksterAmmo_mask.png"
 	Texture "envtex" "models/envmap/dekaenv.png"
 	Texture "rimtex" "models/envmap/dekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".75" "1." "1."
-	Define "ENVFACT" = ".75"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/SilverBulletAmmo.png"
 {
@@ -124,17 +117,10 @@ Material Texture "models/SilverBulletAmmo.png"
 	Texture "rimtex2" "models/envmap/goldrim.png"
 	Texture "envtex3" "models/envmap/silverenv.png"
 	Texture "rimtex3" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "EnvFact" = ".6" "1.1" ".8"
-	Define "RIMFACT" = ".5"
+	Uniform vec3 "RimFact" = ".5" "1.3" ".9"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." ".2"
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = "1.1"
-	Define "RIMFACT2" = "1.3"
-	Define "RIMSTEP2" = "0."
-	Define "ENVFACT3" = ".8"
-	Define "RIMFACT3" = ".9"
-	Define "RIMSTEP3" = ".2"
 }
 Material Texture "models/SilverBulletAmmo_Empty.png"
 {
@@ -142,10 +128,9 @@ Material Texture "models/SilverBulletAmmo_Empty.png"
 	Texture "masktex" "models/SilverBulletAmmo_Empty_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "ENVFACT" = ".7"
+	Uniform vec3 "RimFact" = "1." "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/SilverBulletBullet.png"
 {
@@ -155,13 +140,10 @@ Material Texture "models/SilverBulletBullet.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
 	Texture "envtex2" "models/envmap/silverenv.png"
 	Texture "rimtex2" "models/envmap/silverrim.png"
-	Define "ENVFACT" = "1.1"
+	Define "ENV_LAYERS" = "2"
-	Define "RIMFACT" = "1.3"
+	Uniform vec3 "EnvFact" = "1.1" ".8" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimFact" = "1.3" ".9" "1."
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "RimStep" = "0." ".2" ".5"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".2"
 }
 Material Texture "models/SilverBulletBullet_Used.png"
 {
@@ -171,13 +153,10 @@ Material Texture "models/SilverBulletBullet_Used.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
 	Texture "envtex2" "models/envmap/silverenv.png"
 	Texture "rimtex2" "models/envmap/silverrim.png"
-	Define "ENVFACT" = "1.1"
+	Define "ENV_LAYERS" = "2"
-	Define "RIMFACT" = "1.3"
+	Uniform vec3 "EnvFact" = "1.1" ".8" "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimFact" = "1.3" ".9" "1."
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "RimStep" = "0." ".2" ".5"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".2"
 }
 Material Texture "models/CandyBullet.png"
 {
@@ -185,10 +164,9 @@ Material Texture "models/CandyBullet.png"
 	Texture "masktex" "models/ExplodiumBullet_mask.png"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".9" "1." "1."
-	Define "ENVFACT" = ".9"
+	Uniform vec3 "RimFact" = ".4" "1." "1."
-	Define "RIMFACT" = ".4"
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "RIMSTEP" = "0."
 }
 Material Texture "models/CandyCasing.png"
 {
@@ -196,9 +174,9 @@ Material Texture "models/CandyCasing.png"
 	Texture "masktex" "models/ExplodiumCasing_mask.png"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/CandyCasing_Used.png"
 {
@@ -206,9 +184,9 @@ Material Texture "models/CandyCasing_Used.png"
 	Texture "masktex" "models/ExplodiumCasing_Used_mask.png"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/YnykronAmmo.png"
 {
@@ -221,17 +199,10 @@ Material Texture "models/YnykronAmmo.png"
 	Texture "rimtex2" "models/envmap/dekarim.png"
 	Texture "envtex3" "models/envmap/puroenv.png"
 	Texture "rimtex3" "models/envmap/purorim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "EnvFact" = ".8" "1.1" ".8"
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimFact" = ".9" ".9" "1.1"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".3" ".2"
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = "1.1"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".3"
-	Define "ENVFACT3" = ".8"
-	Define "RIMFACT3" = "1.1"
-	Define "RIMSTEP3" = ".2"
 }
 Material Texture "models/YnykronRod.png"
 {
@@ -240,10 +211,9 @@ Material Texture "models/YnykronRod.png"
 	Texture "masktex" "models/YnykronRod_mask.png"
 	Texture "envtex" "models/envmap/puroenv.png"
 	Texture "rimtex" "models/envmap/purorim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".8" "1." "1."
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "RimFact" = "1.1" "1." "1."
-	Define "RIMFACT" = "1.1"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "RIMSTEP" = ".2"
 }
 Material Texture "models/Fabricator.png"
 {
@@ -252,9 +222,9 @@ Material Texture "models/Fabricator.png"
 	Texture "masktex" "models/Fabricator_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Fabricator_Tier2.png"
 {
@@ -263,9 +233,9 @@ Material Texture "models/Fabricator_Tier2.png"
 	Texture "masktex" "models/Fabricator_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Fabricator_Tier3.png"
 {
@@ -274,9 +244,9 @@ Material Texture "models/Fabricator_Tier3.png"
 	Texture "masktex" "models/Fabricator_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Fabricator_Tier4.png"
 {
@@ -285,9 +255,9 @@ Material Texture "models/Fabricator_Tier4.png"
 	Texture "masktex" "models/Fabricator_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".8" "1." "1."
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Embiggener.png"
 {
@@ -296,9 +266,9 @@ Material Texture "models/Embiggener.png"
 	Texture "masktex" "models/Embiggener_mask.png"
 	Texture "envtex" "models/envmap/redenv.png"
 	Texture "rimtex" "models/envmap/redrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Embiggener_Tier2.png"
 {
@@ -307,9 +277,9 @@ Material Texture "models/Embiggener_Tier2.png"
 	Texture "masktex" "models/Embiggener_mask.png"
 	Texture "envtex" "models/envmap/greenenv.png"
 	Texture "rimtex" "models/envmap/greenrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Embiggener_Tier3.png"
 {
@@ -318,9 +288,9 @@ Material Texture "models/Embiggener_Tier3.png"
 	Texture "masktex" "models/Embiggener_mask.png"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Embiggener_Tier4.png"
 {
@@ -329,9 +299,9 @@ Material Texture "models/Embiggener_Tier4.png"
 	Texture "masktex" "models/Embiggener_mask.png"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Embiggener_Tier5.png"
 {
@@ -340,9 +310,9 @@ Material Texture "models/Embiggener_Tier5.png"
 	Texture "masktex" "models/Embiggener_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".6" "1." "1."
-	Define "ENVFACT" = ".6"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 
 PointLight GOLDSHELLLIGHT

gldefs/items/funstuff.txt

@@ -10,10 +10,9 @@ Material Texture "models/SayasMug.png"
 	Texture "masktex" "models/SayasMug_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".4" "1." "1."
-	Define "ENVFACT" = ".4"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".4" ".5" ".5"
-	Define "RIMSTEP" = ".4"
 }
 Material Texture "models/DemoPlush.png"
 {
@@ -42,9 +41,9 @@ Material Texture "models/Chancebox.png"
 	Texture "masktex" "models/Chancebox_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".7" "1." "1."
-	Define "ENVFACT" = ".7"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 
 PointLight CHANCELIGHT

gldefs/items/keys.txt

@@ -7,7 +7,9 @@ Material Texture "models/DoomRedKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/redenv.png"
 	Texture "rimtex" "models/envmap/redrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomYellowKey.png"
 {
@@ -16,7 +18,9 @@ Material Texture "models/DoomYellowKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomBlueKey.png"
 {
@@ -25,7 +29,9 @@ Material Texture "models/DoomBlueKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomGreenKey.png"
 {
@@ -34,7 +40,9 @@ Material Texture "models/DoomGreenKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/greenenv.png"
 	Texture "rimtex" "models/envmap/greenrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomOrangeKey.png"
 {
@@ -43,7 +51,9 @@ Material Texture "models/DoomOrangeKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomBlackKey.png"
 {
@@ -52,7 +62,9 @@ Material Texture "models/DoomBlackKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomWhiteKey.png"
 {
@@ -61,7 +73,9 @@ Material Texture "models/DoomWhiteKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomSilverKey.png"
 {
@@ -70,7 +84,9 @@ Material Texture "models/DoomSilverKey.png"
 	Texture "masktex" "models/DoomKey_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DoomKeyLight.png"
 {
@@ -88,8 +104,9 @@ Material Texture "models/DoomRedSkull.png"
 	Texture "masktex" "models/DoomSkull_mask.png"
 	Texture "envtex" "models/envmap/redenv.png"
 	Texture "rimtex" "models/envmap/redrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
 }
 Material Texture "models/DoomBlueSkull.png"
 {
@@ -98,8 +115,9 @@ Material Texture "models/DoomBlueSkull.png"
 	Texture "masktex" "models/DoomSkull_mask.png"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
 }
 Material Texture "models/DoomYellowSkull.png"
 {
@@ -108,8 +126,9 @@ Material Texture "models/DoomYellowSkull.png"
 	Texture "masktex" "models/DoomSkull_mask.png"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
 }
 Material Texture "models/DoomPurpleSkull.png"
 {
@@ -118,8 +137,9 @@ Material Texture "models/DoomPurpleSkull.png"
 	Texture "masktex" "models/DoomSkull_mask.png"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
 }
 
 pointlight SWWMREDKEY

gldefs/items/pickups.txt

@@ -7,8 +7,9 @@ Material Texture "models/Nugget_Armor.png"
 	Texture "masktex" "models/Nugget_mask.png"
 	Texture "envtex" "models/envmap/greenenv.png"
 	Texture "rimtex" "models/envmap/greenrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
 }
 Material Texture "models/Nugget.png"
 {
@@ -17,8 +18,9 @@ Material Texture "models/Nugget.png"
 	Texture "masktex" "models/Nugget_mask.png"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
 }
 Material Texture "models/TetraHealth.png"
 {
@@ -27,7 +29,9 @@ Material Texture "models/TetraHealth.png"
 	Texture "masktex" "models/TetraHealth_mask.png"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/CubeHealth.png"
 {
@@ -36,7 +40,9 @@ Material Texture "models/CubeHealth.png"
 	Texture "masktex" "models/CubeHealth_mask.png"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Refresher.png"
 {
@@ -45,7 +51,9 @@ Material Texture "models/Refresher.png"
 	Texture "masktex" "models/Refresher_mask.png"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/BlastSuit.png"
 {
@@ -55,11 +63,10 @@ Material Texture "models/BlastSuit.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
 	Texture "envtex2" "models/envmap/darkenv.png"
 	Texture "rimtex2" "models/envmap/darkrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "EnvFact" = "1." ".3" "1."
-	Define "ENVFACT2" = ".3"
+	Uniform vec3 "RimFact" = "1." ".5" "1."
-	Define "RIMFACT2" = ".5"
+	Uniform vec3 "RimStep" = ".5" "0." ".5"
-	Define "RIMSTEP2" = ".0"
 }
 Material Texture "models/WarArmor.png"
 {
@@ -67,7 +74,9 @@ Material Texture "models/WarArmor.png"
 	Texture "masktex" "models/WarArmor_mask.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/GhostArtifact.png"
 {
@@ -76,7 +85,9 @@ Material Texture "models/GhostArtifact.png"
 	Texture "masktex" "models/GhostArtifact_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Gravity.png"
 {
@@ -85,7 +96,9 @@ Material Texture "models/Gravity.png"
 	Texture "masktex" "models/Gravity_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Ragekit.png"
 {
@@ -94,7 +107,9 @@ Material Texture "models/Ragekit.png"
 	Texture "masktex" "models/Ragekit_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Omnisight.png"
 {
@@ -109,8 +124,10 @@ Material Texture "models/Lamp.png"
 	Texture "rimtex" "models/envmap/darkrim.png"
 	Texture "envtex2" "models/envmap/silverenv.png"
 	Texture "rimtex2" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Lamp_off.png"
 {
@@ -120,8 +137,10 @@ Material Texture "models/Lamp_off.png"
 	Texture "rimtex" "models/envmap/darkrim.png"
 	Texture "envtex2" "models/envmap/silverenv.png"
 	Texture "rimtex2" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENV_TWOLAYER"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Invinciball.png"
 {
@@ -129,7 +148,9 @@ Material Texture "models/Invinciball.png"
 	Texture "masktex" "models/Invinciball_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/Moth_White.png"
 {
@@ -142,7 +163,9 @@ Material Texture "models/Barrier.png"
 	Texture "masktex" "models/Barrier_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Sprite "MKRVA0"
 {
@@ -179,7 +202,9 @@ Material Texture "models/DivineSprite.png"
 	Texture "masktex" "models/DivineSprite_mask.png"
 	Texture "envtex" "models/envmap/puroenv.png"
 	Texture "rimtex" "models/envmap/purorim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/DevaSigil.png"
 {
@@ -187,9 +212,9 @@ Material Texture "models/DevaSigil.png"
 	Texture "masktex" "models/DevaSigil_mask.png"
 	Texture "envtex" "models/envmap/ekaenv.png"
 	Texture "rimtex" "models/envmap/ekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".5" "1." "1."
-	Define "ENVFACT" = ".5"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/SafetyTether.png"
 {
@@ -198,9 +223,9 @@ Material Texture "models/SafetyTether.png"
 	Texture "masktex" "models/SafetyTether_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".5" "1." "1."
-	Define "ENVFACT" = ".5"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/SafetyTether_off.png"
 {
@@ -208,9 +233,9 @@ Material Texture "models/SafetyTether_off.png"
 	Texture "masktex" "models/SafetyTether_mask.png"
 	Texture "envtex" "models/envmap/silverenv.png"
 	Texture "rimtex" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = ".5" "1." "1."
-	Define "ENVFACT" = ".5"
+	Uniform vec3 "RimFact" = ".8" "1." "1."
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 
 PointLight ARMORNUGGETLIGHT

gldefs/misc.txt

@@ -6,7 +6,9 @@ Material Texture "chiptilb"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/bluenv.png"
 	Texture "rimtex" "models/envmap/blurim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptilc"
 {
@@ -14,7 +16,9 @@ Material Texture "chiptilc"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/kinyenv.png"
 	Texture "rimtex" "models/envmap/kinyrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptile"
 {
@@ -22,7 +26,9 @@ Material Texture "chiptile"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptilg"
 {
@@ -30,7 +36,9 @@ Material Texture "chiptilg"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/greenenv.png"
 	Texture "rimtex" "models/envmap/greenrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptilm"
 {
@@ -38,7 +46,9 @@ Material Texture "chiptilm"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/purpenv.png"
 	Texture "rimtex" "models/envmap/purprim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptilr"
 {
@@ -46,7 +56,9 @@ Material Texture "chiptilr"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/redenv.png"
 	Texture "rimtex" "models/envmap/redrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptilw"
 {
@@ -54,7 +66,9 @@ Material Texture "chiptilw"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "chiptily"
 {
@@ -62,7 +76,9 @@ Material Texture "chiptily"
 	Texture "masktex" "chiptilw"
 	Texture "envtex" "models/envmap/goldenv.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 
 // interface

gldefs/weapons/candygun.txt

@@ -8,11 +8,10 @@ Material Texture "models/CandyGun.png"
 	Texture "rimtex" "models/envmap/purprim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".9"
+	Uniform vec3 "EnvFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".4"
+	Uniform vec3 "RimFact" = ".4" "1." "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "ENV_TWOLAYER"
 }
 Material Texture "models/CandyGun_EmptyMag.png"
 {
@@ -22,9 +21,8 @@ Material Texture "models/CandyGun_EmptyMag.png"
 	Texture "rimtex" "models/envmap/purprim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".9"
+	Uniform vec3 "EnvFact" = ".9" "1." "1."
-	Define "RIMFACT" = ".4"
+	Uniform vec3 "RimFact" = ".4" "1." "1."
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".5" ".5"
-	Define "ENV_TWOLAYER"
 }

gldefs/weapons/deepimpact.txt

@@ -6,5 +6,7 @@ Material Texture "models/DeepImpact.png"
 	Texture "masktex" "models/DeepImpact_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }

gldefs/weapons/eviscerator.txt

@@ -6,5 +6,7 @@ Material Texture "models/Eviscerator.png"
 	Texture "masktex" "models/Eviscerator_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }

gldefs/weapons/explodiumgun.txt

@@ -8,11 +8,10 @@ Material Texture "models/ExplodiumGun.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".3"
+	Uniform vec3 "EnvFact" = ".3" "1." "1."
-	Define "RIMFACT" = ".4"
+	Uniform vec3 "RimFact" = ".4" "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "ENV_TWOLAYER"
 }
 Material Texture "models/ExplodiumGun_EmptyMag.png"
 {
@@ -22,9 +21,8 @@ Material Texture "models/ExplodiumGun_EmptyMag.png"
 	Texture "rimtex" "models/envmap/goldrim.png"
 	Texture "envtex2" "models/envmap/leadenv.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "2"
-	Define "ENVFACT" = ".3"
+	Uniform vec3 "EnvFact" = ".3" "1." "1."
-	Define "RIMFACT" = ".4"
+	Uniform vec3 "RimFact" = ".4" "1." "1."
-	Define "RIMSTEP" = ".2"
+	Uniform vec3 "RimStep" = ".2" ".5" ".5"
-	Define "ENV_TWOLAYER"
 }

gldefs/weapons/hellblazer.txt

@@ -10,17 +10,10 @@ Material Texture "models/Hellblazer.png"
 	Texture "rimtex2" "models/envmap/leadrim.png"
 	Texture "envtex3" "models/envmap/silverenv.png"
 	Texture "rimtex3" "models/envmap/silverrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = ".3"
+	Uniform vec3 "EnvFact" = ".3" "1.2" "1.1"
-	Define "RIMFACT" = ".2"
+	Uniform vec3 "RimFact" = ".2" ".8" "1.3"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".2" "0."
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = ".8"
-	Define "RIMSTEP2" = ".2"
-	Define "ENVFACT3" = "1.1"
-	Define "RIMFACT3" = "1.3"
-	Define "RIMSTEP3" = "0."
 }
 
 PointLight BLAZERLIGHT

gldefs/weapons/silverbullet.txt

@@ -10,17 +10,10 @@ Material Texture "models/SilverBullet.png"
 	Texture "rimtex2" "models/envmap/ekarim.png"
 	Texture "envtex3" "models/envmap/goldenv.png"
 	Texture "rimtex3" "models/envmap/goldrim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = ".7"
+	Uniform vec3 "EnvFact" = ".7" ".8" "1.1"
-	Define "RIMFACT" = ".8"
+	Uniform vec3 "RimFact" = ".8" ".9" "1.3"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." ".2" "0."
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = ".8"
-	Define "RIMFACT2" = ".9"
-	Define "RIMSTEP2" = ".2"
-	Define "ENVFACT3" = "1.1"
-	Define "RIMFACT3" = "1.3"
-	Define "RIMSTEP3" = "0."
 }
 
 Material Texture "models/SilverBulletJetSmoke.png"

gldefs/weapons/sparkster.txt

@@ -6,9 +6,10 @@ Material Texture "models/Sparkster.png"
 	Texture "masktex" "models/Sparkster_mask.png"
 	Texture "envtex" "models/envmap/dekaenv.png"
 	Texture "rimtex" "models/envmap/dekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform int "EnvLayers" = 1
-	Define "ENVFACT" = ".75"
+	Uniform vec3 "EnvFact" = ".75" "1." "1."
-	Define "RIMFACT" = ".9"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 Material Texture "models/SparksterBall.png"
 {
@@ -16,9 +17,10 @@ Material Texture "models/SparksterBall.png"
 	Texture "masktex" "models/SparksterBall_mask.png"
 	Texture "envtex" "models/envmap/dekaenv.png"
 	Texture "rimtex" "models/envmap/dekarim.png"
-	Define "RIM_LIGHTING"
+	Uniform int "EnvLayers" = 1
-	Define "ENVFACT" = ".8"
+	Uniform vec3 "EnvFact" = ".75" "1." "1."
-	Define "RIMFACT" = ".95"
+	Uniform vec3 "RimFact" = ".9" "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }
 
 FlickerLight2 SPARKLIGHT

gldefs/weapons/spreadgun.txt

@@ -6,5 +6,7 @@ Material Texture "models/Spreadgun.png"
 	Texture "masktex" "models/Spreadgun_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }

gldefs/weapons/wallbuster.txt

@@ -6,5 +6,7 @@ Material Texture "models/Wallbuster.png"
 	Texture "masktex" "models/Wallbuster_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
-	Define "RIM_LIGHTING"
+	Uniform vec3 "EnvFact" = "1." "1." "1."
+	Uniform vec3 "RimFact" = "1." "1." "1."
+	Uniform vec3 "RimStep" = ".5" ".5" ".5"
 }

gldefs/weapons/ynykron.txt

@@ -10,17 +10,10 @@ Material Texture "models/Ynykron.png"
 	Texture "rimtex2" "models/envmap/ockorim.png"
 	Texture "envtex3" "models/envmap/dekaenv.png"
 	Texture "rimtex3" "models/envmap/dekarim.png"
-	Define "RIM_LIGHTING"
+	Define "ENV_LAYERS" = "3"
-	Define "ENVFACT" = ".5"
+	Uniform vec3 "EnvFact" = ".5" ".9" "1.1"
-	Define "RIMFACT" = ".7"
+	Uniform vec3 "RimFact" = ".7" "1.1" ".9"
-	Define "RIMSTEP" = "0."
+	Uniform vec3 "RimStep" = "0." "0." ".3"
-	Define "ENV_THREELAYER"
-	Define "ENVFACT2" = ".9"
-	Define "RIMFACT2" = "1.1"
-	Define "RIMSTEP2" = "0."
-	Define "ENVFACT3" = "1.1"
-	Define "RIMFACT3" = ".9"
-	Define "RIMSTEP3" = ".3"
 }
 
 Material Texture "models/YnykronSmoke.png"

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1186 \cu(lun 24 feb 2025 13:57:06 CET)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1187 \cu(mié 26 feb 2025 13:37:31 CET)\c-";
-SWWM_SHORTVER="\cw1.3pre r1186 \cu(2025-02-24 13:57:06)\c-";
+SWWM_SHORTVER="\cw1.3pre r1187 \cu(2025-02-26 13:37:31)\c-";

shaders/glsl/CanvasProxy.fp

@@ -1,30 +1,33 @@
 // Proxy shader for canvas textures
 
+#define STRAIGHT_UVS	((CanvasFlags&0x01) != 0)
+#define DONT_FIX_ALPHA	((CanvasFlags&0x02) != 0)
+#define ALPHA_KEY	((CanvasFlags&0x04) != 0)
+#define NO_FULLBRIGHT	((CanvasFlags&0x08) != 0)
+
 void SetupMaterial( inout Material mat )
 {
 	// canvas textures are upside-down when used by models
 	// this is the default use-case here, so for other situations,
 	// there's a macro for it™
-#ifdef STRAIGHT_UVS
+	if ( STRAIGHT_UVS )
-	mat.Base = texture(scrtex,vTexCoord.st);
+		mat.Base = texture(scrtex,vTexCoord.st);
-#else
+	else
-	mat.Base = texture(scrtex,vec2(vTexCoord.s,1.-vTexCoord.t));
+		mat.Base = texture(scrtex,vec2(vTexCoord.s,1.-vTexCoord.t));
-#endif
 	// drawing with render styles applied can alter the alpha of the
 	// canvas itself, which may not be intended, so cap it to 100% here
 	// unless explicitly disabled
-#ifndef DONT_FIX_ALPHA
+	if ( !DONT_FIX_ALPHA )
-	mat.Base.a = 1.;
+		mat.Base.a = 1.;
-#endif
+	// treat pure black as fully transparent
-	// treat a color (usually pure black) as fully transparent
 	// used by some special textures
-#ifdef ALPHA_KEY
+	if ( ALPHA_KEY )
-	if ( mat.Base.rgb == ALPHA_KEY )
+	{
-		mat.Base.a = 0.;
+		if ( mat.Base.rgb == vec3(0.) )
-#endif
+			mat.Base.a = 0.;
+	}
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
 	// by default, canvas textures are treated as fullbright
-#ifndef NO_FULLBRIGHT
+	if ( !NO_FULLBRIGHT )
-	mat.Bright = vec4(1.);
+		mat.Bright = vec4(1.);
-#endif
 }

shaders/glsl/Envmap.fp

@@ -1,16 +1,6 @@
 // equirectangular envmap + gradient rim
 #define RECIPROCAL_PI2 0.15915494
 
-#ifndef RIMSTEP
-#define RIMSTEP .5
-#endif
-#ifndef ENVFACT
-#define ENVFACT 1.
-#endif
-#ifndef RIMFACT
-#define RIMFACT 1.
-#endif
-
 void SetupMaterial( inout Material mat )
 {
 	vec3 norm = normalize(vWorldNormal.xyz);
@@ -18,12 +8,10 @@ void SetupMaterial( inout Material mat )
 	vec3 rvec = normalize(reflect(eye,norm));
 	vec2 uv = vec2(atan(rvec.z,rvec.x)*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
 	vec2 uv2 = vec2(atan(rvec.z,abs(rvec.x))*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
-	vec3 envcol = textureGrad(tex,uv,dFdx(uv2),dFdy(uv2)).rgb*ENVFACT;
+	vec3 envcol = textureGrad(tex,uv,dFdx(uv2),dFdy(uv2)).rgb*EnvParams.x;
-#ifdef RIM_LIGHTING
+	float rim = smoothstep(EnvParams.z,1.,1.-abs(dot(eye,norm)));
-	float rim = smoothstep(RIMSTEP,1.,1.-abs(dot(eye,norm)));
 	vec3 rimcol = textureLod(rimtex,vec2(.25+.5*rim,.5),0.).rgb;
-	envcol = mix(envcol,rimcol,rim*RIMFACT);
+	envcol = mix(envcol,rimcol,rim*EnvParams.y);
-#endif
 #ifdef BARRIER_MAP
 	vec3 grad = texture(bartex,vec2(0.,vTexCoord.t*5.+timer)).rgb;
 	envcol = (envcol+grad)*.25;

shaders/glsl/Envmask.fp

@@ -2,35 +2,15 @@
 // allows for up to three different layers of environment mapping (RGB mask)
 #define RECIPROCAL_PI2 0.15915494
 
-#ifndef RIMSTEP
+// keeping this as a define while using vec3 uniforms for the parameters
-#define RIMSTEP .5
+// ensures that we only need to compile three versions of this material shader
-#endif
+// (at least, because I don't know for sure how VKDoom handles this stuff)
-#ifndef ENVFACT
+#ifndef ENV_LAYERS
-#define ENVFACT 1.
+#define ENV_LAYERS 1
-#endif
-#ifndef RIMFACT
-#define RIMFACT 1.
 #endif
 
-#ifndef RIMSTEP2
+#define ENV_TWOLAYER ((ENV_LAYERS == 2) || (ENV_LAYERS == 3))
-#define RIMSTEP2 .5
+#define ENV_THREELAYER (ENV_LAYERS == 3)
-#endif
-#ifndef ENVFACT2
-#define ENVFACT2 1.
-#endif
-#ifndef RIMFACT2
-#define RIMFACT2 1.
-#endif
-
-#ifndef RIMSTEP3
-#define RIMSTEP3 .5
-#endif
-#ifndef ENVFACT3
-#define ENVFACT3 1.
-#endif
-#ifndef RIMFACT3
-#define RIMFACT3 1.
-#endif
 
 void SetupMaterial( inout Material mat )
 {
@@ -44,29 +24,23 @@ void SetupMaterial( inout Material mat )
 	vec2 dTdx = dFdx(uv2);
 	vec2 dTdy = dFdy(uv2);
 	float rf = 1.-abs(dot(eye,norm));
-	vec3 envcol = textureGrad(envtex,uv,dTdx,dTdy).rgb*ENVFACT;
+	vec3 envcol = textureGrad(envtex,uv,dTdx,dTdy).rgb*EnvFact.x;
-#ifdef RIM_LIGHTING
+	float rim = smoothstep(RimStep.x,1.,rf);
-	float rim = smoothstep(RIMSTEP,1.,rf);
 	vec3 rimcol = textureLod(rimtex,vec2(.25+.5*rim,.5),0.).rgb;
-	envcol = mix(envcol,rimcol,rim*RIMFACT);
+	envcol = mix(envcol,rimcol,rim*RimFact.x);
-#endif
 	mat.Base = vec4(base.rgb+envcol*mask.x,base.a);
-#if defined(ENV_TWOLAYER) || defined(ENV_THREELAYER)
+#if ( ENV_TWOLAYER )
-	envcol = textureGrad(envtex2,uv,dTdx,dTdy).rgb*ENVFACT2;
+	envcol = textureGrad(envtex2,uv,dTdx,dTdy).rgb*EnvFact.y;
-#ifdef RIM_LIGHTING
+	rim = smoothstep(RimStep.y,1.,rf);
-	rim = smoothstep(RIMSTEP2,1.,rf);
 	rimcol = textureLod(rimtex2,vec2(.25+.5*rim,.5),0.).rgb;
-	envcol = mix(envcol,rimcol,rim*RIMFACT2);
+	envcol = mix(envcol,rimcol,rim*RimFact.y);
-#endif
 	mat.Base.rgb += envcol*mask.y;
 #endif
-#if defined(ENV_THREELAYER)
+#if ( ENV_THREELAYER )
-	envcol = textureGrad(envtex3,uv,dTdx,dTdy).rgb*ENVFACT3;
+	envcol = textureGrad(envtex3,uv,dTdx,dTdy).rgb*EnvFact.z;
-#ifdef RIM_LIGHTING
+	rim = smoothstep(RimStep.z,1.,rf);
-	rim = smoothstep(RIMSTEP3,1.,rf);
 	rimcol = textureLod(rimtex3,vec2(.25+.5*rim,.5),0.).rgb;
-	envcol = mix(envcol,rimcol,rim*RIMFACT3);
+	envcol = mix(envcol,rimcol,rim*RimFact.z);
-#endif
 	mat.Base.rgb += envcol*mask.z;
 #endif
 	mat.Normal = ApplyNormalMap(vTexCoord.st);

shaders/glsl/Overbright.fp

@@ -3,8 +3,8 @@
 void SetupMaterial( inout Material mat )
 {
 	mat.Base = getTexel(vTexCoord.st);
-	mat.Base.rgb *= OVERFACT;
+	mat.Base.rgb *= OverFact;
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
 	mat.Bright = texture(brighttexture,vTexCoord.st);
-	mat.Bright.rgb *= OVERFACT;
+	mat.Bright.rgb *= OverFact;
 }

shaders/glsl/PlasmaBlast.fp

@@ -2,16 +2,6 @@
 // + dynamic glows (Plasma Blaster specific)
 #define RECIPROCAL_PI2 0.15915494
 
-#ifndef RIMSTEP
-#define RIMSTEP .5
-#endif
-#ifndef ENVFACT
-#define ENVFACT 1.
-#endif
-#ifndef RIMFACT
-#define RIMFACT 1.
-#endif
-
 void SetupMaterial( inout Material mat )
 {
 	vec4 base = getTexel(vTexCoord.st);
@@ -21,12 +11,10 @@ void SetupMaterial( inout Material mat )
 	vec3 rvec = normalize(reflect(eye,norm));
 	vec2 uv = vec2(atan(rvec.z,rvec.x)*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
 	vec2 uv2 = vec2(atan(rvec.z,abs(rvec.x))*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
-	vec3 envcol = textureGrad(envtex,uv,dFdx(uv2),dFdy(uv2)).rgb*ENVFACT;
+	vec3 envcol = textureGrad(envtex,uv,dFdx(uv2),dFdy(uv2)).rgb*EnvParams.x;
-#ifdef RIM_LIGHTING
+	float rim = smoothstep(EnvParams.z,1.,1.-abs(dot(eye,norm)));
-	float rim = smoothstep(RIMSTEP,1.,1.-abs(dot(eye,norm)));
 	vec3 rimcol = textureLod(rimtex,vec2(.25+.5*rim,.5),0.).rgb;
-	envcol = mix(envcol,rimcol,rim*RIMFACT);
+	envcol = mix(envcol,rimcol,rim*EnvParams.y);
-#endif
 	mat.Base = vec4(base.rgb+envcol*mask,base.a);
 	mat.Normal = ApplyNormalMap(vTexCoord.st);
 	mat.Bright = texture(brighttexture,vTexCoord.st);