From 4d5a1cb09ada4ecf5386ea6258ba9d56d4d0c7f2 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 26 Jun 2023 08:57:24 +0300 Subject: [PATCH] sliptide sprite rotation --- src/d_player.h | 5 +++++ src/doomdef.h | 5 +++-- src/hardware/hw_main.c | 12 ++++++++++-- src/hardware/hw_md2.c | 20 ++++++++++++++++++-- src/k_kart.c | 20 ++++++++++++++++++++ src/r_things.c | 18 ++++++++++++++++-- 6 files changed, 72 insertions(+), 8 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index bf2ed58f8..d7bfb80eb 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -392,6 +392,11 @@ typedef struct player_s INT32 kartstuff[NUMKARTSTUFF]; angle_t frameangle; // for the player add the ability to have the sprite only face other angles angle_t old_frameangle, old_frameangle2; + + // SRB2Kart CEP: Sliptide rolling + INT32 sliptidemem; + angle_t sliproll; + INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)? INT16 rturn_max[MAXPREDICTTICS]; // Ditto but for full-right diff --git a/src/doomdef.h b/src/doomdef.h index 87852e3c2..431e0e38b 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -1,4 +1,5 @@ // SONIC ROBO BLAST 2 +// SONIC ROBO BLAST 2 //----------------------------------------------------------------------------- // Copyright (C) 1993-1996 by id Software, Inc. // Copyright (C) 1998-2000 by DooM Legacy Team. @@ -149,8 +150,8 @@ extern char logfilename[1024]; #else #define VERSION 1 // Game version #define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "Galaxy(v1.2) Alugs Spoon v3.1 " -#define VERSIONSTRINGW L"Galaxy(v1.2) Alugs Spoon v3.1" +#define VERSIONSTRING "Galaxy(v1.2) Alugs Spoon v4/dev" +#define VERSIONSTRINGW L"Galaxy(v1.2) Alugs Spoon v4/dev" // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt (not src/, but in root), for CMake users! // AND appveyor.yml, for the build bots! diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 97d751bb6..7227fa233 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4918,6 +4918,7 @@ void HWR_ProjectSprite(mobj_t *thing) patch_t *rotsprite = NULL; INT32 rollangle = 0; angle_t rollsum = 0; + angle_t sliptiderollangle = 0; #endif @@ -5052,9 +5053,16 @@ void HWR_ProjectSprite(mobj_t *thing) spr_topoffset = spritecachedinfo[lumpoff].topoffset; #ifdef ROTSPRITE - if ((thing->rollangle)||(thing->sloperoll)) + if ((thing->rollangle)||(thing->sloperoll)||(thing->player && thing->player->sliproll)) { - rollsum = (thing->rollangle)+(thing->sloperoll); + if (thing->player) + { + sliptiderollangle = thing->player->sliproll*(thing->player->sliptidemem); + rollsum = (thing->rollangle)+(thing->sloperoll)+FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle); + } + else + rollsum = (thing->rollangle)+(thing->sloperoll); + rollangle = R_GetRollAngle(rollsum); rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, sprinfo, rollangle); diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 0f1f0a26f..81d47da7b 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -39,6 +39,7 @@ #include "../r_draw.h" #include "../p_tick.h" #include "../k_kart.h" // colortranslations +#include "../g_game.h" // cv_sloperoll #include "hw_model.h" #include "hw_main.h" @@ -1141,6 +1142,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr) spritedef_t *sprdef; spriteframe_t *sprframe; spriteinfo_t *sprinfo; + INT32 rollfactor = 0; angle_t ang; float finalscale; interpmobjstate_t interp; @@ -1330,9 +1332,23 @@ void HWR_DrawMD2(gr_vissprite_t *spr) p.spritexscale = FIXED_TO_FLOAT(spr->mobj->spritexscale); p.spriteyscale = FIXED_TO_FLOAT(spr->mobj->spriteyscale); - if (spr->mobj->rollangle) + + angle_t sliptideroll = 0; + + if (spr->mobj->player) + sliptideroll = ((cv_sloperoll.value) ? spr->mobj->player->sliproll : 0); + + if ((spr->mobj->rollangle)||sliptideroll) { - fixed_t anglef = AngleFixed(spr->mobj->rollangle); + angle_t rollang = 0; + rollfactor = ((spr->mobj->rollmodel == true) ? 1 : 0); + + if (spr->mobj->player) + rollang = (spr->mobj->rollangle*rollfactor) + (sliptideroll*spr->mobj->player->sliptidemem); + else + rollang = (spr->mobj->rollangle*rollfactor); + + fixed_t anglef = AngleFixed(rollang); p.rollangle = FIXED_TO_FLOAT(anglef); p.rollmodel = (spr->mobj->rollmodel); p.roll = true; diff --git a/src/k_kart.c b/src/k_kart.c index 10fa079c0..7fbd34acb 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5426,6 +5426,13 @@ static void K_KartDrift(player_t *player, boolean onground) { player->kartstuff[k_drift] = player->kartstuff[k_driftcharge] = 0; player->kartstuff[k_aizdriftstrat] = player->kartstuff[k_brakedrift] = 0; + + if (!player->sliproll) + { + player->sliptidemem = 0; + player->sliproll = 0; + } + player->kartstuff[k_getsparks] = 0; } @@ -5440,7 +5447,14 @@ static void K_KartDrift(player_t *player, boolean onground) player->kartstuff[k_aizdriftstrat] = ((player->kartstuff[k_drift] > 0) ? 1 : -1); } else if (player->kartstuff[k_aizdriftstrat] && !player->kartstuff[k_drift]) + { K_SpawnAIZDust(player); + + if (player->sliproll < (32*ANG1)) + player->sliproll += (4*ANG1); + + player->sliptidemem = player->kartstuff[k_aizdriftstrat]; + } if (player->kartstuff[k_drift] && ((player->cmd.buttons & BT_BRAKE) @@ -6207,6 +6221,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground) K_KartDrift(player, onground); + if ((!player->kartstuff[k_aizdriftstrat])||(!P_IsObjectOnGround(player->mo))||(player->kartstuff[k_drift])) + { + if (player->sliproll && (player->sliproll > 0)) + player->sliproll -= (4*ANG1); + } + if (cv_gravstretch.value > 13107) K_StretchPlayerGravity(player); else diff --git a/src/r_things.c b/src/r_things.c index 360e135f8..542038733 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1218,6 +1218,7 @@ static void R_ProjectSprite(mobj_t *thing) patch_t *rotsprite = NULL; INT32 rollangle = 0; angle_t rollsum = 0; + angle_t sliptiderollangle = 0; #endif fixed_t ang_scale = FRACUNIT; @@ -1356,9 +1357,22 @@ static void R_ProjectSprite(mobj_t *thing) spr_topoffset = spritecachedinfo[lump].topoffset; #ifdef ROTSPRITE - if ((thing->rollangle)||(thing->sloperoll)) + + if (thing->player) { - rollsum = (thing->rollangle)+(thing->sloperoll); + sliptiderollangle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), ((cv_sloperoll.value == 1) ? thing->player->sliproll*(thing->player->sliptidemem) : 0)); + } + else + sliptiderollangle = 0; + + if ((thing->rollangle)||(thing->sloperoll)||sliptiderollangle) + { + + if (thing->player) + rollsum = (thing->rollangle) + (thing->sloperoll) + sliptiderollangle; + else + rollsum = (thing->rollangle) + (thing->sloperoll); + rollangle = R_GetRollAngle(rollsum); rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, sprinfo, rollangle);