Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-11 21:16:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update collide.cpp

Browse source
This commit is contained in:
Lwmte 2021-09-04 15:48:21 +03:00
parent 7e881c3b19
commit 31b10d37ad
1 changed files with 50 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

97
TR5Main/Game/collide.cpp
View file

@ -314,58 +314,61 @@ bool CollideStaticSolid(ITEM_INFO* item, MESH_INFO* mesh, COLL_INFO* coll)
} }
} }
if (closestPlane != -1) // This should never happen, but still
if (closestPlane == -1)
return false;
// Debug raycast
{ {
// Debug raycast
Vector3 p = collBounds.Center + (closestRay.direction * minDistance); Vector3 p = collBounds.Center + (closestRay.direction * minDistance);
g_Renderer.addLine3D(collBounds.Center, p, Vector4(1, 0, 1, 1)); g_Renderer.addLine3D(collBounds.Center, p, Vector4(1, 0, 1, 1));
// Calculate delta between tested ray and original collision ray.
// It is needed because tests are done on rays inverted in space which
// allows to find regions where bounds are already submerged into static bounds.
auto dx = distance * 2 * phd_sin(closestAngle);
auto dz = distance * 2 * phd_cos(closestAngle);
auto dd = Vector3(dx, 0, dz).Length();
// Get raw shift values
auto shift = closestRay.direction * minDistance;
// Get final shift values respecting delta
auto shiftX = (int)ceil(shift.x) - dx;
auto shiftZ = (int)ceil(shift.z) - dz;
// If both shifts are zero, it means no collision actually
// happened and no further processing is needed.
if (shiftX == 0 && shiftZ == 0)
return true;
coll->shift.x = shiftX;
coll->shift.z = shiftZ;
// Get plane's normal
auto normal = plane[closestPlane].Normal();
// Calculate angle between plane normal and collision vector
//auto collAngle = normal.Angle()
//switch (closestSide)
//{
//case 0:
//case 2:
// coll->collType = CT_FRONT;
// break;
//
//case 1:
// coll->collType = CT_RIGHT;
// break;
//
//case 3:
// coll->collType = CT_LEFT;
// break;
//}
} }
// Calculate delta between tested ray and original collision ray.
// It is needed because tests are done on rays inverted in space which
// allows to find regions where bounds are already submerged into static bounds.
auto dx = distance * 2 * phd_sin(closestAngle);
auto dz = distance * 2 * phd_cos(closestAngle);
auto dd = Vector3(dx, 0, dz).Length();
// Get raw shift values
auto shift = closestRay.direction * minDistance;
// Get final shift values respecting delta
auto shiftX = (int)ceil(shift.x) - dx;
auto shiftZ = (int)ceil(shift.z) - dz;
// If both shifts are zero, it means no collision actually
// happened and no further processing is needed.
if (shiftX == 0 && shiftZ == 0)
return true;
coll->shift.x = shiftX;
coll->shift.z = shiftZ;
// Get plane's normal
auto normal = plane[closestPlane].Normal();
// Calculate angle between plane normal and collision vector
//auto collAngle = normal.Angle()
//switch (closestSide)
//{
//case 0:
//case 2:
// coll->collType = CT_FRONT;
// break;
//
//case 1:
// coll->collType = CT_RIGHT;
// break;
//
//case 3:
// coll->collType = CT_LEFT;
// break;
//}
return true; return true;
} }