From 0b84bbb4d4fdece25f07db41fc7e7f410be0f64b Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Mon, 28 Nov 2022 17:11:57 +0100
Subject: [PATCH] A couple things missed.

---
 gldefs.demolitionist     | 251 ++++++++++++++++++++++++++++++++++-----
 language.version         |   4 +-
 models/DemoFace_mask.png | Bin 0 -> 530 bytes
 3 files changed, 221 insertions(+), 34 deletions(-)
 create mode 100644 models/DemoFace_mask.png

diff --git a/gldefs.demolitionist b/gldefs.demolitionist
index b1660a569..1b3234cc2 100644
--- a/gldefs.demolitionist
+++ b/gldefs.demolitionist
@@ -2,66 +2,253 @@ Brightmap Texture "models/DemoFace_Blank.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Blank.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Blink.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Blink.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Booty.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Booty.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Dead.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Dead.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = ".4"
+	Define "RIMFACT2" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Default.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Default.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Dizzy.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Dizzy.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT2" = ".4"
+	Define "RIMFACT2" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Evil.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Evil.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Grin.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Grin.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Hurt.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Hurt.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_HurtLeft.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_HurtLeft.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_HurtRight.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_HurtRight.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
+HardwareShader Texture "models/DemoFace_Off.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Ouch.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Ouch.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Sad.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Sad.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Smug.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Smug.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Unamused.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Unamused.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoFace_Wink.png"
 {
 	Map "models/DemoFace_bright.png"
 }
+HardwareShader Texture "models/DemoFace_Wink.png"
+{
+	Shader "shaders/glsl/Envmask.fp"
+	Texture "masktex" "models/DemoFace_mask.png"
+	Texture "envtex" "models/envmap/glss4env.png"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".4"
+	Define "RIMFACT" = ".6"
+	Define "RIMSTEP" = "0."
+}
 Brightmap Texture "models/DemoTags.png"
 {
 	Map "models/DemoTags_bright.png"
@@ -73,8 +260,8 @@ HardwareShader Texture "models/DemoTags.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsBlue.png"
@@ -88,8 +275,8 @@ HardwareShader Texture "models/DemoTagsBlue.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsCyan.png"
@@ -103,8 +290,8 @@ HardwareShader Texture "models/DemoTagsCyan.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsDragonfly.png"
@@ -118,8 +305,8 @@ HardwareShader Texture "models/DemoTagsDragonfly.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsGold.png"
@@ -133,8 +320,8 @@ HardwareShader Texture "models/DemoTagsGold.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsMagenta.png"
@@ -148,8 +335,8 @@ HardwareShader Texture "models/DemoTagsMagenta.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsOrange.png"
@@ -163,8 +350,8 @@ HardwareShader Texture "models/DemoTagsOrange.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsPeach.png"
@@ -178,8 +365,8 @@ HardwareShader Texture "models/DemoTagsPeach.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsPink.png"
@@ -193,8 +380,8 @@ HardwareShader Texture "models/DemoTagsPink.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsPurple.png"
@@ -208,8 +395,8 @@ HardwareShader Texture "models/DemoTagsPurple.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsRed.png"
@@ -223,8 +410,8 @@ HardwareShader Texture "models/DemoTagsRed.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsViolet.png"
@@ -238,8 +425,8 @@ HardwareShader Texture "models/DemoTagsViolet.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsWhite.png"
@@ -253,8 +440,8 @@ HardwareShader Texture "models/DemoTagsWhite.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsYellow.png"
@@ -268,8 +455,8 @@ HardwareShader Texture "models/DemoTagsYellow.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsBlack.png"
@@ -283,8 +470,8 @@ HardwareShader Texture "models/DemoTagsBlack.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 Brightmap Texture "models/DemoTagsRust.png"
@@ -298,8 +485,8 @@ HardwareShader Texture "models/DemoTagsRust.png"
 	Texture "envtex" "models/envmap/iceenv.png"
 	Texture "rimtex" "models/envmap/icerim.png"
 	Define "RIM_LIGHTING"
-	Define "ENVFACT2" = "1.2"
-	Define "RIMFACT2" = "1.4"
+	Define "ENVFACT" = "1.2"
+	Define "RIMFACT" = "1.4"
 	Define "RIMSTEP" = "0."
 }
 HardwareShader Texture "models/DemoArms.png"
diff --git a/language.version b/language.version
index 54dcccad2..f119c964c 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r645 \cu(Mon 28 Nov 17:06:12 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r645 \cu(2022-11-28 17:06:12)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r646 \cu(Mon 28 Nov 17:11:57 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r646 \cu(2022-11-28 17:11:57)\c-";
diff --git a/models/DemoFace_mask.png b/models/DemoFace_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d12832e451cb727878cc1787a8b8ab21d6057e4
GIT binary patch
literal 530
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(3ro1QL?Ar`0iPTrXH+CZf3
zvrX-EyEe`*j7BM!CM{eR&~b3Wr3X$6j!b3`ZthTIOV+=3!L^x9SB_<tN#-QQ?=Non
z&HmOmy_(O%>tBETr;8VpKGr{aXBXkb#=qKB@%2^b4Kat_|K6>=p{6hX(Q}Qi$>t|i
zx)y6R**9r#IG^cxT6n1{+tR7>pSMTe7uhPX_tGlyAP&W)VNqUj>9aXKUftXAkm;e$
zlHEPtH{Yo%JioQ;bi>QT=g&!=-OQ=6)6nD0s|UPm#7dYF+D|_0mY8F@N%pI9@HO7U
zPu;B+?^0%xFJQTFFnP-X(U!}9m>V}=;FFP=$F!gEdV=CP4ig?bAt6qOy=E3AGZ<Dh
zeV&$g@BZck5;rUVZhd|6;kTZ92fv)vX4su&b6A&=vDM-|!;PSYx=a=^=_{rziDvLP
zIMp=oT7kKJ)QVEa4FRIUzpNWKhfWGjUMS{zcHQnBk=Hk6e}1XA&GoP5){O<1gBxo9
zM?U{}$1t%f$tiR3!!X6fuuZEkEnmOxF2lj4A+}#81zm`g`SPJUzMV5y`k2L+IZxKS
zzV%6U&)XWOOTkwe4o3vf_jh-y+t=IhrptMnXyin>%`GhZ<Ilg+^b5-PqjdNE;j8!W
pg>R_y;d}qS{qAF{AJgA|<9~b1JUZKZZYL<RJzf1=);T3K0RTMG`Y8Ya

literal 0
HcmV?d00001