OrdinaryMagician/swwmgz_fluid_m
OrdinaryMagician
/
swwmgz_fluid_m
1
0
Fork 0
Code Issues Activity

Eviternity 2 support.

This commit is contained in:
Marisa the Magician 2023-12-23 16:38:59 +01:00
parent c10b282a02
commit a5433636f0
15 changed files with 439 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
filter/doom/gldefs.doomfluids
View File

@ -3696,6 +3696,206 @@ Material flat "onukea08"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec01"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec02"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec03"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec04"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec05"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec06"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec07"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "onukec08"
{
Normal "swwm_nkn"
Specular "swwm_nkm"
Brightmap "swwm_nkg"
Glossiness 20.0
SpecularLevel 5.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_nuk"
Texture "warptex1" "warptex3"
Texture "warptex2" "warptex2"
Texture "envtex" "models/envmap/nukenv.png"
Texture "rimtex" "models/envmap/nukrim.png"
Define "SCALE1" = ".37"
Define "SCALE2" = ".23"
Define "SPEED1" = "-0.06536"
Define "SPEED2" = "0.02363"
Define "DIST1" = ".02"
Define "DIST2" = ".03"
Define "OVERGLOW" = "1.6"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".9"
Define "RIMSTEP" = ".3"
}
Material flat "opoopy01"
{
Normal "swwm_mdn"

227
filter/doom/gldefs.zapwater Normal file
View File

@ -0,0 +1,227 @@
// eviternity 2 thing
Material flat "ZWATER01"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw0"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER02"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw1"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER02"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw2"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER03"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw2"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER04"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw3"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER05"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw4"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER06"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw5"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER07"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw6"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}
Material flat "ZWATER08"
{
Normal "swwm_wtn"
Specular "swwm_wtm"
Glossiness 15.0
SpecularLevel 4.0
Shader "shaders/glsl/Distort2_remap.fp"
Texture "basetex" "swwm_wtr"
Texture "warptex1" "warptex5"
Texture "warptex2" "warptex4"
Texture "envtex" "models/envmap/watrenv.png"
Texture "rimtex" "models/envmap/watrrim.png"
Texture "zaptex" "swwm_zw7"
Define "SCALE1" = ".08"
Define "SCALE2" = ".46"
Define "SPEED1" = "0.04536"
Define "SPEED2" = "-0.15363"
Define "DIST1" = ".05"
Define "DIST2" = ".02"
Define "RIM_LIGHTING"
Define "ENVFACT" = ".8"
Define "RIMFACT" = ".4"
Define "RIMSTEP" = ".75"
Define "ZAPWATER"
}

4
shaders/glsl/Distort2_remap.fp
View File

@ -112,6 +112,10 @@ void SetupMaterial( inout Material mat )
#endif
mat.Normal = norm;
mat.Bright = texture(brighttexture,coord);
#ifdef ZAPWATER
mat.Base.rgb += texture(zaptex,basecoord).rgb;
mat.Bright.rgb += texture(zaptex,basecoord).rgb;
#endif
mat.Specular = vec3(mask.x*mask.x);
mat.Glossiness = uSpecularMaterial.x;
mat.SpecularLevel = uSpecularMaterial.y;

BIN
textures/swwm_gfl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
textures/swwm_lfl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
textures/swwm_wfd.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
textures/swwm_zw0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
textures/swwm_zw1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 67 KiB

BIN
textures/swwm_zw2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

BIN
textures/swwm_zw3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
textures/swwm_zw4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

BIN
textures/swwm_zw5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 73 KiB

BIN
textures/swwm_zw6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
textures/swwm_zw7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

8
tools/defs_doom.txt
View File

@ -151,6 +151,14 @@ flat onukea05 nuk
flat onukea06 nuk
flat onukea07 nuk
flat onukea08 nuk
flat onukec01 nuk
flat onukec02 nuk
flat onukec03 nuk
flat onukec04 nuk
flat onukec05 nuk
flat onukec06 nuk
flat onukec07 nuk
flat onukec08 nuk
flat opoopy01 mud
flat opoopy02 mud
flat opoopy03 mud