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

Refactor CalcItemToFloorRotation

Browse source
This commit is contained in:
Lwmte 2021-11-04 13:22:26 +03:00
parent 92fa72ed25
commit 4ddfaae169
2 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

48
TR5Main/Game/collide.cpp
View file

@ -2512,41 +2512,35 @@ void GenericSphereBoxCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
void CalcItemToFloorRotation(ITEM_INFO* item, int radiusDivide)
{
FLOOR_INFO* floor;
BOUNDING_BOX* bounds;
GAME_VECTOR pos;
int ratioXZ, frontHDif, sideHDif;
int frontX, frontZ, leftX, leftZ, rightX, rightZ;
int frontHeight, backHeight, leftHeight, rightHeight;
int radiusZ, radiusX;
if (!radiusDivide)
radiusDivide = 1;
bounds = GetBoundsAccurate(item);
GAME_VECTOR pos;
pos.x = item->pos.xPos;
pos.y = item->pos.yPos;
pos.z = item->pos.zPos;
pos.roomNumber = item->roomNumber;
radiusX = bounds->X2;
radiusZ = bounds->Z2 / radiusDivide; // need divide in any case else it's too much !
ratioXZ = radiusZ / radiusX;
frontX = phd_sin(item->pos.yRot) * radiusZ;
frontZ = phd_cos(item->pos.yRot) * radiusZ;
leftX = -frontZ * ratioXZ;
leftZ = frontX * ratioXZ;
rightX = frontZ * ratioXZ;
rightZ = -frontX * ratioXZ;
auto bounds = GetBoundsAccurate(item);
auto radiusX = bounds->X2;
auto radiusZ = bounds->Z2 / radiusDivide; // Need divide in any case else it's too much !
floor = GetFloor(pos.x + frontX, pos.y, pos.z + frontZ, &pos.roomNumber);
frontHeight = GetFloorHeight(floor, pos.x + frontX, pos.y, pos.z + frontZ);
floor = GetFloor(pos.x - frontX, pos.y, pos.z - frontZ, &pos.roomNumber);
backHeight = GetFloorHeight(floor, pos.x - frontX, pos.y, pos.z - frontZ);
floor = GetFloor(pos.x + leftX, pos.y, pos.z + leftZ, &pos.roomNumber);
leftHeight = GetFloorHeight(floor, pos.x + leftX, pos.y, pos.z + leftZ);
floor = GetFloor(pos.x + rightX, pos.y, pos.z + rightZ, &pos.roomNumber);
rightHeight = GetFloorHeight(floor, pos.x + rightX, pos.y, pos.z + rightZ);
auto ratioXZ = radiusZ / radiusX;
auto frontX = phd_sin(item->pos.yRot) * radiusZ;
auto frontZ = phd_cos(item->pos.yRot) * radiusZ;
auto leftX = -frontZ * ratioXZ;
auto leftZ = frontX * ratioXZ;
auto rightX = frontZ * ratioXZ;
auto rightZ = -frontX * ratioXZ;
auto frontHeight = GetCollisionResult(pos.x + frontX, pos.y, pos.z + frontZ, pos.roomNumber).Position.Floor;
auto backHeight = GetCollisionResult(pos.x - frontX, pos.y, pos.z - frontZ, pos.roomNumber).Position.Floor;
auto leftHeight = GetCollisionResult(pos.x + leftX, pos.y, pos.z + leftZ, pos.roomNumber).Position.Floor;
auto rightHeight = GetCollisionResult(pos.x + rightX, pos.y, pos.z + rightZ, pos.roomNumber).Position.Floor;
auto frontHDif = backHeight - frontHeight;
auto sideHDif = rightHeight - leftHeight;
frontHDif = backHeight - frontHeight;
sideHDif = rightHeight - leftHeight;
// NOTE: float(atan2()) is required, else warning about double !
item->pos.xRot = ANGLE(float(atan2(frontHDif, 2 * radiusZ)) / RADIAN);
item->pos.zRot = ANGLE(float(atan2(sideHDif, 2 * radiusX)) / RADIAN);

10
TR5Main/Game/pickup/pickup.cpp
View file

@ -745,11 +745,11 @@ BOUNDING_BOX* FindPlinth(ITEM_INFO* item)
{
BOUNDING_BOX* frame = (BOUNDING_BOX*)GetBestFrame(item);
STATIC_INFO* s = &StaticObjects[mesh->staticNumber];
if (frame->X1 <= s->collisionBox.X2
&& frame->X2 >= s->collisionBox.X1
&& frame->Z1 <= s->collisionBox.Z2
&& frame->Z2 >= s->collisionBox.Z1
&& (s->collisionBox.X1 || s->collisionBox.X2))
if (frame->X1 <= s->collisionBox.X2 &&
frame->X2 >= s->collisionBox.X1 &&
frame->Z1 <= s->collisionBox.Z2 &&
frame->Z2 >= s->collisionBox.Z1 &&
(s->collisionBox.X1 || s->collisionBox.X2))
{
found = mesh->staticNumber;
break;