Goodbye matcaps, hello envmaps.

gldefs.ammo

@@ -1,14 +1,22 @@
 HardwareShader Texture "models/Shell_Gold.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Shell_Gold_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Shell_Gold_Used.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Shell_Gold_Used_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 Brightmap Texture "models/SparksterAmmo.png"
 {
@@ -16,9 +24,13 @@ Brightmap Texture "models/SparksterAmmo.png"
 }
 HardwareShader Texture "models/SparksterAmmo.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SparksterAmmo_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/dekaenv.png"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".75"
+	Define "RIMFACT" = ".9"
 }
 Brightmap Texture "models/Fabricator.png"
 {
@@ -38,27 +50,43 @@ Brightmap Texture "models/Fabricator_Tier4.png"
 }
 HardwareShader Texture "models/Fabricator.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/Fabricator_Tier2.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/Fabricator.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/Fabricator_Tier4.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = ".9"
 }
 Brightmap Texture "models/Embiggener.png"
 {
@@ -82,33 +110,53 @@ Brightmap Texture "models/Embiggener_Tier5.png"
 }
 HardwareShader Texture "models/Embiggener.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/redmap.png"
+	Texture "envtex" "models/envmap/redenv.png"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier2.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/greenmap.png"
+	Texture "envtex" "models/envmap/greenenv.png"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier3.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier4.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/purpmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier5.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/glassmap.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 
 PointLight GOLDSHELLLIGHT

gldefs.candygun

@@ -1,12 +1,22 @@
 HardwareShader Texture "models/CandyGun.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/CandyGun_mask.png"
-	Texture "envtex" "models/matcap/pinkmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".2"
+	Define "RIMFACT" = ".9"
+	Define "RIMSTEP" = "0."
 }
 HardwareShader Texture "models/CandyGun_EmptyMag.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/CandyGun_mask.png"
-	Texture "envtex" "models/matcap/pinkmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".2"
+	Define "RIMFACT" = ".9"
+	Define "RIMSTEP" = "0."
 }

gldefs.envmaps

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

gldefs.funstuff

@@ -28,9 +28,13 @@ Brightmap Texture "models/Chancebox.png"
 }
 HardwareShader Texture "models/Chancebox.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Chancebox_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".7"
+	Define "RIMFACT" = ".9"
 }
 
 PointLight CHANCELIGHT

gldefs.keys

@@ -32,51 +32,67 @@ Brightmap Texture "models/DoomSilverKey.png"
 }
 HardwareShader Texture "models/DoomRedKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/redmap.png"
+	Texture "envtex" "models/envmap/redenv.png"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomYellowKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomBlueKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomGreenKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/greenmap.png"
+	Texture "envtex" "models/envmap/greenenv.png"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomOrangeKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomBlackKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/leadmap.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomWhiteKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomSilverKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
 }
 Brightmap Texture "models/DoomKeyLight.png"
 {
@@ -105,27 +121,39 @@ Brightmap Texture "models/DoomPurpleSkull.png"
 }
 HardwareShader Texture "models/DoomRedSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/redmap.png"
+	Texture "envtex" "models/envmap/redenv.png"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/DoomBlueSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/DoomYellowSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/DoomPurpleSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/purpmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 
 pointlight SWWMREDKEY

gldefs.pickups

@@ -20,33 +20,45 @@ Brightmap Texture "models/Refresher.png"
 }
 HardwareShader Texture "models/Nugget_Armor.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Nugget_mask.png"
-	Texture "envtex" "models/matcap/greenmap.png"
+	Texture "envtex" "models/envmap/greenenv.png"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/Nugget.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Nugget_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/TetraHealth.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/TetraHealth_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/CubeHealth.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/CubeHealth_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/Refresher.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Refresher_mask.png"
-	Texture "envtex" "models/matcap/purpmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
 }
 Brightmap Texture "models/GhostArtifact.png"
 {
@@ -105,9 +117,11 @@ HardwareShader Sprite "DVSPA0"
 }
 HardwareShader Texture "models/DivineSprite.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DivineSprite_mask.png"
-	Texture "envtex" "models/matcap/pearlmap.png"
+	Texture "envtex" "models/envmap/puroenv.png"
+	Texture "rimtex" "models/envmap/purorim.png"
+	Define "RIM_LIGHTING"
 }
 Brightmap Texture "models/DivineSprite.png"
 {
@@ -116,9 +130,13 @@ Brightmap Texture "models/DivineSprite.png"
 }
 HardwareShader Texture "models/DevaSigil.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DevaSigil_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/ekaenv.png"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+	Define "RIMFACT" = ".8"
 }
 Brightmap Texture "models/SafetyTether.png"
 {
@@ -127,15 +145,21 @@ Brightmap Texture "models/SafetyTether.png"
 }
 HardwareShader Texture "models/SafetyTether.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SafetyTether_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
 }
 HardwareShader Texture "models/SafetyTether_off.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SafetyTether_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
 }
 
 PointLight ARMORNUGGETLIGHT

gldefs.shinemaps

@@ -1,83 +0,0 @@
-HardwareShader Texture "models/matcap/blumap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/darkmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/dekamap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/goldmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/greenmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/invincimap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/pinkmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/puromap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/purpmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/ragemap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/redmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/silvermap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/leadmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/barriermap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-	Define "BARRIER_MAP"
-	Texture "bartex" "models/barrierbar.png"
-}
-HardwareShader Texture "models/matcap/errormap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-	Define "AMBIENT_GLOW"
-}
-HardwareShader Texture "models/matcap/glassmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/kinymap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/nkrknmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/nokromap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/pearlmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}

gldefs.sparkster

@@ -1,14 +1,22 @@
 HardwareShader Texture "models/Sparkster.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Sparkster_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/dekaenv.png"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".75"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/SparksterBall.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SparksterBall_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/dekaenv.png"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = ".95"
 }
 
 FlickerLight2 SPARKLIGHT

language.version

@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r56 \cu(Thu  5 May 22:59:42 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r56 \cu(2022-05-05 22:59:42)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r57 \cu(Sat  7 May 22:39:40 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r57 \cu(2022-05-07 22:39:40)\c-";

modeldef.collectibles

@@ -109,7 +109,7 @@ Model "KirinCummies"
 
 	Model 0 "TootFroot_d.3d"
 	SurfaceSkin 0 0 "TootFroot.png"
-	SurfaceSkin 0 1 "matcap/silvermap.png"
+	SurfaceSkin 0 1 "envmap/silverenv.png"
 	Scale 0.015 0.015 0.015
 	ZOffset 16
 	PitchOffset 30

modeldef.itemgesture

@@ -305,7 +305,7 @@ Model "KirinCummiesGesture"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "TootFroot.png"
-	SurfaceSkin 0 4 "matcap/silvermap.png"
+	SurfaceSkin 0 4 "envmap/silverenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005

modeldef.keygesture

@@ -1221,7 +1221,7 @@ Model "SWWMGreenKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/greenmap.png"
+	SurfaceSkin 0 3 "envmap/greenenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
@@ -1342,7 +1342,7 @@ Model "SWWMBlueKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/blumap.png"
+	SurfaceSkin 0 3 "envmap/bluenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
@@ -1463,7 +1463,7 @@ Model "SWWMYellowKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/goldmap.png"
+	SurfaceSkin 0 3 "envmap/goldenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
@@ -1584,7 +1584,7 @@ Model "SWWMRedKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/redmap.png"
+	SurfaceSkin 0 3 "envmap/redenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005

modeldef.keys

@@ -213,7 +213,7 @@ Model "SWWMKeyGreen"
 {
 	Path "models"
 	Model 0 "HereticGreenKey_d.3d"
-	Skin 0 "matcap/greenmap.png"
+	Skin 0 "envmap/greenenv.png"
 	Scale 0.05 0.05 0.05
 	RollOffset 15
 	ZOffset 16
@@ -225,7 +225,7 @@ Model "SWWMKeyBlue"
 {
 	Path "models"
 	Model 0 "HereticBlueKey_d.3d"
-	Skin 0 "matcap/blumap.png"
+	Skin 0 "envmap/bluenv.png"
 	Scale 0.04 0.04 0.04
 	RollOffset 15
 	ZOffset 16
@@ -237,7 +237,7 @@ Model "SWWMKeyYellow"
 {
 	Path "models"
 	Model 0 "HereticYellowKey_d.3d"
-	Skin 0 "matcap/goldmap.png"
+	Skin 0 "envmap/goldenv.png"
 	Scale 0.05 0.05 0.05
 	RollOffset 15
 	ZOffset 16
@@ -249,7 +249,7 @@ Model "SWWMKeyRed"
 {
 	Path "models"
 	Model 0 "HereticRedKey_d.3d"
-	Skin 0 "matcap/redmap.png"
+	Skin 0 "envmap/redenv.png"
 	Scale 0.05 0.05 0.05
 	RollOffset 15
 	ZOffset 16

modeldef.misc

@@ -3,7 +3,7 @@ Model "Unknown"
 	Path "models"
 
 	Model 0 "extra/IAmError_d.3d"
-	Skin 0 "matcap/errormap.png"
+	Skin 0 "ERRORENV"
 	Scale 0.0625 0.0625 0.0625
 	AngleOffset 90
 	ZOffset 32
@@ -20,33 +20,33 @@ Model "FancyConfetti"
 	USEACTORPITCH
 	USEACTORROLL
 
-	Skin 0 "matcap/goldmap.png"
+	Skin 0 "envmap/goldenv.png"
 	FrameIndex XZW1 A 0 0
-	Skin 0 "matcap/blumap.png"
+	Skin 0 "envmap/bluenv.png"
 	FrameIndex XZW1 B 0 0
-	Skin 0 "matcap/darkmap.png"
+	Skin 0 "envmap/darkenv.png"
 	FrameIndex XZW1 C 0 0
-	Skin 0 "matcap/greenmap.png"
+	Skin 0 "envmap/greenenv.png"
 	FrameIndex XZW1 D 0 0
-	Skin 0 "matcap/invincimap.png"
+	Skin 0 "envmap/ekaenv.png"
 	FrameIndex XZW1 E 0 0
-	Skin 0 "matcap/pinkmap.png"
+	Skin 0 "envmap/watrenv.png"
 	FrameIndex XZW1 F 0 0
-	Skin 0 "matcap/purpmap.png"
+	Skin 0 "envmap/purpenv.png"
 	FrameIndex XZW1 G 0 0
-	Skin 0 "matcap/ragemap.png"
+	Skin 0 "envmap/telenv.png"
 	FrameIndex XZW1 H 0 0
-	Skin 0 "matcap/redmap.png"
+	Skin 0 "envmap/redenv.png"
 	FrameIndex XZW1 I 0 0
-	Skin 0 "matcap/silvermap.png"
+	Skin 0 "envmap/silverenv.png"
 	FrameIndex XZW1 J 0 0
-	Skin 0 "matcap/dekamap.png"
+	Skin 0 "envmap/dekaenv.png"
 	FrameIndex XZW1 K 0 0
-	Skin 0 "matcap/glassmap.png"
+	Skin 0 "envmap/iceenv.png"
 	FrameIndex XZW1 L 0 0
-	Skin 0 "matcap/leadmap.png"
+	Skin 0 "envmap/leadenv.png"
 	FrameIndex XZW1 M 0 0
-	Skin 0 "matcap/puromap.png"
+	Skin 0 "envmap/puroenv.png"
 	FrameIndex XZW1 N 0 0
 }
 
@@ -255,7 +255,7 @@ Model "SWWMShadow"
 	FrameIndex XZW1 A 0 0
 }
 
-Model "ShinemapDebugSphere"
+Model "EnvmapDebugSphere"
 {
 	Path "models"
 	Model 0 "extra/UnitSphere.obj"
@@ -263,44 +263,68 @@ Model "ShinemapDebugSphere"
 	ZOffset 32
 	DONTCULLBACKFACES
 
-	Skin 0 "matcap/barriermap.png"
+	Skin 0 "envmap/blodenv.png"
 	FrameIndex XZW1 A 0 0
-	Skin 0 "matcap/blumap.png"
+	Skin 0 "envmap/bluenv.png"
 	FrameIndex XZW1 B 0 0
-	Skin 0 "matcap/darkmap.png"
+	Skin 0 "envmap/darkenv.png"
 	FrameIndex XZW1 C 0 0
-	Skin 0 "matcap/dekamap.png"
+	Skin 0 "envmap/dekaenv.png"
 	FrameIndex XZW1 D 0 0
-	Skin 0 "matcap/errormap.png"
+	Skin 0 "envmap/ekaenv.png"
 	FrameIndex XZW1 E 0 0
-	Skin 0 "matcap/glassmap.png"
+	Skin 0 "envmap/glassenv.png"
 	FrameIndex XZW1 F 0 0
-	Skin 0 "matcap/goldmap.png"
+	Skin 0 "envmap/glss2env.png"
 	FrameIndex XZW1 G 0 0
-	Skin 0 "matcap/greenmap.png"
+	Skin 0 "envmap/glss3env.png"
 	FrameIndex XZW1 H 0 0
-	Skin 0 "matcap/invincimap.png"
+	Skin 0 "envmap/glss4env.png"
 	FrameIndex XZW1 I 0 0
-	Skin 0 "matcap/kinymap.png"
+	Skin 0 "envmap/glss5env.png"
 	FrameIndex XZW1 J 0 0
-	Skin 0 "matcap/leadmap.png"
+	Skin 0 "envmap/glss6env.png"
 	FrameIndex XZW1 K 0 0
-	Skin 0 "matcap/nkrknmap.png"
+	Skin 0 "envmap/goldenv.png"
 	FrameIndex XZW1 L 0 0
-	Skin 0 "matcap/nokromap.png"
+	Skin 0 "envmap/greenenv.png"
 	FrameIndex XZW1 M 0 0
-	Skin 0 "matcap/pearlmap.png"
+	Skin 0 "envmap/iceenv.png"
 	FrameIndex XZW1 N 0 0
-	Skin 0 "matcap/pinkmap.png"
+	Skin 0 "envmap/kinyenv.png"
 	FrameIndex XZW1 O 0 0
-	Skin 0 "matcap/puromap.png"
+	Skin 0 "envmap/lavaenv.png"
 	FrameIndex XZW1 P 0 0
-	Skin 0 "matcap/purpmap.png"
+	Skin 0 "envmap/leadenv.png"
 	FrameIndex XZW1 Q 0 0
-	Skin 0 "matcap/ragemap.png"
+	Skin 0 "envmap/nokrenv.png"
 	FrameIndex XZW1 R 0 0
-	Skin 0 "matcap/redmap.png"
+	Skin 0 "envmap/nukenv.png"
 	FrameIndex XZW1 S 0 0
-	Skin 0 "matcap/silvermap.png"
+	Skin 0 "envmap/ockoenv.png"
 	FrameIndex XZW1 T 0 0
+	Skin 0 "envmap/pronoenv.png"
+	FrameIndex XZW1 U 0 0
+	Skin 0 "envmap/puroenv.png"
+	FrameIndex XZW1 V 0 0
+	Skin 0 "envmap/purpenv.png"
+	FrameIndex XZW1 W 0 0
+	Skin 0 "envmap/redenv.png"
+	FrameIndex XZW1 X 0 0
+	Skin 0 "envmap/reflenv.png"
+	FrameIndex XZW1 Y 0 0
+	Skin 0 "envmap/rfl2env.png"
+	FrameIndex XZW1 Z 0 0
+	Skin 0 "envmap/silverenv.png"
+	FrameIndex XZW2 A 0 0
+	Skin 0 "envmap/tarenv.png"
+	FrameIndex XZW2 B 0 0
+	Skin 0 "envmap/telenv.png"
+	FrameIndex XZW2 C 0 0
+	Skin 0 "envmap/watrenv.png"
+	FrameIndex XZW2 D 0 0
+	Skin 0 "ERRORENV"
+	FrameIndex XZW2 E 0 0
+	Skin 0 "BARRIENV"
+	FrameIndex XZW2 F 0 0
 }

modeldef.pickups

@@ -100,7 +100,7 @@ Model "GrilledCheeseSandwich"
 {
 	Path "models"
 	Model 0 "Sandwich_d.3d"
-	SurfaceSkin 0 0 "matcap/goldmap.png"
+	SurfaceSkin 0 0 "envmap/goldenv.png"
 	SurfaceSkin 0 1 "Sandwich.png"
 	Scale 0.04 0.04 0.04
 	PitchOffset -45
@@ -125,7 +125,7 @@ Model "GhostArtifactX"
 {
 	Path "models"
 	Model 0 "GhostArtifact_d.3d"
-	SurfaceSkin 0 0 "matcap/darkmap.png"
+	SurfaceSkin 0 0 "envmap/darkenv.png"
 	Scale 0.05 0.05 0.05
 	ZOffset 16
 
@@ -147,7 +147,7 @@ Model "GravityX"
 {
 	Path "models"
 	Model 0 "Gravity_d.3d"
-	SurfaceSkin 0 1 "matcap/silvermap.png"
+	SurfaceSkin 0 1 "envmap/watrenv.png"
 	Scale 0.06 0.06 0.06
 	ZOffset 16
 
@@ -169,7 +169,7 @@ Model "InvinciballX"
 {
 	Path "models"
 	Model 0 "Invinciball_d.3d"
-	SurfaceSkin 0 1 "matcap/invincimap.png"
+	SurfaceSkin 0 1 "envmap/redenv.png"
 	Scale 0.04 0.04 0.04
 	ZOffset 16
 
@@ -191,7 +191,7 @@ Model "RagekitX"
 {
 	Path "models"
 	Model 0 "Ragekit_d.3d"
-	SurfaceSkin 0 1 "matcap/ragemap.png"
+	SurfaceSkin 0 1 "envmap/lavaenv.png"
 	Scale 0.05 0.05 0.05
 	ZOffset 16
 
@@ -278,7 +278,7 @@ Model "EBarrierX"
 {
 	Path "models"
 	Model 0 "Barrier_d.3d"
-	SurfaceSkin 0 1 "matcap/barriermap.png"
+	SurfaceSkin 0 1 "BARRIENV"
 	Scale 0.05 0.05 0.05
 	ZOffset 16
 	DONTCULLBACKFACES

modeldef.spreadgun

@@ -170,7 +170,7 @@ Model "TheBall"
 	Path "models"
 
 	Model 0 "extra/BaseSphere_d.3d"
-	Skin 0 "matcap/leadmap.png"
+	Skin 0 "envmap/leadenv.png"
 	Scale 0.006 0.006 0.006
 	ZOffset 1
 

shaders/glsl/Envmap.fp

@@ -0,0 +1,43 @@
+// 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);
+	vec3 eye = normalize(uCameraPos.xyz-pixelpos.xyz);
+	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;
+#ifdef RIM_LIGHTING
+	float rim = smoothstep(RIMSTEP,1.,1.-clamp(dot(eye,norm),0.,1.));
+	vec3 rimcol = texture(rimtex,vec2(.25+.5*rim,.5)).rgb;
+	envcol = mix(envcol,rimcol,rim*RIMFACT);
+#endif
+#ifdef BARRIER_MAP
+	vec3 grad = texture(bartex,vec2(0.,vTexCoord.t*5.+timer)).rgb;
+	envcol = (envcol+grad)*.25;
+#endif
+	mat.Base = vec4(envcol,1.);
+	mat.Normal = ApplyNormalMap(vTexCoord.st);
+}
+
+vec4 ProcessLight( Material mat, vec4 color )
+{
+#ifdef AMBIENT_GLOW
+	float glow = .75+.25*sin(timer*8);
+	return vec4(vec3(glow),color.a);
+#else
+	return color;
+#endif
+}

shaders/glsl/Envmask.fp

@@ -0,0 +1,33 @@
+// basic texture + masked 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 )
+{
+	vec4 base = getTexel(vTexCoord.st);
+	float mask = texture(masktex,vTexCoord.st).x;
+	vec3 norm = normalize(vWorldNormal.xyz);
+	vec3 eye = normalize(uCameraPos.xyz-pixelpos.xyz);
+	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;
+#ifdef RIM_LIGHTING
+	float rim = smoothstep(RIMSTEP,1.,1.-clamp(dot(eye,norm),0.,1.));
+	vec3 rimcol = texture(rimtex,vec2(.25+.5*rim,.5)).rgb;
+	envcol = mix(envcol,rimcol,rim*RIMFACT);
+#endif
+	mat.Base = vec4(base.rgb+envcol*mask,base.a);
+	mat.Normal = ApplyNormalMap(vTexCoord.st);
+	if ( (uTextureMode&TEXF_Brightmap) != 0 )
+		mat.Bright = texture(brighttexture,vTexCoord.st);
+}

shaders/glsl/Shinemap.fp

@@ -1,26 +0,0 @@
-// pseudo-matcap
-
-void SetupMaterial( inout Material mat )
-{
-	vec3 rnorm = normalize(vEyeNormalOrig.xyz)*vec3(1,-1,1);
-#ifdef BARRIER_MAP
-	vec4 basemap = getTexel(rnorm.xy*.49+.5);
-	basemap.rgb *= .25;
-	vec3 grad = texture(bartex,vec2(0.,vTexCoord.t*5.+timer)).rgb;
-	grad *= .25;
-	mat.Base = basemap+vec4(grad,0.);
-#else
-	mat.Base = getTexel(rnorm.xy*.49+.5);
-#endif
-	mat.Normal = ApplyNormalMap(vTexCoord.st);
-}
-
-vec4 ProcessLight( Material mat, vec4 color )
-{
-#ifdef AMBIENT_GLOW
-	float glow = .75+.25*sin(timer*8);
-	return vec4(vec3(glow),color.a);
-#else
-	return color;
-#endif
-}

shaders/glsl/Shinemask.fp

@@ -1,12 +0,0 @@
-// basic texture + masked pseudo-matcap
-
-void SetupMaterial( inout Material mat )
-{
-	vec4 base = getTexel(vTexCoord.st);
-	float mask = texture(masktex,vTexCoord.st).x;
-	vec3 rnorm = normalize(vEyeNormalOrig.xyz)*vec3(1,-1,1);
-	mat.Base = vec4(base.rgb+texture(envtex,rnorm.xy*.49+.5).rgb*mask,base.a);
-	mat.Normal = ApplyNormalMap(vTexCoord.st);
-	if ( (uTextureMode&TEXF_Brightmap) != 0 )
-		mat.Bright = texture(brighttexture,vTexCoord.st);
-}