Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-02 17:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move collision and test functions out of lara_surface.cpp

Browse source
This commit is contained in:
Sezz 2021-11-09 23:26:31 +11:00
parent 4a0b5c3961
commit e8cfc688fd
5 changed files with 260 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

40
TR5Main/Game/Lara/lara_collide.cpp
View file

@ -311,3 +311,43 @@ void GetLaraDeadlyBounds()
DeadlyBounds[4] = LaraItem->pos.zPos + tbounds.Z1;
DeadlyBounds[5] = LaraItem->pos.zPos + tbounds.Z2;
}
void LaraSurfaceCollision(ITEM_INFO* item, COLL_INFO* coll)
{
coll->Setup.ForwardAngle = Lara.moveAngle;
GetCollisionInfo(coll, item, PHD_VECTOR(0, LARA_HEIGHT_SURFSWIM, 0));
ShiftItem(item, coll);
if (coll->CollisionType & (CT_FRONT | CT_TOP | CT_TOP_FRONT | CT_CLAMP) ||
coll->Middle.Floor < 0 && coll->Middle.Slope)
{
item->fallspeed = 0;
item->pos.xPos = coll->Setup.OldPosition.x;
item->pos.yPos = coll->Setup.OldPosition.y;
item->pos.zPos = coll->Setup.OldPosition.z;
}
else if (coll->CollisionType == CT_LEFT)
{
item->pos.yRot += ANGLE(5);
}
else if (coll->CollisionType == CT_RIGHT)
{
item->pos.yRot -= ANGLE(5);
}
if (GetWaterHeight(item->pos.xPos, item->pos.yPos, item->pos.zPos, item->roomNumber) - item->pos.yPos > -100)
{
TestLaraWaterStepOut(item, coll);
}
else
{
item->goalAnimState = LS_UNDERWATER_FORWARD;
item->currentAnimState = LS_DIVE;
item->animNumber = LA_ONWATER_DIVE;
item->pos.xRot = -8190;
item->frameNumber = GF(LA_ONWATER_DIVE, 0);
item->fallspeed = 80;
Lara.waterStatus = LW_UNDERWATER;
}
}

2
TR5Main/Game/Lara/lara_collide.h
View file

@ -15,3 +15,5 @@ void LaraResetGravityStatus(ITEM_INFO* item, COLL_INFO* coll);
void LaraSnapToHeight(ITEM_INFO* item, COLL_INFO* coll);
short GetDirOctant(int rot);
void GetLaraDeadlyBounds();
void LaraSurfaceCollision(ITEM_INFO* item, COLL_INFO* coll);

254
TR5Main/Game/Lara/lara_surface.cpp
View file

@ -8,7 +8,6 @@
#include "Lara.h"
#include "level.h"
#include "input.h"
#include "lara_collide.h"
void lara_col_surftread(ITEM_INFO* item, COLL_INFO* coll)
{
@ -225,259 +224,6 @@ void lara_as_surfswim(ITEM_INFO* item, COLL_INFO* coll)
item->fallspeed = 60;
}
void LaraSurfaceCollision(ITEM_INFO* item, COLL_INFO* coll)
{
coll->Setup.ForwardAngle = Lara.moveAngle;
GetCollisionInfo(coll, item, PHD_VECTOR(0, LARA_HEIGHT_SURFSWIM, 0));
ShiftItem(item, coll);
if (coll->CollisionType & (CT_FRONT | CT_TOP | CT_TOP_FRONT | CT_CLAMP) ||
coll->Middle.Floor < 0 && coll->Middle.Slope)
{
item->fallspeed = 0;
item->pos.xPos = coll->Setup.OldPosition.x;
item->pos.yPos = coll->Setup.OldPosition.y;
item->pos.zPos = coll->Setup.OldPosition.z;
}
else if (coll->CollisionType == CT_LEFT)
{
item->pos.yRot += ANGLE(5);
}
else if (coll->CollisionType == CT_RIGHT)
{
item->pos.yRot -= ANGLE(5);
}
if (GetWaterHeight(item->pos.xPos, item->pos.yPos, item->pos.zPos, item->roomNumber) - item->pos.yPos > -100)
{
TestLaraWaterStepOut(item, coll);
}
else
{
item->goalAnimState = LS_UNDERWATER_FORWARD;
item->currentAnimState = LS_DIVE;
item->animNumber = LA_ONWATER_DIVE;
item->pos.xRot = -8190;
item->frameNumber = GF(LA_ONWATER_DIVE, 0);
item->fallspeed = 80;
Lara.waterStatus = LW_UNDERWATER;
}
}
bool TestLaraWaterClimbOut(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType != CT_FRONT || !(TrInput & IN_ACTION))
return false;
// TODO: Enable with lua!
Lara.NewAnims.CrawlFlexWaterPullUp = true;
Lara.NewAnims.CrawlFlexSubmerged = true;
if (Lara.gunStatus &&
(Lara.gunStatus != LG_READY || Lara.gunType != WEAPON_FLARE))
{
return false;
}
if (coll->Middle.Ceiling > -STEPUP_HEIGHT)
return false;
int frontFloor = coll->Front.Floor + LARA_HEIGHT_SURFSWIM;
if (frontFloor <= -STOP_SIZE ||
frontFloor > (STEP_SIZE + STEP_SIZE / 4 - 4))
{
return false;
}
if (!TestValidLedge(item, coll))
return false;
auto surface = LaraCollisionAboveFront(item, coll->Setup.ForwardAngle, (STEP_SIZE * 2), STEP_SIZE);
auto headroom = surface.Position.Floor - surface.Position.Ceiling;
if (frontFloor <= -STEP_SIZE)
{
if (headroom < LARA_HEIGHT)
{
if (Lara.NewAnims.CrawlFlexWaterPullUp)
{
item->animNumber = LA_ONWATER_TO_CROUCH_1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_CROUCH_1CLICK, 0);
item->goalAnimState = LA_CROUCH_IDLE;
}
else
return false;
}
else
{
item->animNumber = LA_ONWATER_TO_STAND_1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_STAND_1CLICK, 0);
item->goalAnimState = LS_STOP;
}
}
else if (frontFloor > (STEP_SIZE / 2))
{
if (headroom < LARA_HEIGHT)
{
if (Lara.NewAnims.CrawlFlexSubmerged)
{
item->animNumber = LA_ONWATER_TO_CROUCH_M1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_CROUCH_M1CLICK, 0);
item->goalAnimState = LA_CROUCH_IDLE;
}
else
return false;
}
else
item->animNumber = LA_ONWATER_TO_STAND_M1CLICK;
item->frameNumber = GF(item->animNumber, 0);
}
else
{
if (headroom < LARA_HEIGHT)
{
if (Lara.NewAnims.CrawlFlexWaterPullUp)
{
item->animNumber = LA_ONWATER_TO_CROUCH_0CLICK;
item->frameNumber = GF(LA_ONWATER_TO_CROUCH_0CLICK, 0);
item->goalAnimState = LA_CROUCH_IDLE;
}
else
return false;
}
else
{
item->animNumber = LA_ONWATER_TO_STAND_0CLICK;
item->frameNumber = GF(LA_ONWATER_TO_STAND_0CLICK, 0);
item->goalAnimState = LS_STOP;
}
}
UpdateItemRoom(item, -LARA_HEIGHT / 2);
SnapItemToLedge(item, coll, 1.7f);
item->pos.yPos += frontFloor - 5;
item->currentAnimState = LS_ONWATER_EXIT;
item->gravityStatus = false;
item->speed = 0;
item->fallspeed = 0;
Lara.gunStatus = LG_HANDS_BUSY;
Lara.waterStatus = LW_ABOVE_WATER;
return true;
}
bool TestLaraWaterStepOut(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType == CT_FRONT ||
coll->Middle.Slope ||
coll->Middle.Floor >= 0)
{
return false;
}
if (coll->Middle.Floor >= -(STEP_SIZE / 2))
{
item->animNumber = LA_STAND_IDLE;
item->frameNumber = GF(LA_STAND_IDLE, 0);
item->goalAnimState = LS_STOP;
item->currentAnimState = LS_STOP;
}
else
{
item->animNumber = LA_ONWATER_TO_WADE_1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_WADE_1CLICK, 0);
item->currentAnimState = LS_ONWATER_EXIT;
item->goalAnimState = LS_STOP;
}
item->pos.yPos += coll->Middle.Floor + (STOP_SIZE + STEP_SIZE / 2 + STEP_SIZE / 4 - 9);
UpdateItemRoom(item, -(STEPUP_HEIGHT - 3));
item->pos.zRot = 0;
item->pos.xRot = 0;
item->gravityStatus = false;
item->speed = 0;
item->fallspeed = 0;
Lara.waterStatus = LW_WADE;
return true;
}
bool TestLaraLadderClimbOut(ITEM_INFO* item, COLL_INFO* coll) // NEW function for water to ladder move
{
if (!(TrInput & IN_ACTION) ||
!Lara.climbStatus ||
coll->CollisionType != CT_FRONT)
{
return false;
}
if (Lara.gunStatus &&
(Lara.gunStatus != LG_READY || Lara.gunType != WEAPON_FLARE))
{
return false;
}
if (!TestLaraClimbStance(item, coll))
return false;
short rot = item->pos.yRot;
if (rot >= -ANGLE(35.0f) && rot <= ANGLE(35.0f))
rot = 0;
else if (rot >= ANGLE(55.0f) && rot <= ANGLE(125.0f))
rot = ANGLE(90.0f);
else if (rot >= ANGLE(145.0f) || rot <= -ANGLE(145.0f))
rot = ANGLE(180.0f);
else if (rot >= -ANGLE(125.0f) && rot <= -ANGLE(55.0f))
rot = -ANGLE(90.0f);
if (rot & 0x3FFF)
return false;
switch ((unsigned short) rot / ANGLE(90.0f))
{
case NORTH:
item->pos.zPos = (item->pos.zPos | (WALL_SIZE - 1)) - LARA_RAD - 1;
break;
case EAST:
item->pos.xPos = (item->pos.xPos | (WALL_SIZE - 1)) - LARA_RAD - 1;
break;
case SOUTH:
item->pos.zPos = (item->pos.zPos & -WALL_SIZE) + LARA_RAD + 1;
break;
case WEST:
item->pos.xPos = (item->pos.xPos & -WALL_SIZE) + LARA_RAD + 1;
break;
}
item->animNumber = LA_ONWATER_IDLE;
item->frameNumber = GF(LA_ONWATER_IDLE, 0);
item->currentAnimState = LS_ONWATER_STOP;
item->goalAnimState = LS_LADDER_IDLE;
AnimateLara(item);
item->pos.yRot = rot;
item->pos.yPos -= 10;//otherwise she falls back into the water
item->pos.zRot = 0;
item->pos.xRot = 0;
item->gravityStatus = false;
item->speed = 0;
item->fallspeed = 0;
Lara.gunStatus = LG_HANDS_BUSY;
Lara.waterStatus = LW_ABOVE_WATER;
return true;
}
void lara_as_waterout(ITEM_INFO* item, COLL_INFO* coll)
{
coll->Setup.EnableObjectPush = false;

214
TR5Main/Game/Lara/lara_tests.cpp
View file

@ -1335,6 +1335,220 @@ bool LaraLandedBad(ITEM_INFO* item, COLL_INFO* coll)
return false;
}
bool TestLaraWaterStepOut(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType == CT_FRONT ||
coll->Middle.Slope ||
coll->Middle.Floor >= 0)
{
return false;
}
if (coll->Middle.Floor >= -(STEP_SIZE / 2))
{
item->animNumber = LA_STAND_IDLE;
item->frameNumber = GF(LA_STAND_IDLE, 0);
item->goalAnimState = LS_STOP;
item->currentAnimState = LS_STOP;
}
else
{
item->animNumber = LA_ONWATER_TO_WADE_1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_WADE_1CLICK, 0);
item->currentAnimState = LS_ONWATER_EXIT;
item->goalAnimState = LS_STOP;
}
item->pos.yPos += coll->Middle.Floor + (STOP_SIZE + STEP_SIZE / 2 + STEP_SIZE / 4 - 9);
UpdateItemRoom(item, -(STEPUP_HEIGHT - 3));
item->pos.zRot = 0;
item->pos.xRot = 0;
item->gravityStatus = false;
item->speed = 0;
item->fallspeed = 0;
Lara.waterStatus = LW_WADE;
return true;
}
bool TestLaraWaterClimbOut(ITEM_INFO* item, COLL_INFO* coll)
{
if (coll->CollisionType != CT_FRONT || !(TrInput & IN_ACTION))
return false;
// TODO: Enable with lua!
Lara.NewAnims.CrawlFlexWaterPullUp = true;
Lara.NewAnims.CrawlFlexSubmerged = true;
if (Lara.gunStatus &&
(Lara.gunStatus != LG_READY || Lara.gunType != WEAPON_FLARE))
{
return false;
}
if (coll->Middle.Ceiling > -STEPUP_HEIGHT)
return false;
int frontFloor = coll->Front.Floor + LARA_HEIGHT_SURFSWIM;
if (frontFloor <= -STOP_SIZE ||
frontFloor > (STEP_SIZE + STEP_SIZE / 4 - 4))
{
return false;
}
if (!TestValidLedge(item, coll))
return false;
auto surface = LaraCollisionAboveFront(item, coll->Setup.ForwardAngle, (STEP_SIZE * 2), STEP_SIZE);
auto headroom = surface.Position.Floor - surface.Position.Ceiling;
if (frontFloor <= -STEP_SIZE)
{
if (headroom < LARA_HEIGHT)
{
if (Lara.NewAnims.CrawlFlexWaterPullUp)
{
item->animNumber = LA_ONWATER_TO_CROUCH_1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_CROUCH_1CLICK, 0);
item->goalAnimState = LA_CROUCH_IDLE;
}
else
return false;
}
else
{
item->animNumber = LA_ONWATER_TO_STAND_1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_STAND_1CLICK, 0);
item->goalAnimState = LS_STOP;
}
}
else if (frontFloor > (STEP_SIZE / 2))
{
if (headroom < LARA_HEIGHT)
{
if (Lara.NewAnims.CrawlFlexSubmerged)
{
item->animNumber = LA_ONWATER_TO_CROUCH_M1CLICK;
item->frameNumber = GF(LA_ONWATER_TO_CROUCH_M1CLICK, 0);
item->goalAnimState = LA_CROUCH_IDLE;
}
else
return false;
}
else
item->animNumber = LA_ONWATER_TO_STAND_M1CLICK;
item->frameNumber = GF(item->animNumber, 0);
}
else
{
if (headroom < LARA_HEIGHT)
{
if (Lara.NewAnims.CrawlFlexWaterPullUp)
{
item->animNumber = LA_ONWATER_TO_CROUCH_0CLICK;
item->frameNumber = GF(LA_ONWATER_TO_CROUCH_0CLICK, 0);
item->goalAnimState = LA_CROUCH_IDLE;
}
else
return false;
}
else
{
item->animNumber = LA_ONWATER_TO_STAND_0CLICK;
item->frameNumber = GF(LA_ONWATER_TO_STAND_0CLICK, 0);
item->goalAnimState = LS_STOP;
}
}
UpdateItemRoom(item, -LARA_HEIGHT / 2);
SnapItemToLedge(item, coll, 1.7f);
item->pos.yPos += frontFloor - 5;
item->currentAnimState = LS_ONWATER_EXIT;
item->gravityStatus = false;
item->speed = 0;
item->fallspeed = 0;
Lara.gunStatus = LG_HANDS_BUSY;
Lara.waterStatus = LW_ABOVE_WATER;
return true;
}
bool TestLaraLadderClimbOut(ITEM_INFO* item, COLL_INFO* coll) // NEW function for water to ladder move
{
if (!(TrInput & IN_ACTION) ||
!Lara.climbStatus ||
coll->CollisionType != CT_FRONT)
{
return false;
}
if (Lara.gunStatus &&
(Lara.gunStatus != LG_READY || Lara.gunType != WEAPON_FLARE))
{
return false;
}
if (!TestLaraClimbStance(item, coll))
return false;
short rot = item->pos.yRot;
if (rot >= -ANGLE(35.0f) && rot <= ANGLE(35.0f))
rot = 0;
else if (rot >= ANGLE(55.0f) && rot <= ANGLE(125.0f))
rot = ANGLE(90.0f);
else if (rot >= ANGLE(145.0f) || rot <= -ANGLE(145.0f))
rot = ANGLE(180.0f);
else if (rot >= -ANGLE(125.0f) && rot <= -ANGLE(55.0f))
rot = -ANGLE(90.0f);
if (rot & 0x3FFF)
return false;
switch ((unsigned short)rot / ANGLE(90.0f))
{
case NORTH:
item->pos.zPos = (item->pos.zPos | (WALL_SIZE - 1)) - LARA_RAD - 1;
break;
case EAST:
item->pos.xPos = (item->pos.xPos | (WALL_SIZE - 1)) - LARA_RAD - 1;
break;
case SOUTH:
item->pos.zPos = (item->pos.zPos & -WALL_SIZE) + LARA_RAD + 1;
break;
case WEST:
item->pos.xPos = (item->pos.xPos & -WALL_SIZE) + LARA_RAD + 1;
break;
}
item->animNumber = LA_ONWATER_IDLE;
item->frameNumber = GF(LA_ONWATER_IDLE, 0);
item->currentAnimState = LS_ONWATER_STOP;
item->goalAnimState = LS_LADDER_IDLE;
AnimateLara(item);
item->pos.yRot = rot;
item->pos.yPos -= 10;//otherwise she falls back into the water
item->pos.zRot = 0;
item->pos.xRot = 0;
item->gravityStatus = false;
item->speed = 0;
item->fallspeed = 0;
Lara.gunStatus = LG_HANDS_BUSY;
Lara.waterStatus = LW_ABOVE_WATER;
return true;
}
#ifndef NEW_TIGHTROPE
void GetTighRopeFallOff(int regularity) {
if(LaraItem->hitPoints <= 0 || LaraItem->hitStatus)

4
TR5Main/Game/Lara/lara_tests.h
View file

@ -39,6 +39,10 @@ bool LaraLandedBad(ITEM_INFO* item, COLL_INFO* coll);
void SetCornerAnim(ITEM_INFO* item, COLL_INFO* coll, short rot, short flip);
void SetCornerAnimFeet(ITEM_INFO* item, COLL_INFO* coll, short rot, short flip);
bool TestLaraWaterStepOut(ITEM_INFO* item, COLL_INFO* coll);
bool TestLaraWaterClimbOut(ITEM_INFO* item, COLL_INFO* coll);
bool TestLaraLadderClimbOut(ITEM_INFO* item, COLL_INFO* coll);
#ifndef NEW_TIGHTROPE
void GetTighRopeFallOff(int Regularity);
#endif // !NEW_TIGHTROPE