From 5ec64e50ef22e86ad76d57f7bf87f1b0b72fe666 Mon Sep 17 00:00:00 2001 From: Chearii Date: Mon, 1 Jan 2024 13:26:17 -0500 Subject: [PATCH] Lots of pitch and roll stuff ``pitch``, ``roll``, slope versions, interpolation, and ``P_RollPitchMobj`` --- src/lua_baselib.c | 13 ++++++ src/lua_mobjlib.c | 7 +++- src/p_mobj.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ src/p_mobj.h | 26 ++++++++---- src/p_saveg.c | 10 ++++- src/p_user.c | 8 ++++ src/r_fps.c | 29 ++++++++++++++ src/r_fps.h | 2 + 8 files changed, 184 insertions(+), 11 deletions(-) diff --git a/src/lua_baselib.c b/src/lua_baselib.c index 5fd813dc5..9e42e7e9f 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -538,6 +538,18 @@ static int lib_pFlashPal(lua_State *L) return 0; } + +// not sure if this is netsafe... +static int lib_pRollPitchMobj(lua_State *L) +{ + mobj_t *source = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); + NOHUD + if (!source) + return LUA_ErrInvalid(L, "mobj_t"); + P_RollPitchMobj(source); + return 0; +} + static int lib_pGetClosestAxis(lua_State *L) { mobj_t *source = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ)); @@ -3033,6 +3045,7 @@ static luaL_Reg lib[] = { {"P_GetMobjGravity",lib_pGetMobjGravity}, {"P_WeaponOrPanel",lib_pWeaponOrPanel}, {"P_FlashPal",lib_pFlashPal}, + {"P_RollPitchMobj",lib_pRollPitchMobj}, {"P_GetClosestAxis",lib_pGetClosestAxis}, {"P_SpawnParaloop",lib_pSpawnParaloop}, {"P_BossTargetPlayer",lib_pBossTargetPlayer}, diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c index 52eda4554..6a5536c1c 100644 --- a/src/lua_mobjlib.c +++ b/src/lua_mobjlib.c @@ -83,8 +83,11 @@ static const udata_field_t mobj_fields[] = { FIELD(mobj_t, snext, udatalib_getter_mobj, mobj_snext_noset), FIELD(mobj_t, sprev, mobj_sprev_unimplemented, mobj_sprev_unimplemented), FIELD(mobj_t, angle, udatalib_getter_angle, mobj_angle_setter), + FIELD(mobj_t, pitch, udatalib_getter_angle, udatalib_setter_angle), + FIELD(mobj_t, roll, udatalib_getter_angle, udatalib_setter_angle), FIELD(mobj_t, rollangle, udatalib_getter_angle, udatalib_setter_angle), FIELD(mobj_t, sloperoll, udatalib_getter_angle, mobj_sloperoll_noop), + FIELD(mobj_t, slopepitch, udatalib_getter_angle, mobj_sloperoll_noop), // Macro fails here { "rollsum", 0, mobj_rollsum_getter, mobj_rollsum_noset }, FIELD(mobj_t, sprite, udatalib_getter_spritenum, udatalib_setter_spritenum), @@ -624,7 +627,9 @@ int mobj_rollsum_getter(lua_State *L) { mobj_t *mo = GETMO(); - angle_t rollsum = mo->rollangle + cv_sloperoll.value ? mo->sloperoll : 0; + angle_t pitchnroll = P_MobjPitchAndRoll(mo); + + angle_t rollsum = mo->rollangle + pitchnroll; if (mo->player) { diff --git a/src/p_mobj.c b/src/p_mobj.c index c52bb05be..66f7d5c9b 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6251,6 +6251,84 @@ static void P_KoopaThinker(mobj_t *koopa) } } +// +// P_RollPitchMobj +// Assigns slopepitch and sloperoll to objects, and resets said values when slope-rolling +// is turned off completely. +// +void P_RollPitchMobj(mobj_t* mobj) +{ + boolean usedist = false; + + if (cv_sloperolldist.value > 0) + usedist = true; + + if (cv_sloperoll.value == 1) + { + K_RollMobjBySlopes(mobj, usedist, false); + } + else + { + mobj->sloperoll = FixedAngle(0); + mobj->slopepitch = FixedAngle(0); + } +} + +angle_t P_MobjPitchAndRoll(mobj_t *mobj) +{ + spritedef_t *sprdef; + spriteframe_t *sprframe; + angle_t ang = 0; + angle_t camang = 0; + angle_t return_angle = 0; + + if (P_MobjWasRemoved(mobj)) + return 0; + + size_t rot = mobj->frame & FF_FRAMEMASK; + boolean papersprite = (mobj->frame & FF_PAPERSPRITE); + + if (mobj->skin && mobj->sprite == SPR_PLAY) + { + sprdef = &((skin_t *)mobj->skin)->spritedef; + + if (rot >= sprdef->numframes) + sprdef = &sprites[mobj->sprite]; + } + else + { + sprdef = &sprites[mobj->sprite]; + } + + if (rot >= sprdef->numframes) + { + sprdef = &sprites[states[S_UNKNOWN].sprite]; + rot = states[S_UNKNOWN].frame&FF_FRAMEMASK; + } + + sprframe = &sprdef->spriteframes[rot]; + + // No sprite frame? I guess it is possible + if (!sprframe) return 0; + + if (sprframe->rotate != SRF_SINGLE || papersprite) + { + ang = R_PointToAngle(mobj->x, mobj->y) - mobj->angle; + camang = R_PointToAngle(mobj->x, mobj->y); + } + + return_angle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mobj->roll) + + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), mobj->pitch); + + if (cv_sloperoll.value) + { + return_angle += FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), mobj->sloperoll) + + FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), mobj->slopepitch); + } + + return return_angle; +} + // // P_MobjThinker // @@ -6393,6 +6471,12 @@ void P_MobjThinker(mobj_t *mobj) return; } + if (mobj->state == &states[S_PLAY_SIGN]) // hack to make the player sign icon roll with the sign itself + { + mobj->slopepitch = mobj->target->slopepitch; + mobj->sloperoll = mobj->target->sloperoll; + } + P_AddOverlay(mobj); break; case MT_SHADOW: @@ -6428,6 +6512,7 @@ void P_MobjThinker(mobj_t *mobj) P_RemoveMobj(mobj); return; } + P_RollPitchMobj(mobj); break; case MT_SMOLDERING: if (leveltime % 2 == 0) @@ -7856,6 +7941,7 @@ void P_MobjThinker(mobj_t *mobj) fixed_t distbarrier = 512*mapobjectscale; fixed_t distaway; + P_RollPitchMobj(mobj); P_SpawnGhostMobj(mobj); if (mobj->threshold > 0) @@ -7923,6 +8009,7 @@ void P_MobjThinker(mobj_t *mobj) } else { + P_RollPitchMobj(mobj); P_SpawnGhostMobj(mobj); mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy); P_InstaThrust(mobj, mobj->angle, mobj->movefactor); @@ -7956,6 +8043,9 @@ void P_MobjThinker(mobj_t *mobj) mobj->momx = mobj->momy = 0; mobj->health = 1; } + + P_RollPitchMobj(mobj); + if (mobj->threshold > 0) mobj->threshold--; break; @@ -8003,6 +8093,8 @@ void P_MobjThinker(mobj_t *mobj) || (mobj->state >= &states[S_SSMINE_DEPLOY8] && mobj->state <= &states[S_SSMINE_DEPLOY13])) A_GrenadeRing(mobj); + P_RollPitchMobj(mobj); + if (mobj->threshold > 0) mobj->threshold--; break; @@ -8355,6 +8447,10 @@ void P_MobjThinker(mobj_t *mobj) } } } + + // fancy sign rotation + P_RollPitchMobj(mobj); + break; case MT_CDUFO: if (!mobj->spawnpoint || mobj->fuse) @@ -9535,6 +9631,10 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) mobj->height = info->height; mobj->flags = info->flags; mobj->sloperoll = 0; + mobj->slopepitch = 0; + + mobj->pitch_sprite = 0; + mobj->roll_sprite = 0; mobj->health = info->spawnhealth; diff --git a/src/p_mobj.h b/src/p_mobj.h index d53d7e3f0..5d26f9b44 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -283,9 +283,9 @@ typedef struct mobj_s struct mobj_s **sprev; // killough 8/11/98: change to ptr-to-ptr // More drawing info: to determine current sprite. - angle_t angle; // orientation - angle_t old_angle; // orientation interpolation - angle_t old_angle2; + angle_t angle, pitch, roll; // orientation + angle_t old_angle, old_pitch, old_roll; // orientation interpolation + angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -302,7 +302,10 @@ typedef struct mobj_s fixed_t stretchslam; // "squish" effect when you land //sloperollangle - angle_t sloperoll, reservezangle, reservexydir; + angle_t sloperoll, slopepitch; + angle_t old_sloperoll, old_slopepitch; + angle_t old_sloperoll2, old_slopepitch2; + angle_t pitch_sprite, roll_sprite; struct msecnode_s *touching_sectorlist; // a linked list of sectors where this object appears @@ -433,9 +436,9 @@ typedef struct precipmobj_s struct precipmobj_s **sprev; // killough 8/11/98: change to ptr-to-ptr // More drawing info: to determine current sprite. - angle_t angle; // orientation - angle_t old_angle; // orientation interpolation - angle_t old_angle2; + angle_t angle, pitch, roll; // orientation + angle_t old_angle, old_pitch, old_roll; // orientation interpolation + angle_t old_angle2, old_pitch2, old_roll2; angle_t rollangle; spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h @@ -452,7 +455,10 @@ typedef struct precipmobj_s fixed_t stretchslam; // "squish" effect when you land //sloperollangle - angle_t sloperoll, reservezangle, reservexydir; + angle_t sloperoll, slopepitch; + angle_t old_sloperoll, old_slopepitch; + angle_t old_sloperoll2, old_slopepitch2; + angle_t pitch_sprite, roll_sprite; struct mprecipsecnode_s *touching_sectorlist; // a linked list of sectors where this object appears @@ -494,6 +500,10 @@ void P_AddCachedAction(mobj_t *mobj, INT32 statenum); // check mobj against water content, before movement code void P_MobjCheckWater(mobj_t *mobj); +// fancy sprite rotation +void P_RollPitchMobj(mobj_t *mobj); +angle_t P_MobjPitchAndRoll(mobj_t *mobj); + // Player spawn points void P_SpawnPlayer(INT32 playernum); void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing); diff --git a/src/p_saveg.c b/src/p_saveg.c index d4e9b2f5e..3ac86eae6 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1976,9 +1976,15 @@ static void LoadMobjThinker(actionf_p1 thinker) mobj->thinker.function.acp1 = thinker; mobj->rollangle = 0; + + mobj->pitch = 0; + mobj->roll = 0; + mobj->sloperoll = 0; - mobj->reservexydir = 0; - mobj->reservezangle = 0; + mobj->slopepitch = 0; + + mobj->pitch_sprite = 0; + mobj->roll_sprite = 0; mobj->spritexoffset = mobj->old_spritexoffset = 0; mobj->spriteyoffset = mobj->old_spriteyoffset = 0; diff --git a/src/p_user.c b/src/p_user.c index fab59d28b..e759aba4d 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1697,11 +1697,15 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) else ghost->angle = mobj->angle; + ghost->pitch = mobj->pitch; + ghost->roll = mobj->roll; + ghost->sprite = mobj->sprite; ghost->frame = mobj->frame; ghost->tics = -1; ghost->frame &= ~FF_TRANSMASK; ghost->frame |= tr_trans50<slopepitch = mobj->slopepitch; ghost->sloperoll = mobj->sloperoll; ghost->fuse = ghost->info->damage; @@ -1724,6 +1728,10 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->old_y = mobj->old_y2; ghost->old_z = mobj->old_z2; ghost->old_angle = (mobj->player ? mobj->player->old_frameangle2 : mobj->old_angle2); + ghost->old_pitch = mobj->old_pitch2; + ghost->old_roll = mobj->old_roll2; + ghost->old_sloperoll = mobj->old_sloperoll2; + ghost->old_slopepitch = mobj->old_slopepitch2; return ghost; } diff --git a/src/r_fps.c b/src/r_fps.c index 8aca51646..2ef5a68ba 100644 --- a/src/r_fps.c +++ b/src/r_fps.c @@ -282,6 +282,10 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) out->scale = mobj->scale; out->subsector = mobj->subsector; out->angle = mobj->player ? mobj->player->frameangle : mobj->angle; + out->pitch = mobj->pitch; + out->roll = mobj->roll; + out->slopepitch = mobj->slopepitch; + out->sloperoll = mobj->sloperoll; out->spritexscale = mobj->spritexscale; out->spriteyscale = mobj->spriteyscale; out->spritexoffset = mobj->spritexoffset; @@ -313,6 +317,14 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out) { out->angle = mobj->resetinterp ? mobj->angle : R_LerpAngle(mobj->old_angle, mobj->angle, frac); } + + // pitch roll stuff + out->pitch = mobj->resetinterp ? mobj->pitch : R_LerpAngle(mobj->old_pitch, mobj->pitch, frac); + out->roll = mobj->resetinterp ? mobj->roll : R_LerpAngle(mobj->old_roll, mobj->roll, frac); + + // and the slope stuff + out->slopepitch = mobj->resetinterp ? mobj->slopepitch : R_LerpAngle(mobj->old_slopepitch, mobj->slopepitch, frac); + out->sloperoll = mobj->resetinterp ? mobj->sloperoll : R_LerpAngle(mobj->old_sloperoll, mobj->sloperoll, frac); } void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjstate_t *out) @@ -755,10 +767,27 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) mobj->old_z2 = mobj->old_z; mobj->old_angle2 = mobj->old_angle; mobj->old_scale2 = mobj->old_scale; + + // rotation humor + mobj->old_pitch2 = mobj->old_pitch; + mobj->old_roll2 = mobj->old_roll; + mobj->old_slopepitch2 = mobj->old_slopepitch; + mobj->old_sloperoll2 = mobj->old_sloperoll; + mobj->old_x = mobj->x; mobj->old_y = mobj->y; mobj->old_z = mobj->z; mobj->old_angle = mobj->angle; + + // rotation humor, again + + // pitch and roll first + mobj->old_pitch = mobj->pitch; + mobj->old_roll = mobj->roll; + + mobj->old_slopepitch = mobj->slopepitch; + mobj->old_sloperoll = mobj->sloperoll; + mobj->old_scale = mobj->scale; mobj->old_spritexscale = mobj->spritexscale; mobj->old_spriteyscale = mobj->spriteyscale; diff --git a/src/r_fps.h b/src/r_fps.h index 520843fd2..deb0c8788 100644 --- a/src/r_fps.h +++ b/src/r_fps.h @@ -65,6 +65,8 @@ typedef struct { fixed_t spriteyscale; fixed_t spritexoffset; fixed_t spriteyoffset; + angle_t pitch, roll; + angle_t sloperoll, slopepitch; } interpmobjstate_t; // Level interpolators