Skip to content

Fix incorrect plane calculation in IntersectRayWithOBB #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samisalreadytaken wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix incorrect plane calculation in IntersectRayWithOBB #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56e46c6
Fix incorrect plane calculation in IntersectRayWithOBB
samisalreadytaken Aug 26, 2022
319c508
Fix missing transform in IntersectRayWithOBB
samisalreadytaken Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions mp/src/public/collisionutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,12 +1475,10 @@ bool IntersectRayWithOBB( const Ray_t &ray, const matrix3x4_t &matOBBToWorld,
Collision_ClearTrace( ray.m_Start + ray.m_StartOffset, ray.m_Delta, pTrace );

// Compute a bounding sphere around the bloated OBB
Vector vecOBBCenter;
VectorAdd( vecOBBMins, vecOBBMaxs, vecOBBCenter );
vecOBBCenter *= 0.5f;
vecOBBCenter.x += matOBBToWorld[0][3];
vecOBBCenter.y += matOBBToWorld[1][3];
vecOBBCenter.z += matOBBToWorld[2][3];
Vector vecBoxExtents, vecOBBCenter;
VectorAdd( vecOBBMins, vecOBBMaxs, vecBoxExtents );
vecBoxExtents *= 0.5f;
VectorTransform( vecBoxExtents, matOBBToWorld, vecOBBCenter );

Vector vecOBBHalfDiagonal;
VectorSubtract( vecOBBMaxs, vecOBBMins, vecOBBHalfDiagonal );
Expand Down Expand Up @@ -1666,7 +1664,7 @@ bool IntersectRayWithOBB( const Ray_t &ray, const matrix3x4_t &matOBBToWorld,
}
temp.type = 3;

MatrixITransformPlane( matOBBToWorld, temp, pTrace->plane );
MatrixTransformPlane( matOBBToWorld, temp, pTrace->plane );
return true;
}

Expand Down
12 changes: 5 additions & 7 deletions sp/src/public/collisionutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,12 +1475,10 @@ bool IntersectRayWithOBB( const Ray_t &ray, const matrix3x4_t &matOBBToWorld,
Collision_ClearTrace( ray.m_Start + ray.m_StartOffset, ray.m_Delta, pTrace );

// Compute a bounding sphere around the bloated OBB
Vector vecOBBCenter;
VectorAdd( vecOBBMins, vecOBBMaxs, vecOBBCenter );
vecOBBCenter *= 0.5f;
vecOBBCenter.x += matOBBToWorld[0][3];
vecOBBCenter.y += matOBBToWorld[1][3];
vecOBBCenter.z += matOBBToWorld[2][3];
Vector vecBoxExtents, vecOBBCenter;
VectorAdd( vecOBBMins, vecOBBMaxs, vecBoxExtents );
vecBoxExtents *= 0.5f;
VectorTransform( vecBoxExtents, matOBBToWorld, vecOBBCenter );

Vector vecOBBHalfDiagonal;
VectorSubtract( vecOBBMaxs, vecOBBMins, vecOBBHalfDiagonal );
Expand Down Expand Up @@ -1666,7 +1664,7 @@ bool IntersectRayWithOBB( const Ray_t &ray, const matrix3x4_t &matOBBToWorld,
}
temp.type = 3;

MatrixITransformPlane( matOBBToWorld, temp, pTrace->plane );
MatrixTransformPlane( matOBBToWorld, temp, pTrace->plane );
return true;
}

Expand Down