From 7d86143fb47c060f502c4f623023748127b39a2f Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Wed, 27 Jul 2022 13:17:18 +0200 Subject: [PATCH] Updates for recent A_ChangeModel fix. Use a canvas texture for the titlescreen fade. --- animdefs.misc | 3 +- gldefs.demolitionist | 9 --- language.version | 4 +- modeldef.candygun | 2 +- modeldef.deepimpact | 2 +- modeldef.eviscerator | 2 +- modeldef.explodiumgun | 2 +- modeldef.explodiumgun2 | 4 +- modeldef.gesture | 6 +- modeldef.hellblazer | 2 +- modeldef.itemgesture | 24 ++++---- modeldef.keygesture | 56 ++++++++--------- modeldef.sheenhmg | 2 +- modeldef.silverbullet | 2 +- modeldef.sparkster | 2 +- modeldef.spreadgun | 2 +- modeldef.wallbuster | 2 +- modeldef.ynykron | 2 +- models/DemoTags1st.png | Bin 7881 -> 0 bytes sprites/LGFDA0.png | Bin 106 -> 0 bytes zscript/items/swwm_funstuff.zsc | 8 +-- zscript/menu/swwm_title.zsc | 90 ++-------------------------- zscript/swwm_gesture.zsc | 12 ++++ zscript/swwm_player.zsc | 9 ++- zscript/swwm_statichandler.zsc | 31 ---------- zscript/weapons/swwm_baseweapon.zsc | 11 ++++ zscript/weapons/swwm_splode.zsc | 12 ++++ 27 files changed, 110 insertions(+), 191 deletions(-) delete mode 100644 models/DemoTags1st.png delete mode 100644 sprites/LGFDA0.png diff --git a/animdefs.misc b/animdefs.misc index 011133225..7c81333c4 100644 --- a/animdefs.misc +++ b/animdefs.misc @@ -1,3 +1,2 @@ -cameratexture LOGOFADE 64 64 +canvastexture LOGOFADE 4 4 canvastexture SHEENLED 128 128 -canvastexture DEMOT1ST 256 256 diff --git a/gldefs.demolitionist b/gldefs.demolitionist index 30052d37c..51e4b4f31 100644 --- a/gldefs.demolitionist +++ b/gldefs.demolitionist @@ -118,12 +118,3 @@ Brightmap Texture "models/DemoTagsYellow.png" { Map "models/DemoTags_bright.png" } -HardwareShader Texture "models/DemoTags1st.png" -{ - Shader "shaders/glsl/DemoTags1st.fp" - Texture scrtex "DEMOT1ST" -} -Brightmap Texture "models/DemoTags1st.png" -{ - Map "models/DemoTags_bright.png" -} diff --git a/language.version b/language.version index 77577b40c..adf42b0fd 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r222 \cu(Tue 26 Jul 22:06:46 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r222 \cu(2022-07-26 22:06:46)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r222 \cu(Wed 27 Jul 13:17:18 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r222 \cu(2022-07-27 13:17:18)\c-"; diff --git a/modeldef.candygun b/modeldef.candygun index 11c300b12..7ccd2ed66 100644 --- a/modeldef.candygun +++ b/modeldef.candygun @@ -163,7 +163,7 @@ Model "CandyGun" Path "models" Model 1 "ExplodiumGun1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "CandyGun.png" diff --git a/modeldef.deepimpact b/modeldef.deepimpact index 8d4b817fd..1449d87e0 100644 --- a/modeldef.deepimpact +++ b/modeldef.deepimpact @@ -17,7 +17,7 @@ Model "DeepImpact" Path "models" Model 1 "DeepImpact1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "DeepImpact.png" diff --git a/modeldef.eviscerator b/modeldef.eviscerator index 12c8e7cc1..ed70a6c4d 100644 --- a/modeldef.eviscerator +++ b/modeldef.eviscerator @@ -163,7 +163,7 @@ Model "Eviscerator" Path "models" Model 1 "Eviscerator1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Eviscerator.png" diff --git a/modeldef.explodiumgun b/modeldef.explodiumgun index 4d45af1df..0f64830a9 100644 --- a/modeldef.explodiumgun +++ b/modeldef.explodiumgun @@ -135,7 +135,7 @@ Model "ExplodiumGun" Path "models" Model 1 "ExplodiumGun1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "ExplodiumGun.png" diff --git a/modeldef.explodiumgun2 b/modeldef.explodiumgun2 index 993ddca42..90c91caea 100644 --- a/modeldef.explodiumgun2 +++ b/modeldef.explodiumgun2 @@ -97,7 +97,7 @@ Model "DualExplodiumGun" Path "models" Model 3 "ExplodiumGun1stL_d.3d" - SurfaceSkin 3 0 "DemoTags1st.png" + SurfaceSkin 3 0 "DemoTags.png" SurfaceSkin 3 1 "DemoArms.png" SurfaceSkin 3 2 "DemoSoft.png" SurfaceSkin 3 3 "ExplodiumGun.png" @@ -316,7 +316,7 @@ Model "DualExplodiumGun" Path "models" Model 1 "ExplodiumGun1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "ExplodiumGun.png" diff --git a/modeldef.gesture b/modeldef.gesture index 6cfcc4a78..6a9d8269a 100644 --- a/modeldef.gesture +++ b/modeldef.gesture @@ -2,7 +2,7 @@ Model "SWWMGesture" { Path "models" Model 0 "GestureArms_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" AngleOffset -90 @@ -113,7 +113,7 @@ Model "SWWMGesture" { Path "models" Model 0 "Grenade1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "ExplodiumGun.png" @@ -165,7 +165,7 @@ Model "SWWMGesture" { Path "models" Model 0 "QuickPunch1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" diff --git a/modeldef.hellblazer b/modeldef.hellblazer index 757f55c65..a3e2535fb 100644 --- a/modeldef.hellblazer +++ b/modeldef.hellblazer @@ -390,7 +390,7 @@ Model "Hellblazer" Path "models" Model 1 "Hellblazer1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Hellblazer.png" diff --git a/modeldef.itemgesture b/modeldef.itemgesture index 35a08b340..bb00fc12d 100644 --- a/modeldef.itemgesture +++ b/modeldef.itemgesture @@ -2,7 +2,7 @@ Model "GenericCubeGesture" { Path "models" Model 0 "GenericCube1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "PerfectlyGeneric.png" @@ -37,7 +37,7 @@ Model "AkariProjectGesture" { Path "models" Model 0 "AkariProject1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "AkariProject.png" @@ -72,7 +72,7 @@ Model "LoveSignalsCDGesture" { Path "models" Model 0 "LoveSignalsCD1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "LoveSignals.png" @@ -107,7 +107,7 @@ Model "NutatcoBarGesture" { Path "models" Model 0 "NutatcoBar1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "Nutatco.png" @@ -142,7 +142,7 @@ Model "FrispyCornGesture" { Path "models" Model 0 "FrispyCorn1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "FrispyCorn.png" @@ -177,7 +177,7 @@ Model "SayaBeanGesture" { Path "models" Model 0 "SayaBean1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "SayaBean.png" @@ -216,7 +216,7 @@ Model "MothPlushyGesture" { Path "models" Model 0 "MothPlush1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "MothPlush.png" @@ -261,7 +261,7 @@ Model "DemoPlushGesture" { Path "models" Model 0 "DemoPlush1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DemoPlush.png" @@ -301,7 +301,7 @@ Model "KirinCummiesGesture" { Path "models" Model 0 "TootFroot1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "TootFroot.png" @@ -337,7 +337,7 @@ Model "MilkBreadsGesture" { Path "models" Model 0 "MilkBreads1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "MilkBreads.png" @@ -372,7 +372,7 @@ Model "KirinMangaGesture" { Path "models" Model 0 "AkariProject1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "KirinManga.png" @@ -407,7 +407,7 @@ Model "KirinPlushGesture" { Path "models" Model 0 "KirinPlush1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "KirinPlush.png" diff --git a/modeldef.keygesture b/modeldef.keygesture index 6db17949b..2580bf8e9 100644 --- a/modeldef.keygesture +++ b/modeldef.keygesture @@ -2,7 +2,7 @@ Model "SWWMRedCardGesture" { Path "models" Model 0 "DoomCard1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomRedKey.png" @@ -97,7 +97,7 @@ Model "SWWMRedCardGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -124,7 +124,7 @@ Model "SWWMYellowCardGesture" { Path "models" Model 0 "DoomCard1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomYellowKey.png" @@ -219,7 +219,7 @@ Model "SWWMYellowCardGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -246,7 +246,7 @@ Model "SWWMBlueCardGesture" { Path "models" Model 0 "DoomCard1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomBlueKey.png" @@ -341,7 +341,7 @@ Model "SWWMBlueCardGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -368,7 +368,7 @@ Model "SWWMSilverCardGesture" { Path "models" Model 0 "DoomCard1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomSilverKey.png" @@ -463,7 +463,7 @@ Model "SWWMSilverCardGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -490,7 +490,7 @@ Model "SWWMGreenCardGesture" { Path "models" Model 0 "DoomCard1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomGreenKey.png" @@ -585,7 +585,7 @@ Model "SWWMGreenCardGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -612,7 +612,7 @@ Model "SWWMOrangeCardGesture" { Path "models" Model 0 "DoomCard1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomOrangeKey.png" @@ -707,7 +707,7 @@ Model "SWWMOrangeCardGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -734,7 +734,7 @@ Model "SWWMRedSkullGesture" { Path "models" Model 0 "DoomSkull1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomRedSkull.png" @@ -828,7 +828,7 @@ Model "SWWMRedSkullGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -855,7 +855,7 @@ Model "SWWMYellowSkullGesture" { Path "models" Model 0 "DoomSkull1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomYellowSkull.png" @@ -949,7 +949,7 @@ Model "SWWMYellowSkullGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -976,7 +976,7 @@ Model "SWWMBlueSkullGesture" { Path "models" Model 0 "DoomSkull1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomBlueSkull.png" @@ -1070,7 +1070,7 @@ Model "SWWMBlueSkullGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -1097,7 +1097,7 @@ Model "SWWMPurpleSkullGesture" { Path "models" Model 0 "DoomSkull1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "DoomPurpleSkull.png" @@ -1191,7 +1191,7 @@ Model "SWWMPurpleSkullGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -1218,7 +1218,7 @@ Model "SWWMGreenKeyGesture" { Path "models" Model 0 "HereticGreen1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "envmap/greenenv.png" @@ -1312,7 +1312,7 @@ Model "SWWMGreenKeyGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -1339,7 +1339,7 @@ Model "SWWMBlueKeyGesture" { Path "models" Model 0 "HereticBlue1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "envmap/bluenv.png" @@ -1433,7 +1433,7 @@ Model "SWWMBlueKeyGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -1460,7 +1460,7 @@ Model "SWWMYellowKeyGesture" { Path "models" Model 0 "HereticYellow1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "envmap/goldenv.png" @@ -1554,7 +1554,7 @@ Model "SWWMYellowKeyGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" @@ -1581,7 +1581,7 @@ Model "SWWMRedKeyGesture" { Path "models" Model 0 "HereticRed1st_d.3d" - SurfaceSkin 0 0 "DemoTags1st.png" + SurfaceSkin 0 0 "DemoTags.png" SurfaceSkin 0 1 "DemoArms.png" SurfaceSkin 0 2 "DemoSoft.png" SurfaceSkin 0 3 "envmap/redenv.png" @@ -1675,7 +1675,7 @@ Model "SWWMRedKeyGesture" { Path "models" Model 1 "QuickPunch1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg index 9bfa1c3fc..39b205ba8 100644 --- a/modeldef.sheenhmg +++ b/modeldef.sheenhmg @@ -136,7 +136,7 @@ Model "HeavyMahSheenGun" Path "models" Model 1 "SheenHMG1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "SheenHMG.png" diff --git a/modeldef.silverbullet b/modeldef.silverbullet index 3dcd8b9d7..f715477d0 100644 --- a/modeldef.silverbullet +++ b/modeldef.silverbullet @@ -181,7 +181,7 @@ Model "SilverBullet" Path "models" Model 1 "Silverbullet1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Silverbullet.png" diff --git a/modeldef.sparkster b/modeldef.sparkster index 62428a302..07afb60e2 100644 --- a/modeldef.sparkster +++ b/modeldef.sparkster @@ -259,7 +259,7 @@ Model "Sparkster" Path "models" Model 1 "Sparkster1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Sparkster.png" diff --git a/modeldef.spreadgun b/modeldef.spreadgun index 00c2a1bc3..3a02eed7e 100644 --- a/modeldef.spreadgun +++ b/modeldef.spreadgun @@ -220,7 +220,7 @@ Model "Spreadgun" Path "models" Model 1 "Spreadgun1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Spreadgun.png" diff --git a/modeldef.wallbuster b/modeldef.wallbuster index 1435a26ad..933805365 100644 --- a/modeldef.wallbuster +++ b/modeldef.wallbuster @@ -474,7 +474,7 @@ Model "Wallbuster" Path "models" Model 1 "Wallbuster1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Wallbuster.png" diff --git a/modeldef.ynykron b/modeldef.ynykron index a06621412..3e7665704 100644 --- a/modeldef.ynykron +++ b/modeldef.ynykron @@ -371,7 +371,7 @@ Model "Ynykron" Path "models" Model 1 "Ynykron1st_d.3d" - SurfaceSkin 1 0 "DemoTags1st.png" + SurfaceSkin 1 0 "DemoTags.png" SurfaceSkin 1 1 "DemoArms.png" SurfaceSkin 1 2 "DemoSoft.png" SurfaceSkin 1 3 "Ynykron.png" diff --git a/models/DemoTags1st.png b/models/DemoTags1st.png deleted file mode 100644 index bd223d3b3d2d166118fe5c617a11c0872c661d9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7881 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 sOx)-+ao(AKAzopr0I>hXo&W#< diff --git a/sprites/LGFDA0.png b/sprites/LGFDA0.png deleted file mode 100644 index a6f29931f4703334baeced15bd8755b53e05d9f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9oMrH;Eh6&3b&t+g>;7BiWOk#k7raif73=9m+ z0X`wF|NsAAenk2N0|Nt}r;B5Vgk-V=>*59`1_mYv2F4FFn&yD?c)I$ztaD0e0sxpd B84>^h diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc index ce2b874b6..ed6889b3c 100644 --- a/zscript/items/swwm_funstuff.zsc +++ b/zscript/items/swwm_funstuff.zsc @@ -176,16 +176,16 @@ Class SWWMFlag : Actor switch ( seq ) { case 0: - A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag.png"); + A_ChangeModel("",0,"","",0,"models","SWWMFlag.png"); break; case 1: - A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Pride.png"); + A_ChangeModel("",0,"","",0,"models","SWWMFlag_Pride.png"); break; case 2: - A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Trans.png"); + A_ChangeModel("",0,"","",0,"models","SWWMFlag_Trans.png"); break; case 3: - A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Enby.png"); + A_ChangeModel("",0,"","",0,"models","SWWMFlag_Enby.png"); break; } A_StartSound("bestsound",CHAN_BODY,CHANF_OVERLAP); diff --git a/zscript/menu/swwm_title.zsc b/zscript/menu/swwm_title.zsc index 8a56b2863..18bb9f315 100644 --- a/zscript/menu/swwm_title.zsc +++ b/zscript/menu/swwm_title.zsc @@ -15,7 +15,7 @@ Class SWWMTitleStuff : EventHandler ui bool bInitialized; ui TextureID tex[6]; ui TextureID letters[13]; - ui TextureID camtex; // must be drawn for shaders to actually use it + ui Canvas lfade; ui BrokenLines stitle; ui Array scrolls; ui int sline; @@ -24,7 +24,6 @@ Class SWWMTitleStuff : EventHandler ui TitleExplosion smk[64]; ui TextureID smk_frame[19]; ui int titletimer; - int playtimer; // required for the logo fader ui int rss; ui int stopinit_t; ui bool bFadeIn; @@ -69,22 +68,6 @@ Class SWWMTitleStuff : EventHandler } } - override void WorldLoaded( WorldEvent e ) - { - let f = LogoFader(Actor.Spawn("LogoFader")); - f.hnd = self; - TexMan.SetCameraToTexture(f,"LOGOFADE",90); - // fallback in case netevents fail (old gzdoom) - playtimer = -65536; - } - - // synchronize ui->play timer - override void NetworkProcess( ConsoleEvent e ) - { - if ( e.Name == "swwmtitle.timer" ) - playtimer = e.Args[0]; - } - override void UiTick() { // you're not supposed to be here @@ -151,8 +134,7 @@ Class SWWMTitleStuff : EventHandler { if ( !mSmallFont ) mSmallFont = Font.GetFont('TewiFont'); if ( !mBigFont ) mBigFont = Font.GetFont('TewiFontOutline'); - if ( !camtex ) camtex = TexMan.CheckForTexture("LOGOFADE",TexMan.Type_Any); - Screen.DrawTexture(camtex,false,0,0); + if ( !lfade ) lfade = TexMan.GetCanvas("LOGOFADE"); if ( !tex[2] ) tex[2] = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any); if ( !tex[5] ) tex[5] = TexMan.CheckForTexture("graphics/DemoIcon.png",TexMan.Type_Any); Vector2 tsize, vsize; @@ -288,6 +270,9 @@ Class SWWMTitleStuff : EventHandler else if ( sar < ar ) vsize = (tsize.y*ar,tsize.y); else vsize = tsize; if ( (titletimer+e.FracTic)/GameTicRate < 22 ) return; + double alf1 = clamp((((titletimer+e.FracTic)/GameTicRate)-26.5)*.5,0.,1.); + double alf2 = ((titletimer+e.FracTic)/GameTicRate>28)?clamp((double(((titletimer+e.FracTic)-GameTicRate*3)%(GameTicRate*5))/GameTicRate),0.,1.):0.; + lfade.Clear(0,0,4,4,Color(int(255*alf1),int(255*alf2),0)); if ( bFadeIn ) Screen.Dim("Black",1.-clamp(((titletimer+e.FracTic)/GameTicRate)-22,0.,1.),0,0,Screen.GetWidth(),Screen.GetHeight()); if ( (titletimer+e.FracTic)/GameTicRate < 27 ) { @@ -361,68 +346,3 @@ Class SWWMTitleStuff : EventHandler } } } - -const LOGOFADERBASE = 60000.; - -Class LogoFader : Actor -{ - Actor base; - SWWMTitleStuff hnd; - - Default - { - +NOGRAVITY; - +NOBLOCKMAP; - +NOINTERACTION; - +DONTSPLASH; - Radius .1; - Height 0; - } - - override void PostBeginPlay() - { - SetOrigin((LOGOFADERBASE+32,LOGOFADERBASE,0),false); - SetZ(floorz); - roll = 180; - angle = 180; - double halfstretch = (1.+level.pixelstretch)/2.; - if ( !base ) base = Spawn("LogoFaderSurface",(LOGOFADERBASE,LOGOFADERBASE-32.,floorz+32.*halfstretch)); - } - override void Tick() - { - // old gzdoom fallback - // won't look as nice, but it's better than nothing - if ( hnd.playtimer == -65536 ) - { - double alf = clamp(double((gametic-GameTicRate*3)%(GameTicRate*5))/GameTicRate,0.,1.); - base.SetShade(Color(255,int(255*alf),0)); - return; - } - double alf1 = clamp(((double(hnd.playtimer)/GameTicRate)-26.5)*.5,0.,1.); - double alf2 = (hnd.playtimer>28*GameTicRate)?clamp((double((hnd.playtimer-GameTicRate*3)%(GameTicRate*5))/GameTicRate),0.,1.):0.; - base.SetShade(Color(int(255*alf1),int(255*alf2),0)); - } -} - -Class LogoFaderSurface : Actor -{ - Default - { - Radius .1; - Height 0.; - RenderRadius 256; - +NOBLOCKMAP; - +NOGRAVITY; - +NOINTERACTION; - +DONTSPLASH; - +WALLSPRITE; - RenderStyle "Stencil"; - } - override void Tick(){} - States - { - Spawn: - LGFD A -1 Bright; - Stop; - } -} diff --git a/zscript/swwm_gesture.zsc b/zscript/swwm_gesture.zsc index f2c30da62..9b1215bed 100644 --- a/zscript/swwm_gesture.zsc +++ b/zscript/swwm_gesture.zsc @@ -391,6 +391,12 @@ Class SWWMGesture : SWWMWeapon if ( closest != -1 ) p.tracer = hits[closest].a; } + override void SetTags( String colname ) + { + // gestures use model 0 + A_ChangeModel("",0,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1); + } + Default { +WEAPON.CHEATNOTWEAPON; @@ -734,6 +740,12 @@ Class SWWMItemGesture : SWWMWeapon abstract invoker.gotused = true; } + override void SetTags( String colname ) + { + // gestures use model 0 + A_ChangeModel("",0,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1); + } + Default { +WEAPON.CHEATNOTWEAPON; diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 0f017f334..8aa1f0c60 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -181,8 +181,13 @@ Class Demolitionist : PlayerPawn int idx = tagcolor.GetInt(); if ( (idx < 0) || (idx >= colname.Size()) ) idx = 0; if ( idx != oldtagcolor ) - A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",0,"models","DemoTags"..colname[idx]..".png",CMDL_USESURFACESKIN,-1); + A_ChangeModel("",0,"","",0,"models","DemoTags"..colname[idx]..".png",CMDL_USESURFACESKIN,-1); oldtagcolor = idx; + for ( Inventory i=inv; i; i=i.inv ) + { + if ( !(i is 'SWWMWeapon') ) continue; + SWWMWeapon(i).UpdateTags(idx,colname[idx]); + } } private void UpdateFace() @@ -276,7 +281,7 @@ Class Demolitionist : PlayerPawn }; int faceidx = GetFaceTex(); if ( !oldfaceidx || (faceidx != oldfaceidx) ) - A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",1,"models","DemoFace_"..facetex[faceidx]..".png",CMDL_USESURFACESKIN,-1); + A_ChangeModel("",0,"","",1,"models","DemoFace_"..facetex[faceidx]..".png",CMDL_USESURFACESKIN,-1); oldfaceidx = faceidx; } private int GetFaceTex() diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc index 61c840488..917c67fc1 100644 --- a/zscript/swwm_statichandler.zsc +++ b/zscript/swwm_statichandler.zsc @@ -31,9 +31,6 @@ Class SWWMStaticHandler : StaticEventHandler // stupid dumb thing ui int aprcheck; ui Font aprfnt; - // hack stuff - Canvas tagcv; - TextureID tagtex[13]; override void NewGame() { @@ -71,34 +68,6 @@ Class SWWMStaticHandler : StaticEventHandler for ( int i=0; i