ecker/engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

lol...

Browse Source
This commit is contained in:
ecker 2025-09-15 07:13:26 -05:00
parent 8dd83f7f49
commit 7dee5ccd53
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/inc/uf/utils/math/vector/pod.inl
View File

@ -298,9 +298,8 @@ T uf::vector::divide( typename T::type_t scalar, const T& vector ) {
} }
#endif #endif
T res; T res;
float recip = static_cast<typename T::type_t>(1) / scalar;
FOR_EACH(T::size, { FOR_EACH(T::size, {
res[i] = vector[i] * recip; res[i] = scalar / vector[i];
}); });
return res; return res;
} }

12
engine/src/utils/math/physics/helpers.inl
View File

@ -109,7 +109,7 @@ namespace {
return ( a.category & b.mask ) && ( b.category & a.mask ); return ( a.category & b.mask ) && ( b.category & a.mask );
} }
bool shouldCollide( const pod::PhysicsBody& a, const pod::PhysicsBody& b ) { bool shouldCollide( const pod::PhysicsBody& a, const pod::PhysicsBody& b ) {
// if ( a.isStatic && b.isStatic ) return false; if ( a.isStatic && b.isStatic ) return false; // this shouldn't ever happen if we're segregating static bodies from dynamic bodies in the broadphase
return ::shouldCollide( a.collider, b.collider ); return ::shouldCollide( a.collider, b.collider );
} }
@ -127,7 +127,7 @@ namespace {
pod::Vector3f closestPointOnSegment( const pod::Vector3f& p, const pod::Vector3f& a, const pod::Vector3f& b ) { pod::Vector3f closestPointOnSegment( const pod::Vector3f& p, const pod::Vector3f& a, const pod::Vector3f& b ) {
pod::Vector3f ab = b - a; pod::Vector3f ab = b - a;
float t = uf::vector::dot(p - a, ab) / uf::vector::dot(ab, ab); float t = uf::vector::dot(p - a, ab) / uf::vector::dot(ab, ab);
t = std::max(0.0f, std::min(1.0f, t)); // clamp( t, 0, 1 ) t = std::clamp( t, 0.0f, 1.0f );
return a + ab * t; return a + ab * t;
} }
@ -190,18 +190,14 @@ namespace {
if ( len2 > eps ) { if ( len2 > eps ) {
// parametric closest t from box center // parametric closest t from box center
t = uf::vector::dot( c - p1, d ) / len2; t = uf::vector::dot( c - p1, d ) / len2;
t = std::max(0.0f, std::min(1.0f, t)); t = std::clamp( t, 0.0f, 1.0f );
} }
// closest point on segment to box center // closest point on segment to box center
auto segClosest = p1 + d * t; auto segClosest = p1 + d * t;
// clamp this point into AABB // clamp this point into AABB
return { return uf::vector::clamp( segClosest, box.min, box.max );
std::max(box.min.x, std::min(segClosest.x, box.max.x)),
std::max(box.min.y, std::min(segClosest.y, box.max.y)),
std::max(box.min.z, std::min(segClosest.z, box.max.z)),
};
} }
pod::Vector3f computeBarycentric( const pod::Vector3f& p, const pod::Vector3f& a, const pod::Vector3f& b, const pod::Vector3f& c, bool clamps = false ) { pod::Vector3f computeBarycentric( const pod::Vector3f& p, const pod::Vector3f& a, const pod::Vector3f& b, const pod::Vector3f& c, bool clamps = false ) {