diff --git a/gldefs/demolitionist.txt b/gldefs/demolitionist.txt index 7b70e9c46..d4cdab288 100644 --- a/gldefs/demolitionist.txt +++ b/gldefs/demolitionist.txt @@ -1,11 +1,8 @@ // player -Brightmap Texture "models/DemoFace_Blank.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Blank.png" +Material Texture "models/DemoFace_Blank.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -15,12 +12,9 @@ HardwareShader Texture "models/DemoFace_Blank.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Blink.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Blink.png" +Material Texture "models/DemoFace_Blink.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -30,12 +24,9 @@ HardwareShader Texture "models/DemoFace_Blink.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Booty.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Booty.png" +Material Texture "models/DemoFace_Booty.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -45,12 +36,9 @@ HardwareShader Texture "models/DemoFace_Booty.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Dead.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Dead.png" +Material Texture "models/DemoFace_Dead.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -60,12 +48,9 @@ HardwareShader Texture "models/DemoFace_Dead.png" Define "RIMFACT2" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Default.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Default.png" +Material Texture "models/DemoFace_Default.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -75,12 +60,9 @@ HardwareShader Texture "models/DemoFace_Default.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Dizzy.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Dizzy.png" +Material Texture "models/DemoFace_Dizzy.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -90,11 +72,67 @@ HardwareShader Texture "models/DemoFace_Dizzy.png" Define "RIMFACT2" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Evil.png" +Material Texture "models/DemoFace_Evil.png" { - Map "models/DemoFace_bright.png" + Brightmap "models/DemoFace_bright.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_Evil.png" +Material Texture "models/DemoFace_Grin.png" +{ + Brightmap "models/DemoFace_bright.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." +} +Material Texture "models/DemoFace_Hurt.png" +{ + Brightmap "models/DemoFace_bright.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." +} +Material Texture "models/DemoFace_HurtLeft.png" +{ + Brightmap "models/DemoFace_bright.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." +} +Material Texture "models/DemoFace_HurtRight.png" +{ + Brightmap "models/DemoFace_bright.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." +} +Material Texture "models/DemoFace_Off.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" @@ -105,12 +143,9 @@ HardwareShader Texture "models/DemoFace_Evil.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Grin.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Grin.png" +Material Texture "models/DemoFace_Ouch.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -120,12 +155,9 @@ HardwareShader Texture "models/DemoFace_Grin.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_Hurt.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_Hurt.png" +Material Texture "models/DemoFace_Sad.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -135,12 +167,9 @@ HardwareShader Texture "models/DemoFace_Hurt.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_HurtLeft.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_HurtLeft.png" +Material Texture "models/DemoFace_Smug.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -150,12 +179,9 @@ HardwareShader Texture "models/DemoFace_HurtLeft.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoFace_HurtRight.png" -{ - Map "models/DemoFace_bright.png" -} -HardwareShader Texture "models/DemoFace_HurtRight.png" +Material Texture "models/DemoFace_Unamused.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -165,8 +191,9 @@ HardwareShader Texture "models/DemoFace_HurtRight.png" Define "RIMFACT" = ".6" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/DemoFace_Off.png" +Material Texture "models/DemoFace_Wink.png" { + Brightmap "models/DemoFace_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoFace_mask.png" Texture "envtex" "models/envmap/glss4env.png" @@ -176,87 +203,9 @@ HardwareShader Texture "models/DemoFace_Off.png" 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" -} -HardwareShader Texture "models/DemoTags.png" +Material Texture "models/DemoTags.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -266,12 +215,9 @@ HardwareShader Texture "models/DemoTags.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsBlue.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsBlue.png" +Material Texture "models/DemoTagsBlue.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -281,12 +227,9 @@ HardwareShader Texture "models/DemoTagsBlue.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsCyan.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsCyan.png" +Material Texture "models/DemoTagsCyan.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -296,12 +239,9 @@ HardwareShader Texture "models/DemoTagsCyan.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsDragonfly.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsDragonfly.png" +Material Texture "models/DemoTagsDragonfly.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -311,12 +251,9 @@ HardwareShader Texture "models/DemoTagsDragonfly.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsGold.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsGold.png" +Material Texture "models/DemoTagsGold.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -326,12 +263,9 @@ HardwareShader Texture "models/DemoTagsGold.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsMagenta.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsMagenta.png" +Material Texture "models/DemoTagsMagenta.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -341,12 +275,9 @@ HardwareShader Texture "models/DemoTagsMagenta.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsOrange.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsOrange.png" +Material Texture "models/DemoTagsOrange.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -356,12 +287,9 @@ HardwareShader Texture "models/DemoTagsOrange.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsPeach.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsPeach.png" +Material Texture "models/DemoTagsPeach.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -371,12 +299,9 @@ HardwareShader Texture "models/DemoTagsPeach.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsPink.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsPink.png" +Material Texture "models/DemoTagsPink.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -386,12 +311,9 @@ HardwareShader Texture "models/DemoTagsPink.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsPurple.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsPurple.png" +Material Texture "models/DemoTagsPurple.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -401,12 +323,9 @@ HardwareShader Texture "models/DemoTagsPurple.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsRed.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsRed.png" +Material Texture "models/DemoTagsRed.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -416,12 +335,9 @@ HardwareShader Texture "models/DemoTagsRed.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsViolet.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsViolet.png" +Material Texture "models/DemoTagsViolet.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -431,12 +347,9 @@ HardwareShader Texture "models/DemoTagsViolet.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsWhite.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsWhite.png" +Material Texture "models/DemoTagsWhite.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -446,12 +359,9 @@ HardwareShader Texture "models/DemoTagsWhite.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsYellow.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsYellow.png" +Material Texture "models/DemoTagsYellow.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -461,12 +371,9 @@ HardwareShader Texture "models/DemoTagsYellow.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsBlack.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsBlack.png" +Material Texture "models/DemoTagsBlack.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -476,12 +383,9 @@ HardwareShader Texture "models/DemoTagsBlack.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/DemoTagsRust.png" -{ - Map "models/DemoTags_bright.png" -} -HardwareShader Texture "models/DemoTagsRust.png" +Material Texture "models/DemoTagsRust.png" { + Brightmap "models/DemoTags_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -491,7 +395,7 @@ HardwareShader Texture "models/DemoTagsRust.png" Define "RIMFACT" = "1.4" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/DemoArms.png" +Material Texture "models/DemoArms.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoArms_mask.png" @@ -508,7 +412,7 @@ HardwareShader Texture "models/DemoArms.png" Define "RIMFACT2" = "1.4" Define "RIMSTEP2" = "0." } -HardwareShader Texture "models/DemoBody.png" +Material Texture "models/DemoBody.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoBody_mask.png" @@ -530,7 +434,7 @@ HardwareShader Texture "models/DemoBody.png" Define "RIMFACT3" = ".9" Define "RIMSTEP3" = "0." } -HardwareShader Texture "models/DemoHead.png" +Material Texture "models/DemoHead.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoHead_mask.png" @@ -547,7 +451,7 @@ HardwareShader Texture "models/DemoHead.png" Define "RIMFACT2" = "1.4" Define "RIMSTEP2" = "0." } -HardwareShader Texture "models/DemoLegs.png" +Material Texture "models/DemoLegs.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoLegs_mask.png" @@ -569,7 +473,7 @@ HardwareShader Texture "models/DemoLegs.png" Define "RIMFACT3" = ".9" Define "RIMSTEP3" = "0." } -HardwareShader Texture "models/DemoKeys.png" +Material Texture "models/DemoKeys.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoKeys_mask.png" @@ -591,7 +495,7 @@ HardwareShader Texture "models/DemoKeys.png" Define "RIMFACT3" = ".8" Define "RIMSTEP3" = "0." } -HardwareShader Texture "models/DemoMisc.png" +Material Texture "models/DemoMisc.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoMisc_mask.png" @@ -613,7 +517,7 @@ HardwareShader Texture "models/DemoMisc.png" Define "RIMFACT3" = ".8" Define "RIMSTEP3" = "0." } -HardwareShader Texture "models/DemoSoft.png" +Material Texture "models/DemoSoft.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DemoSoft_mask.png" diff --git a/gldefs/dlc1/dlcammo.txt b/gldefs/dlc1/dlcammo.txt index 1df76c085..342b46bfc 100644 --- a/gldefs/dlc1/dlcammo.txt +++ b/gldefs/dlc1/dlcammo.txt @@ -1,6 +1,6 @@ // dlc ammunition -HardwareShader Texture "models/SheenBullet.png" +Material Texture "models/SheenBullet.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SheenBullet_mask.png" @@ -17,7 +17,7 @@ HardwareShader Texture "models/SheenBullet.png" Define "RIMFACT2" = "1.3" Define "RIMSTEP2" = "0." } -HardwareShader Texture "models/SheenBullet_Fired.png" +Material Texture "models/SheenBullet_Fired.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SheenBullet_Fired_mask.png" @@ -34,7 +34,7 @@ HardwareShader Texture "models/SheenBullet_Fired.png" Define "RIMFACT2" = "1.3" Define "RIMSTEP2" = "0." } -HardwareShader Texture "models/SheenAmmoBox.png" +Material Texture "models/SheenAmmoBox.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SheenAmmoBox_mask.png" @@ -51,12 +51,9 @@ HardwareShader Texture "models/SheenAmmoBox.png" Define "RIMFACT2" = ".9" Define "RIMSTEP2" = "0." } -Brightmap Texture "models/QuadCell.png" -{ - map "models/QuadCell_bright.png" -} -HardwareShader Texture "models/QuadCell.png" +Material Texture "models/QuadCell.png" { + Brightmap "models/QuadCell_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/QuadCell_mask.png" Texture "envtex" "models/envmap/lavaenv.png" @@ -72,7 +69,7 @@ HardwareShader Texture "models/QuadCell.png" Define "RIMFACT2" = ".9" Define "RIMSTEP2" = ".2" } -HardwareShader Texture "models/QuadCell_Used.png" +Material Texture "models/QuadCell_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/QuadCell_mask.png" diff --git a/gldefs/dlc1/hammer.txt b/gldefs/dlc1/hammer.txt index 516e34b53..a0b13f385 100644 --- a/gldefs/dlc1/hammer.txt +++ b/gldefs/dlc1/hammer.txt @@ -1,6 +1,6 @@ // itamex hammer -HardwareShader Texture "models/CombatHammer.png" +Material Texture "models/CombatHammer.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/CombatHammer_mask.png" diff --git a/gldefs/dlc1/mortalrifle.txt b/gldefs/dlc1/mortalrifle.txt index 25659d5fe..6a0a6d99c 100644 --- a/gldefs/dlc1/mortalrifle.txt +++ b/gldefs/dlc1/mortalrifle.txt @@ -1,15 +1,12 @@ // mortal rifle -Brightmap Texture "models/MortalSight.png" -{ - Map "brightmaps/fullbright.png" -} -HardwareShader Texture "models/MortalSight.png" +Material Texture "models/MortalSight.png" { + Brightmap "brightmaps/fullbright.png" Shader "shaders/glsl/Overbright.fp" Define "OVERFACT" = "4." } -HardwareShader Texture "models/MortalRifle.png" +Material Texture "models/MortalRifle.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalRifle_mask.png" @@ -23,16 +20,9 @@ HardwareShader Texture "models/MortalRifle.png" Define "RIMSTEP" = ".2" Define "ENV_TWOLAYER" } -Brightmap Texture "models/MortalMag.png" -{ - Map "models/MortalMag_bright.png" -} -Brightmap Texture "models/MortalMag_Empty.png" -{ - Map "models/MortalMag_bright.png" -} -HardwareShader Texture "models/MortalMag.png" +Material Texture "models/MortalMag.png" { + Brightmap "models/MortalMag_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalMag_mask.png" Texture "envtex" "models/envmap/leadenv.png" @@ -45,8 +35,9 @@ HardwareShader Texture "models/MortalMag.png" Define "RIMSTEP" = ".2" Define "ENV_TWOLAYER" } -HardwareShader Texture "models/MortalMag_Empty.png" +Material Texture "models/MortalMag_Empty.png" { + Brightmap "models/MortalMag_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalMag_Empty_mask.png" Texture "envtex" "models/envmap/leadenv.png" @@ -56,7 +47,7 @@ HardwareShader Texture "models/MortalMag_Empty.png" Define "RIMFACT" = "1.2" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/MortalRound.png" +Material Texture "models/MortalRound.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalRound_mask.png" @@ -64,7 +55,7 @@ HardwareShader Texture "models/MortalRound.png" Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/MortalRound_Used.png" +Material Texture "models/MortalRound_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalRound_mask.png" @@ -72,36 +63,30 @@ HardwareShader Texture "models/MortalRound_Used.png" Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/MortalGrenade.png" -{ - Map "models/MortalGrenade_bright.png" -} -Brightmap Texture "models/MortalGrenade_Used.png" -{ - Map "models/MortalGrenade_bright.png" -} -HardwareShader Texture "models/MortalGrenade.png" +Material Texture "models/MortalGrenade.png" { + Brightmap "models/MortalGrenade_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalGrenade_mask.png" Texture "envtex" "models/envmap/iceenv.png" Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/MortalGrenade_Used.png" +Material Texture "models/MortalGrenade_Used.png" { + Brightmap "models/MortalGrenade_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalGrenade_mask.png" Texture "envtex" "models/envmap/iceenv.png" Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/MortalLED.png" +Material Texture "models/MortalLED.png" { Shader "shaders/glsl/CanvasProxy.fp" Texture "scrtex" "MORTLED1" } -HardwareShader Texture "models/MortalLED2.png" +Material Texture "models/MortalLED2.png" { Shader "shaders/glsl/CanvasProxy.fp" Texture "scrtex" "MORTLED2" diff --git a/gldefs/dlc1/plasmablast.txt b/gldefs/dlc1/plasmablast.txt index 9475bb953..578fcc328 100644 --- a/gldefs/dlc1/plasmablast.txt +++ b/gldefs/dlc1/plasmablast.txt @@ -1,7 +1,8 @@ // plasma blaster -HardwareShader Texture "models/PlasmaBlast.png" +Material Texture "models/PlasmaBlast.png" { + Brightmap "models/PlasmaBlast_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/PlasmaBlast_mask.png" Texture "envtex" "models/envmap/iceenv.png" @@ -11,16 +12,12 @@ HardwareShader Texture "models/PlasmaBlast.png" Define "RIMFACT" = "1." Define "RIMSTEP" = "0." } -Brightmap Texture "models/PlasmaBlast.png" -{ - Map "models/PlasmaBlast_bright.png" -} -HardwareShader Texture "models/PlasmaLED.png" +Material Texture "models/PlasmaLED.png" { Shader "shaders/glsl/CanvasProxy.fp" Texture "scrtex" "PLASBLED" } -HardwareShader Texture "models/PlasmaBlast_1st.png" +Material Texture "models/PlasmaBlast_1st.png" { Shader "shaders/glsl/PlasmaBlast.fp" Texture "masktex" "models/PlasmaBlast_mask.png" diff --git a/gldefs/dlc1/quadravol.txt b/gldefs/dlc1/quadravol.txt index b1cf74392..1cc104e98 100644 --- a/gldefs/dlc1/quadravol.txt +++ b/gldefs/dlc1/quadravol.txt @@ -1,6 +1,6 @@ // quadravol -HardwareShader Texture "models/Quadravol.png" +Material Texture "models/Quadravol.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Quadravol_mask.png" @@ -17,7 +17,7 @@ HardwareShader Texture "models/Quadravol.png" Define "RIMFACT2" = ".9" Define "RIMSTEP2" = ".2" } -HardwareShader Texture "models/QuadLED.png" +Material Texture "models/QuadLED.png" { Shader "shaders/glsl/CanvasProxy.fp" Texture "scrtex" "QUADRLED" diff --git a/gldefs/dlc1/sheenhmg.txt b/gldefs/dlc1/sheenhmg.txt index 11a5f26b6..10070d8ae 100644 --- a/gldefs/dlc1/sheenhmg.txt +++ b/gldefs/dlc1/sheenhmg.txt @@ -1,6 +1,6 @@ // sheen hmg -HardwareShader Texture "models/SheenHMG.png" +Material Texture "models/SheenHMG.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SheenHMG_mask.png" @@ -17,12 +17,12 @@ HardwareShader Texture "models/SheenHMG.png" Define "RIMFACT2" = ".4" Define "RIMSTEP2" = ".2" } - -HardwareShader Texture "models/SheenLED.png" +Material Texture "models/SheenLED.png" { Shader "shaders/glsl/CanvasProxy.fp" Texture "scrtex" "SHEENLED" } + PointLight SHEENTLIGHT { Color 1.0 0.7 0.2 diff --git a/gldefs/envmaps.txt b/gldefs/envmaps.txt index 3012061bc..9c505f400 100644 --- a/gldefs/envmaps.txt +++ b/gldefs/envmaps.txt @@ -1,6 +1,6 @@ // base envmaps -HardwareShader Texture "models/envmap/blodenv.png" +Material Texture "models/envmap/blodenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/blodrim.png" @@ -9,13 +9,13 @@ HardwareShader Texture "models/envmap/blodenv.png" Define "RIMFACT" = "1.5" Define "RIMSTEP" = ".35" } -HardwareShader Texture "models/envmap/bluenv.png" +Material 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" +Material Texture "models/envmap/darkenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/darkrim.png" @@ -23,80 +23,80 @@ HardwareShader Texture "models/envmap/darkenv.png" Define "ENVFACT" = ".3" Define "RIMFACT" = "1.1" } -HardwareShader Texture "models/envmap/dekaenv.png" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material Texture "models/envmap/kinyenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/kinyrim.png" @@ -104,7 +104,7 @@ HardwareShader Texture "models/envmap/kinyenv.png" Define "RIMFACT" = "1.5" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/envmap/lavaenv.png" +Material Texture "models/envmap/lavaenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/lavarim.png" @@ -112,13 +112,13 @@ HardwareShader Texture "models/envmap/lavaenv.png" Define "RIMFACT" = "1.5" Define "RIMSTEP" = ".35" } -HardwareShader Texture "models/envmap/leadenv.png" +Material 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" +Material Texture "models/envmap/nokrenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/nokrrim.png" @@ -126,62 +126,62 @@ HardwareShader Texture "models/envmap/nokrenv.png" Define "RIMFACT" = "1.5" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/envmap/nukenv.png" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material 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" +Material Texture "models/envmap/tarenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/tarrim.png" @@ -189,26 +189,26 @@ HardwareShader Texture "models/envmap/tarenv.png" Define "RIMFACT" = "1.5" Define "RIMSTEP" = ".25" } -HardwareShader Texture "models/envmap/telenv.png" +Material 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" +Material Texture "models/envmap/watrenv.png" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/watrrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "ERRORENV" +Material Texture "ERRORENV" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/redrim.png" Define "RIM_LIGHTING" Define "AMBIENT_GLOW" } -HardwareShader Texture "BARRIENV" +Material Texture "BARRIENV" { Shader "shaders/glsl/Envmap.fp" Texture "rimtex" "models/envmap/glss3rim.png" diff --git a/gldefs/items/ammo.txt b/gldefs/items/ammo.txt index 11de9b740..24e3cfb73 100644 --- a/gldefs/items/ammo.txt +++ b/gldefs/items/ammo.txt @@ -1,6 +1,6 @@ // ammunition -HardwareShader Texture "models/ExplodiumBullet.png" +Material Texture "models/ExplodiumBullet.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumBullet_mask.png" @@ -11,7 +11,7 @@ HardwareShader Texture "models/ExplodiumBullet.png" Define "RIMFACT" = ".9" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/ExplodiumCasing.png" +Material Texture "models/ExplodiumCasing.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumCasing_mask.png" @@ -21,7 +21,7 @@ HardwareShader Texture "models/ExplodiumCasing.png" Define "ENVFACT" = ".4" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/ExplodiumCasing_Used.png" +Material Texture "models/ExplodiumCasing_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumCasing_Used_mask.png" @@ -31,7 +31,7 @@ HardwareShader Texture "models/ExplodiumCasing_Used.png" Define "ENVFACT" = ".4" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/Shell_Normal.png" +Material Texture "models/Shell_Normal.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Shell_Normal_mask.png" @@ -41,7 +41,7 @@ HardwareShader Texture "models/Shell_Normal.png" Define "ENVFACT" = ".4" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/Shell_Normal_Used.png" +Material Texture "models/Shell_Normal_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Shell_Normal_Used_mask.png" @@ -51,7 +51,7 @@ HardwareShader Texture "models/Shell_Normal_Used.png" Define "ENVFACT" = ".4" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/Shell_Gold.png" +Material Texture "models/Shell_Gold.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Shell_Gold_mask.png" @@ -66,7 +66,7 @@ HardwareShader Texture "models/Shell_Gold.png" Define "ENVFACT2" = ".6" Define "RIMFACT2" = ".9" } -HardwareShader Texture "models/Shell_Gold_Used.png" +Material Texture "models/Shell_Gold_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Shell_Gold_Used_mask.png" @@ -81,7 +81,7 @@ HardwareShader Texture "models/Shell_Gold_Used.png" Define "ENVFACT2" = ".6" Define "RIMFACT2" = ".9" } -HardwareShader Texture "models/EvisceratorShell.png" +Material Texture "models/EvisceratorShell.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/EvisceratorShell_mask.png" @@ -92,7 +92,7 @@ HardwareShader Texture "models/EvisceratorShell.png" Define "RIMFACT" = ".9" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/HellblazerMissile.png" +Material Texture "models/HellblazerMissile.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/HellblazerMissile_mask.png" @@ -103,12 +103,9 @@ HardwareShader Texture "models/HellblazerMissile.png" Define "RIMFACT" = ".4" Define "RIMSTEP" = "0." } -Brightmap Texture "models/SparksterAmmo.png" -{ - map "models/SparksterAmmo_bright.png" -} -HardwareShader Texture "models/SparksterAmmo.png" +Material Texture "models/SparksterAmmo.png" { + Brightmap "models/SparksterAmmo_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SparksterAmmo_mask.png" Texture "envtex" "models/envmap/dekaenv.png" @@ -117,7 +114,7 @@ HardwareShader Texture "models/SparksterAmmo.png" Define "ENVFACT" = ".75" Define "RIMFACT" = ".9" } -HardwareShader Texture "models/SilverBulletAmmo.png" +Material Texture "models/SilverBulletAmmo.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SilverBulletAmmo_mask.png" @@ -139,7 +136,7 @@ HardwareShader Texture "models/SilverBulletAmmo.png" Define "RIMFACT3" = ".9" Define "RIMSTEP3" = ".2" } -HardwareShader Texture "models/SilverBulletAmmo_Empty.png" +Material Texture "models/SilverBulletAmmo_Empty.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SilverBulletAmmo_Empty_mask.png" @@ -150,7 +147,7 @@ HardwareShader Texture "models/SilverBulletAmmo_Empty.png" Define "RIMFACT" = ".8" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/SilverBulletBullet.png" +Material Texture "models/SilverBulletBullet.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SilverBulletBullet_mask.png" @@ -166,7 +163,7 @@ HardwareShader Texture "models/SilverBulletBullet.png" Define "RIMFACT2" = ".9" Define "RIMSTEP2" = ".2" } -HardwareShader Texture "models/SilverBulletBullet_Used.png" +Material Texture "models/SilverBulletBullet_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SilverBulletBullet_Used_mask.png" @@ -182,7 +179,7 @@ HardwareShader Texture "models/SilverBulletBullet_Used.png" Define "RIMFACT2" = ".9" Define "RIMSTEP2" = ".2" } -HardwareShader Texture "models/CandyBullet.png" +Material Texture "models/CandyBullet.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumBullet_mask.png" @@ -193,7 +190,7 @@ HardwareShader Texture "models/CandyBullet.png" Define "RIMFACT" = ".4" Define "RIMSTEP" = "0." } -HardwareShader Texture "models/CandyCasing.png" +Material Texture "models/CandyCasing.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumCasing_mask.png" @@ -203,7 +200,7 @@ HardwareShader Texture "models/CandyCasing.png" Define "ENVFACT" = ".4" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/CandyCasing_Used.png" +Material Texture "models/CandyCasing_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumCasing_Used_mask.png" @@ -213,12 +210,9 @@ HardwareShader Texture "models/CandyCasing_Used.png" Define "ENVFACT" = ".4" Define "RIMFACT" = ".8" } -Brightmap Texture "models/YnykronAmmo.png" -{ - map "models/YnykronAmmo_bright.png" -} -HardwareShader Texture "models/YnykronAmmo.png" +Material Texture "models/YnykronAmmo.png" { + Brightmap "models/YnykronAmmo_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/YnykronAmmo_mask.png" Texture "envtex" "models/envmap/leadenv.png" @@ -239,12 +233,9 @@ HardwareShader Texture "models/YnykronAmmo.png" Define "RIMFACT3" = "1.1" Define "RIMSTEP3" = ".2" } -Brightmap Texture "models/YnykronRod.png" -{ - map "models/YnykronRod_bright.png" -} -HardwareShader Texture "models/YnykronRod.png" +Material Texture "models/YnykronRod.png" { + Brightmap "models/YnykronRod_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/YnykronRod_mask.png" Texture "envtex" "models/envmap/puroenv.png" @@ -254,24 +245,9 @@ HardwareShader Texture "models/YnykronRod.png" Define "RIMFACT" = "1.1" Define "RIMSTEP" = ".2" } -Brightmap Texture "models/Fabricator.png" -{ - map "models/Fabricator_bright.png" -} -Brightmap Texture "models/Fabricator_Tier2.png" -{ - map "models/Fabricator_bright.png" -} -Brightmap Texture "models/Fabricator_Tier3.png" -{ - map "models/Fabricator_bright.png" -} -Brightmap Texture "models/Fabricator_Tier4.png" -{ - map "models/Fabricator_bright.png" -} -HardwareShader Texture "models/Fabricator.png" +Material Texture "models/Fabricator.png" { + Brightmap "models/Fabricator_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Fabricator_mask.png" Texture "envtex" "models/envmap/silverenv.png" @@ -280,8 +256,9 @@ HardwareShader Texture "models/Fabricator.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/Fabricator_Tier2.png" +Material Texture "models/Fabricator_Tier2.png" { + Brightmap "models/Fabricator_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Fabricator_mask.png" Texture "envtex" "models/envmap/silverenv.png" @@ -290,8 +267,9 @@ HardwareShader Texture "models/Fabricator_Tier2.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/Fabricator.png" +Material Texture "models/Fabricator_Tier3.png" { + Brightmap "models/Fabricator_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Fabricator_mask.png" Texture "envtex" "models/envmap/silverenv.png" @@ -300,8 +278,9 @@ HardwareShader Texture "models/Fabricator.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/Fabricator_Tier4.png" +Material Texture "models/Fabricator_Tier4.png" { + Brightmap "models/Fabricator_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Fabricator_mask.png" Texture "envtex" "models/envmap/goldenv.png" @@ -310,28 +289,9 @@ HardwareShader Texture "models/Fabricator_Tier4.png" Define "ENVFACT" = ".8" Define "RIMFACT" = ".9" } -Brightmap Texture "models/Embiggener.png" -{ - map "models/Embiggener_bright.png" -} -Brightmap Texture "models/Embiggener_Tier2.png" -{ - map "models/Embiggener_bright.png" -} -Brightmap Texture "models/Embiggener_Tier3.png" -{ - map "models/Embiggener_bright.png" -} -Brightmap Texture "models/Embiggener_Tier4.png" -{ - map "models/Embiggener_bright.png" -} -Brightmap Texture "models/Embiggener_Tier5.png" -{ - map "models/Embiggener_bright.png" -} -HardwareShader Texture "models/Embiggener.png" +Material Texture "models/Embiggener.png" { + Brightmap "models/Embiggener_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Embiggener_mask.png" Texture "envtex" "models/envmap/redenv.png" @@ -340,8 +300,9 @@ HardwareShader Texture "models/Embiggener.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".9" } -HardwareShader Texture "models/Embiggener_Tier2.png" +Material Texture "models/Embiggener_Tier2.png" { + Brightmap "models/Embiggener_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Embiggener_mask.png" Texture "envtex" "models/envmap/greenenv.png" @@ -350,8 +311,9 @@ HardwareShader Texture "models/Embiggener_Tier2.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".9" } -HardwareShader Texture "models/Embiggener_Tier3.png" +Material Texture "models/Embiggener_Tier3.png" { + Brightmap "models/Embiggener_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Embiggener_mask.png" Texture "envtex" "models/envmap/bluenv.png" @@ -360,8 +322,9 @@ HardwareShader Texture "models/Embiggener_Tier3.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".9" } -HardwareShader Texture "models/Embiggener_Tier4.png" +Material Texture "models/Embiggener_Tier4.png" { + Brightmap "models/Embiggener_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Embiggener_mask.png" Texture "envtex" "models/envmap/purpenv.png" @@ -370,8 +333,9 @@ HardwareShader Texture "models/Embiggener_Tier4.png" Define "ENVFACT" = ".6" Define "RIMFACT" = ".9" } -HardwareShader Texture "models/Embiggener_Tier5.png" +Material Texture "models/Embiggener_Tier5.png" { + Brightmap "models/Embiggener_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Embiggener_mask.png" Texture "envtex" "models/envmap/iceenv.png" diff --git a/gldefs/items/funstuff.txt b/gldefs/items/funstuff.txt index 3fb9d1dbb..763436f79 100644 --- a/gldefs/items/funstuff.txt +++ b/gldefs/items/funstuff.txt @@ -1,10 +1,10 @@ // collectibles and more -Brightmap Texture "models/SayaBean.png" +Material Texture "models/SayaBean.png" { - Map "models/SayaBean_bright.png" + Brightmap "models/SayaBean_bright.png" } -HardwareShader Texture "models/SayasMug.png" +Material Texture "models/SayasMug.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SayasMug_mask.png" @@ -15,32 +15,29 @@ HardwareShader Texture "models/SayasMug.png" Define "RIMFACT" = ".8" Define "RIMSTEP" = ".4" } -Brightmap Texture "models/DemoPlush.png" +Material Texture "models/DemoPlush.png" { - Map "models/DemoPlush_bright.png" + Brightmap "models/DemoPlush_bright.png" } -Brightmap Texture "models/DemoPlush2.png" +Material Texture "models/DemoPlush2.png" { - Map "models/DemoPlush2_bright.png" + Brightmap "models/DemoPlush2_bright.png" } -Brightmap Texture "models/KirinPlush.png" +Material Texture "models/KirinPlush.png" { - Map "models/KirinPlush_bright.png" + Brightmap "models/KirinPlush_bright.png" } -HardwareShader Texture "models/PerfectlyGeneric.png" +Material Texture "models/PerfectlyGeneric.png" { Shader "shaders/glsl/PerfectlyGeneric.fp" } -Brightmap Texture "models/MothPlush.png" +Material Texture "models/MothPlush.png" { - Map "models/MothPlush_bright.png" + Brightmap "models/MothPlush_bright.png" } -Brightmap Texture "models/Chancebox.png" -{ - map "models/Chancebox_bright.png" -} -HardwareShader Texture "models/Chancebox.png" +Material Texture "models/Chancebox.png" { + Brightmap "models/Chancebox_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Chancebox_mask.png" Texture "envtex" "models/envmap/silverenv.png" diff --git a/gldefs/items/keys.txt b/gldefs/items/keys.txt index d759743ac..7c94df637 100644 --- a/gldefs/items/keys.txt +++ b/gldefs/items/keys.txt @@ -1,128 +1,89 @@ // keys -Brightmap Texture "models/DoomRedKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomYellowKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomBlueKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomGreenKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomOrangeKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomBlackKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomWhiteKey.png" -{ - map "models/DoomKey_bright.png" -} -Brightmap Texture "models/DoomSilverKey.png" -{ - map "models/DoomKey_bright.png" -} -HardwareShader Texture "models/DoomRedKey.png" +Material Texture "models/DoomRedKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/redenv.png" Texture "rimtex" "models/envmap/redrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomYellowKey.png" +Material Texture "models/DoomYellowKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/goldenv.png" Texture "rimtex" "models/envmap/goldrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomBlueKey.png" +Material Texture "models/DoomBlueKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/bluenv.png" Texture "rimtex" "models/envmap/blurim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomGreenKey.png" +Material Texture "models/DoomGreenKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/greenenv.png" Texture "rimtex" "models/envmap/greenrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomOrangeKey.png" +Material Texture "models/DoomOrangeKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/goldenv.png" Texture "rimtex" "models/envmap/goldrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomBlackKey.png" +Material Texture "models/DoomBlackKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/leadenv.png" Texture "rimtex" "models/envmap/leadrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomWhiteKey.png" +Material Texture "models/DoomWhiteKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/silverenv.png" Texture "rimtex" "models/envmap/silverrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/DoomSilverKey.png" +Material Texture "models/DoomSilverKey.png" { + Brightmap "models/DoomKey_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomKey_mask.png" Texture "envtex" "models/envmap/silverenv.png" Texture "rimtex" "models/envmap/silverrim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/DoomKeyLight.png" +Material Texture "models/DoomKeyLight.png" { - Map "brightmaps/Fullbright.png" + Brightmap "brightmaps/Fullbright.png" } -HardwareShader Texture "models/DoomKeyLight3.png" +Material Texture "models/DoomKeyLight3.png" { Shader "shaders/glsl/KeyBlink.fp" } -Brightmap Texture "models/DoomRedSkull.png" -{ - map "models/DoomSkull_bright.png" -} -Brightmap Texture "models/DoomBlueSkull.png" -{ - map "models/DoomSkull_bright.png" -} -Brightmap Texture "models/DoomYellowSkull.png" -{ - map "models/DoomSkull_bright.png" -} -Brightmap Texture "models/DoomPurpleSkull.png" -{ - map "models/DoomSkull_bright.png" -} -HardwareShader Texture "models/DoomRedSkull.png" +Material Texture "models/DoomRedSkull.png" { + Brightmap "models/DoomSkull_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomSkull_mask.png" Texture "envtex" "models/envmap/redenv.png" @@ -130,8 +91,9 @@ HardwareShader Texture "models/DoomRedSkull.png" Define "RIM_LIGHTING" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/DoomBlueSkull.png" +Material Texture "models/DoomBlueSkull.png" { + Brightmap "models/DoomSkull_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomSkull_mask.png" Texture "envtex" "models/envmap/bluenv.png" @@ -139,8 +101,9 @@ HardwareShader Texture "models/DoomBlueSkull.png" Define "RIM_LIGHTING" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/DoomYellowSkull.png" +Material Texture "models/DoomYellowSkull.png" { + Brightmap "models/DoomSkull_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomSkull_mask.png" Texture "envtex" "models/envmap/goldenv.png" @@ -148,8 +111,9 @@ HardwareShader Texture "models/DoomYellowSkull.png" Define "RIM_LIGHTING" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/DoomPurpleSkull.png" +Material Texture "models/DoomPurpleSkull.png" { + Brightmap "models/DoomSkull_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DoomSkull_mask.png" Texture "envtex" "models/envmap/purpenv.png" diff --git a/gldefs/items/pickups.txt b/gldefs/items/pickups.txt index 136d62442..be51eb1f7 100644 --- a/gldefs/items/pickups.txt +++ b/gldefs/items/pickups.txt @@ -1,27 +1,8 @@ // various pickups -Brightmap Texture "models/Nugget_Armor.png" -{ - map "models/Nugget_mask.png" -} -Brightmap Texture "models/Nugget.png" -{ - map "models/Nugget_mask.png" -} -Brightmap Texture "models/TetraHealth.png" -{ - map "models/TetraHealth_mask.png" -} -Brightmap Texture "models/CubeHealth.png" -{ - map "models/CubeHealth_mask.png" -} -Brightmap Texture "models/Refresher.png" -{ - map "models/Refresher_mask.png" -} -HardwareShader Texture "models/Nugget_Armor.png" +Material Texture "models/Nugget_Armor.png" { + Brightmap "models/Nugget_mask.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Nugget_mask.png" Texture "envtex" "models/envmap/greenenv.png" @@ -29,8 +10,9 @@ HardwareShader Texture "models/Nugget_Armor.png" Define "RIM_LIGHTING" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/Nugget.png" +Material Texture "models/Nugget.png" { + Brightmap "models/Nugget_mask.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Nugget_mask.png" Texture "envtex" "models/envmap/bluenv.png" @@ -38,31 +20,34 @@ HardwareShader Texture "models/Nugget.png" Define "RIM_LIGHTING" Define "RIMSTEP" = ".2" } -HardwareShader Texture "models/TetraHealth.png" +Material Texture "models/TetraHealth.png" { + Brightmap "models/TetraHealth_mask.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/TetraHealth_mask.png" Texture "envtex" "models/envmap/bluenv.png" Texture "rimtex" "models/envmap/blurim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/CubeHealth.png" +Material Texture "models/CubeHealth.png" { + Brightmap "models/CubeHealth_mask.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/CubeHealth_mask.png" Texture "envtex" "models/envmap/bluenv.png" Texture "rimtex" "models/envmap/blurim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/Refresher.png" +Material Texture "models/Refresher.png" { + Brightmap "models/Refresher_mask.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Refresher_mask.png" Texture "envtex" "models/envmap/purpenv.png" Texture "rimtex" "models/envmap/purprim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/BlastSuit.png" +Material Texture "models/BlastSuit.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/BlastSuit_mask.png" @@ -70,7 +55,7 @@ HardwareShader Texture "models/BlastSuit.png" Texture "rimtex" "models/envmap/ekarim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "models/WarArmor.png" +Material Texture "models/WarArmor.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/WarArmor_mask.png" @@ -78,56 +63,50 @@ HardwareShader Texture "models/WarArmor.png" Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/GhostArtifact.png" -{ - Map "models/GhostArtifact_bright.png" - DisableFullbright -} -HardwareShader Texture "models/GhostArtifact.png" +Material Texture "models/GhostArtifact.png" { + Brightmap "models/GhostArtifact_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/GhostArtifact_mask.png" Texture "envtex" "models/envmap/leadenv.png" Texture "rimtex" "models/envmap/leadrim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/Gravity.png" -{ - Map "models/Gravity_bright.png" - DisableFullbright -} -HardwareShader Texture "models/Gravity.png" +Material Texture "models/Gravity.png" { + Brightmap "models/Gravity_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Gravity_mask.png" Texture "envtex" "models/envmap/ekaenv.png" Texture "rimtex" "models/envmap/ekarim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/Ragekit.png" -{ - Map "models/Ragekit_bright.png" - DisableFullbright -} -HardwareShader Texture "models/Ragekit.png" +Material Texture "models/Ragekit.png" { + Brightmap "models/Ragekit_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Ragekit_mask.png" Texture "envtex" "models/envmap/ekaenv.png" Texture "rimtex" "models/envmap/ekarim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/Omnisight.png" +Material Texture "models/Omnisight.png" { - Map "models/Omnisight_bright.png" - DisableFullbright + Brightmap "models/Omnisight_bright.png" } -Brightmap Texture "models/Lamp.png" +Material Texture "models/Lamp.png" { - Map "models/Lamp_bright.png" - DisableFullbright + Brightmap "models/Lamp_bright.png" + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Lamp_mask.png" + Texture "envtex" "models/envmap/darkenv.png" + Texture "rimtex" "models/envmap/darkrim.png" + Texture "envtex2" "models/envmap/silverenv.png" + Texture "rimtex2" "models/envmap/silverrim.png" + Define "RIM_LIGHTING" + Define "ENV_TWOLAYER" } -HardwareShader Texture "models/Lamp.png" +Material Texture "models/Lamp_off.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Lamp_mask.png" @@ -138,23 +117,7 @@ HardwareShader Texture "models/Lamp.png" Define "RIM_LIGHTING" Define "ENV_TWOLAYER" } -HardwareShader Texture "models/Lamp_off.png" -{ - Shader "shaders/glsl/Envmask.fp" - Texture "masktex" "models/Lamp_mask.png" - Texture "envtex" "models/envmap/darkenv.png" - Texture "rimtex" "models/envmap/darkrim.png" - Texture "envtex2" "models/envmap/silverenv.png" - Texture "rimtex2" "models/envmap/silverrim.png" - Define "RIM_LIGHTING" - Define "ENV_TWOLAYER" -} -Brightmap Texture "models/Invinciball.png" -{ - Map "brightmaps/nobright.png" - DisableFullbright -} -HardwareShader Texture "models/Invinciball.png" +Material Texture "models/Invinciball.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Invinciball_mask.png" @@ -162,53 +125,45 @@ HardwareShader Texture "models/Invinciball.png" Texture "rimtex" "models/envmap/ekarim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/Moth_Mashiro.png" +Material Texture "models/Moth_Mashiro.png" { - Map "models/Moth_Mashiro_bright.png" + Brightmap "models/Moth_Mashiro_bright.png" } -Brightmap Texture "models/Barrier.png" -{ - Map "models/Barrier_bright.png" - DisableFullbright -} -HardwareShader Texture "models/Barrier.png" +Material Texture "models/Barrier.png" { + Brightmap "models/Barrier_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Barrier_mask.png" Texture "envtex" "models/envmap/ekaenv.png" Texture "rimtex" "models/envmap/ekarim.png" Define "RIM_LIGHTING" } -HardwareShader Sprite "MKRVA0" +Material Sprite "MKRVA0" { Shader "shaders/glsl/Mykradvo.fp" Texture "warptex" "textures/warptex.png" Texture "snoisetex" "textures/softnoise.png" } -HardwareShader Texture "models/extra/AnomRingies.png" +Material Texture "models/extra/AnomRingies.png" { Shader "shaders/glsl/Mykradvo2.fp" Texture "warptex" "textures/heattex.png" } -HardwareShader Sprite "DVSPA0" +Material Sprite "DVSPA0" { Shader "shaders/glsl/Divine.fp" Texture "snoisetex" "textures/softnoise.png" } -HardwareShader Texture "models/DivineSprite.png" +Material Texture "models/DivineSprite.png" { + Brightmap "models/DivineSprite_mask.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DivineSprite_mask.png" Texture "envtex" "models/envmap/puroenv.png" Texture "rimtex" "models/envmap/purorim.png" Define "RIM_LIGHTING" } -Brightmap Texture "models/DivineSprite.png" -{ - map "models/DivineSprite_mask.png" - DisableFullbright -} -HardwareShader Texture "models/DevaSigil.png" +Material Texture "models/DevaSigil.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DevaSigil_mask.png" @@ -218,13 +173,9 @@ HardwareShader Texture "models/DevaSigil.png" Define "ENVFACT" = ".5" Define "RIMFACT" = ".8" } -Brightmap Texture "models/SafetyTether.png" -{ - map "models/SafetyTether_bright.png" - DisableFullbright -} -HardwareShader Texture "models/SafetyTether.png" +Material Texture "models/SafetyTether.png" { + Brightmap "models/SafetyTether_bright.png" Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SafetyTether_mask.png" Texture "envtex" "models/envmap/silverenv.png" @@ -233,7 +184,7 @@ HardwareShader Texture "models/SafetyTether.png" Define "ENVFACT" = ".5" Define "RIMFACT" = ".8" } -HardwareShader Texture "models/SafetyTether_off.png" +Material Texture "models/SafetyTether_off.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SafetyTether_mask.png" diff --git a/gldefs/misc.txt b/gldefs/misc.txt index ad8e2f9c7..dabddf3e7 100644 --- a/gldefs/misc.txt +++ b/gldefs/misc.txt @@ -1,6 +1,6 @@ // placeholders -HardwareShader Texture "chiptilb" +Material Texture "chiptilb" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -8,7 +8,7 @@ HardwareShader Texture "chiptilb" Texture "rimtex" "models/envmap/blurim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptilc" +Material Texture "chiptilc" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -16,7 +16,7 @@ HardwareShader Texture "chiptilc" Texture "rimtex" "models/envmap/kinyrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptile" +Material Texture "chiptile" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -24,7 +24,7 @@ HardwareShader Texture "chiptile" Texture "rimtex" "models/envmap/leadrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptilg" +Material Texture "chiptilg" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -32,7 +32,7 @@ HardwareShader Texture "chiptilg" Texture "rimtex" "models/envmap/greenrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptilm" +Material Texture "chiptilm" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -40,7 +40,7 @@ HardwareShader Texture "chiptilm" Texture "rimtex" "models/envmap/purprim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptilr" +Material Texture "chiptilr" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -48,7 +48,7 @@ HardwareShader Texture "chiptilr" Texture "rimtex" "models/envmap/redrim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptilw" +Material Texture "chiptilw" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -56,7 +56,7 @@ HardwareShader Texture "chiptilw" Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" } -HardwareShader Texture "chiptily" +Material Texture "chiptily" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "chiptilw" @@ -67,61 +67,61 @@ HardwareShader Texture "chiptily" // interface -HardwareShader Texture "graphics/HUD/EnemyBarS.png" +Material Texture "graphics/HUD/EnemyBarS.png" { Shader "shaders/glsl/Fuzz.fp" Define "GRAY_COLORS" Define "BASE_RES" = "vec2(50.,3.)" Texture "noisetex" "textures/graynoise.png" } -HardwareShader Texture "graphics/HUD/HealthBarS.png" +Material Texture "graphics/HUD/HealthBarS.png" { Shader "shaders/glsl/Fuzz.fp" Define "GRAY_COLORS" Define "BASE_RES" = "vec2(100.,5.)" Texture "noisetex" "textures/graynoise.png" } -HardwareShader Texture "graphics/HUD/FuelBarS.png" +Material Texture "graphics/HUD/FuelBarS.png" { Shader "shaders/glsl/Fuzz.fp" Define "GRAY_COLORS" Define "BASE_RES" = "vec2(120.,2.)" Texture "noisetex" "textures/graynoise.png" } -HardwareShader Texture "graphics/HUD/EnemyBarD.png" +Material Texture "graphics/HUD/EnemyBarD.png" { Shader "shaders/glsl/HealthBarD.fp" Define "TEX_SIZE" = "vec2(70.,23.)" Texture "noisetex" "textures/graynoise.png" } -HardwareShader Texture "graphics/HUD/HealthBarD.png" +Material Texture "graphics/HUD/HealthBarD.png" { Shader "shaders/glsl/HealthBarD.fp" Define "TEX_SIZE" = "vec2(120.,25.)" Texture "noisetex" "textures/graynoise.png" } -HardwareShader Texture "graphics/dsmapfont.png" +Material Texture "graphics/dsmapfont.png" { Shader "shaders/glsl/AreaName.fp" Texture "gradtex" "graphics/areaname_grad.png" } -HardwareShader Texture "graphics/dsmapfont_sub.png" +Material Texture "graphics/dsmapfont_sub.png" { Shader "shaders/glsl/AreaName.fp" Texture "gradtex" "graphics/areaname_grad.png" } -HardwareShader Texture "graphics/HUD/DemoFace_Barrier.png" +Material Texture "graphics/HUD/DemoFace_Barrier.png" { Shader "shaders/glsl/BarrierFace.fp" Texture "bartex" "models/barrierbar.png" } -HardwareShader Texture "graphics/tempbg.png" +Material Texture "graphics/tempbg.png" { Shader "shaders/glsl/Fuzz.fp" Define "BASE_RES" = "vec2(640.,400.)" Texture "noisetex" "textures/graynoise.png" } -HardwareShader Texture "graphics/NewLogo.png" +Material Texture "graphics/NewLogo.png" { Shader "shaders/glsl/NewLogoAnimated.fp" // what no 2d arrays does to a mf @@ -131,231 +131,231 @@ HardwareShader Texture "graphics/NewLogo.png" Texture "gradtex" "graphics/NewLogo_Grad.png" Texture "fadetex" "LOGOFADE" } -HardwareShader Texture "graphics/M_DEMOLITIONIST.png" +Material Texture "graphics/M_DEMOLITIONIST.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/DemoIcon.png" +Material Texture "graphics/DemoIcon.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_DEEPIMPACT.png" +Material Texture "graphics/M_DEMOCHAN_DEEPIMPACT.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_EXPLOGUN.png" +Material Texture "graphics/M_DEMOCHAN_EXPLOGUN.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_SPREADGUN.png" +Material Texture "graphics/M_DEMOCHAN_SPREADGUN.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_WALLBUSTER.png" +Material Texture "graphics/M_DEMOCHAN_WALLBUSTER.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_EVISCERATOR.png" +Material Texture "graphics/M_DEMOCHAN_EVISCERATOR.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_HELLBLAZER.png" +Material Texture "graphics/M_DEMOCHAN_HELLBLAZER.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_BIOSPARK.png" +Material Texture "graphics/M_DEMOCHAN_BIOSPARK.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_SILVERBULLET.png" +Material Texture "graphics/M_DEMOCHAN_SILVERBULLET.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_CANDYGUN.png" +Material Texture "graphics/M_DEMOCHAN_CANDYGUN.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_YNYKRON.png" +Material Texture "graphics/M_DEMOCHAN_YNYKRON.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_DAB.png" +Material Texture "graphics/M_DEMOCHAN_DAB.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_DOUBLEV.png" +Material Texture "graphics/M_DEMOCHAN_DOUBLEV.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_HEALTH.png" +Material Texture "graphics/M_DEMOCHAN_HEALTH.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_LOVE.png" +Material Texture "graphics/M_DEMOCHAN_LOVE.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_RAGEKIT.png" +Material Texture "graphics/M_DEMOCHAN_RAGEKIT.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_SANDWICH.png" +Material Texture "graphics/M_DEMOCHAN_SANDWICH.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_SHELLS.png" +Material Texture "graphics/M_DEMOCHAN_SHELLS.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_SKULL.png" +Material Texture "graphics/M_DEMOCHAN_SKULL.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_THONK.png" +Material Texture "graphics/M_DEMOCHAN_THONK.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_THUMBUP.png" +Material Texture "graphics/M_DEMOCHAN_THUMBUP.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_HAMMER.png" +Material Texture "graphics/M_DEMOCHAN_HAMMER.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_PLASMA.png" +Material Texture "graphics/M_DEMOCHAN_PLASMA.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_SHEEN.png" +Material Texture "graphics/M_DEMOCHAN_SHEEN.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_QUADRAVOL.png" +Material Texture "graphics/M_DEMOCHAN_QUADRAVOL.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/M_DEMOCHAN_MISTER.png" +Material Texture "graphics/M_DEMOCHAN_MISTER.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Sprite "MBRNB0" +Material Sprite "MBRNB0" { Shader "shaders/glsl/Whew.fp" } -HardwareShader Texture "graphics/InterBG.png" +Material Texture "graphics/InterBG.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/CaptainJ.png" +Material Texture "graphics/Fanart/CaptainJ.png" { Shader "shaders/glsl/Oversample.fp" } -HardwareShader Texture "graphics/Fanart/CaptainJ2.png" +Material Texture "graphics/Fanart/CaptainJ2.png" { Shader "shaders/glsl/Oversample.fp" } -HardwareShader Texture "graphics/Fanart/Endie.jpg" +Material Texture "graphics/Fanart/Endie.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa.jpg" +Material Texture "graphics/Fanart/Marisa.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa2.jpg" +Material Texture "graphics/Fanart/Marisa2.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa3.jpg" +Material Texture "graphics/Fanart/Marisa3.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa4.jpg" +Material Texture "graphics/Fanart/Marisa4.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa5.jpg" +Material Texture "graphics/Fanart/Marisa5.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa6.jpg" +Material Texture "graphics/Fanart/Marisa6.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa7.jpg" +Material Texture "graphics/Fanart/Marisa7.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa8.jpg" +Material Texture "graphics/Fanart/Marisa8.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa9.jpg" +Material Texture "graphics/Fanart/Marisa9.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa10.jpg" +Material Texture "graphics/Fanart/Marisa10.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa11.jpg" +Material Texture "graphics/Fanart/Marisa11.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa12.jpg" +Material Texture "graphics/Fanart/Marisa12.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa13.jpg" +Material Texture "graphics/Fanart/Marisa13.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa14.jpg" +Material Texture "graphics/Fanart/Marisa14.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa15.jpg" +Material Texture "graphics/Fanart/Marisa15.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa16.jpg" +Material Texture "graphics/Fanart/Marisa16.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Marisa17.jpg" +Material Texture "graphics/Fanart/Marisa17.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Monsoon.jpg" +Material Texture "graphics/Fanart/Monsoon.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Monsoon2.jpg" +Material Texture "graphics/Fanart/Monsoon2.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Monsoon3.png" +Material Texture "graphics/Fanart/Monsoon3.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Monsoon4.png" +Material Texture "graphics/Fanart/Monsoon4.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/RedeadITA.png" +Material Texture "graphics/Fanart/RedeadITA.png" { Shader "shaders/glsl/Oversample.fp" } -HardwareShader Texture "graphics/Fanart/S20TBL.jpg" +Material Texture "graphics/Fanart/S20TBL.jpg" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Shivers.png" +Material Texture "graphics/Fanart/Shivers.png" { Shader "shaders/glsl/Bilinear.fp" } -HardwareShader Texture "graphics/Fanart/Shivers2.png" +Material Texture "graphics/Fanart/Shivers2.png" { Shader "shaders/glsl/Bilinear.fp" } diff --git a/gldefs/weapons/candygun.txt b/gldefs/weapons/candygun.txt index e789de9a7..0527f0a7b 100644 --- a/gldefs/weapons/candygun.txt +++ b/gldefs/weapons/candygun.txt @@ -1,6 +1,6 @@ // candy gun -HardwareShader Texture "models/CandyGun.png" +Material Texture "models/CandyGun.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumGun_mask.png" @@ -14,7 +14,7 @@ HardwareShader Texture "models/CandyGun.png" Define "RIMSTEP" = "0." Define "ENV_TWOLAYER" } -HardwareShader Texture "models/CandyGun_EmptyMag.png" +Material Texture "models/CandyGun_EmptyMag.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumGun_mask.png" diff --git a/gldefs/weapons/deepimpact.txt b/gldefs/weapons/deepimpact.txt index 9775e4744..b88caf6f4 100644 --- a/gldefs/weapons/deepimpact.txt +++ b/gldefs/weapons/deepimpact.txt @@ -1,6 +1,6 @@ // deep impact -HardwareShader Texture "models/DeepImpact.png" +Material Texture "models/DeepImpact.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/DeepImpact_mask.png" diff --git a/gldefs/weapons/eviscerator.txt b/gldefs/weapons/eviscerator.txt index c16d8a829..0aed54a06 100644 --- a/gldefs/weapons/eviscerator.txt +++ b/gldefs/weapons/eviscerator.txt @@ -1,6 +1,6 @@ // eviscerator -HardwareShader Texture "models/Eviscerator.png" +Material Texture "models/Eviscerator.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Eviscerator_mask.png" diff --git a/gldefs/weapons/explodiumgun.txt b/gldefs/weapons/explodiumgun.txt index ca34fe4dc..32ed93b3d 100644 --- a/gldefs/weapons/explodiumgun.txt +++ b/gldefs/weapons/explodiumgun.txt @@ -1,6 +1,6 @@ // explodium gun -HardwareShader Texture "models/ExplodiumGun.png" +Material Texture "models/ExplodiumGun.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumGun_mask.png" @@ -14,7 +14,7 @@ HardwareShader Texture "models/ExplodiumGun.png" Define "RIMSTEP" = ".2" Define "ENV_TWOLAYER" } -HardwareShader Texture "models/ExplodiumGun_EmptyMag.png" +Material Texture "models/ExplodiumGun_EmptyMag.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/ExplodiumGun_mask.png" diff --git a/gldefs/weapons/hellblazer.txt b/gldefs/weapons/hellblazer.txt index d98fd6e3a..81637f0bb 100644 --- a/gldefs/weapons/hellblazer.txt +++ b/gldefs/weapons/hellblazer.txt @@ -1,6 +1,6 @@ // hellblazer -HardwareShader Texture "models/Hellblazer.png" +Material Texture "models/Hellblazer.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Hellblazer_mask.png" diff --git a/gldefs/weapons/silverbullet.txt b/gldefs/weapons/silverbullet.txt index bfca665fb..dec77dfc1 100644 --- a/gldefs/weapons/silverbullet.txt +++ b/gldefs/weapons/silverbullet.txt @@ -1,6 +1,6 @@ // silver bullet jet -HardwareShader Texture "models/SilverBullet.png" +Material Texture "models/SilverBullet.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SilverBullet_mask.png" @@ -23,7 +23,7 @@ HardwareShader Texture "models/SilverBullet.png" Define "RIMSTEP3" = "0." } -HardwareShader Texture "models/SilverBulletJetSmoke.png" +Material Texture "models/SilverBulletJetSmoke.png" { Shader "shaders/glsl/JetSmoke.fp" Texture "smoketex" "models/SilverBulletJetNoise.png" diff --git a/gldefs/weapons/sparkster.txt b/gldefs/weapons/sparkster.txt index 25b9e845b..f1fdfd67a 100644 --- a/gldefs/weapons/sparkster.txt +++ b/gldefs/weapons/sparkster.txt @@ -1,6 +1,6 @@ // biospark carbine -HardwareShader Texture "models/Sparkster.png" +Material Texture "models/Sparkster.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Sparkster_mask.png" @@ -10,7 +10,7 @@ HardwareShader Texture "models/Sparkster.png" Define "ENVFACT" = ".75" Define "RIMFACT" = ".9" } -HardwareShader Texture "models/SparksterBall.png" +Material Texture "models/SparksterBall.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/SparksterBall_mask.png" diff --git a/gldefs/weapons/spreadgun.txt b/gldefs/weapons/spreadgun.txt index e2bc52fdf..41ca4439b 100644 --- a/gldefs/weapons/spreadgun.txt +++ b/gldefs/weapons/spreadgun.txt @@ -1,6 +1,6 @@ // spreadgun -HardwareShader Texture "models/Spreadgun.png" +Material Texture "models/Spreadgun.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Spreadgun_mask.png" diff --git a/gldefs/weapons/wallbuster.txt b/gldefs/weapons/wallbuster.txt index 1d949c0fc..437d1e4a0 100644 --- a/gldefs/weapons/wallbuster.txt +++ b/gldefs/weapons/wallbuster.txt @@ -1,6 +1,6 @@ // wallbuster -HardwareShader Texture "models/Wallbuster.png" +Material Texture "models/Wallbuster.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Wallbuster_mask.png" diff --git a/gldefs/weapons/ynykron.txt b/gldefs/weapons/ynykron.txt index 70f789b0f..446164f81 100644 --- a/gldefs/weapons/ynykron.txt +++ b/gldefs/weapons/ynykron.txt @@ -1,6 +1,6 @@ // ynykron artifact -HardwareShader Texture "models/Ynykron.png" +Material Texture "models/Ynykron.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Ynykron_mask.png" @@ -23,7 +23,7 @@ HardwareShader Texture "models/Ynykron.png" Define "RIMSTEP3" = ".3" } -HardwareShader Texture "models/YnykronSmoke.png" +Material Texture "models/YnykronSmoke.png" { Shader "shaders/glsl/YnykronSmoke.fp" Texture "smoketex" "models/YnykronSmokeNoise.png" diff --git a/language.version b/language.version index 6f9a7eaae..a2c19c6fc 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r676 \cu(Sat 10 Dec 12:36:24 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r676 \cu(2022-12-10 12:36:24)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r677 \cu(Sat 10 Dec 12:59:40 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r677 \cu(2022-12-10 12:59:40)\c-";