AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 14:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Work on collision related implementations

Browse Source
This commit is contained in:
Jack Andersen
2017-06-17 15:58:13 -10:00
parent 47e73f9f80
commit 71a361f54e
32 changed files with 1521 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Runtime/Collision/CCollidableAABox.cpp
View File

@@ -1,4 +1,5 @@
#include "CCollidableAABox.hpp"
#include "CollisionUtil.hpp"
namespace urde
{
@@ -68,14 +69,26 @@ bool CCollidableAABox::CollideMovingSphere(const CInternalCollisionStructure &,
namespace Collide
{
bool AABox_AABox(const CInternalCollisionStructure &, CCollisionInfoList &)
bool AABox_AABox(const CInternalCollisionStructure& collision, CCollisionInfoList& list)
{
return false;
const CCollidableAABox& box0 = static_cast<const CCollidableAABox&>(collision.GetLeft().GetPrim());
const CCollidableAABox& box1 = static_cast<const CCollidableAABox&>(collision.GetRight().GetPrim());
zeus::CAABox aabb0 = box0.Transform(collision.GetLeft().GetTransform());
zeus::CAABox aabb1 = box1.Transform(collision.GetRight().GetTransform());
return CollisionUtil::AABoxAABoxIntersection(aabb0, box0.GetMaterial(), aabb1, box1.GetMaterial(), list);
}
bool AABox_AABox_Bool(const CInternalCollisionStructure &)
bool AABox_AABox_Bool(const CInternalCollisionStructure& collision)
{
return false;
const CCollidableAABox& box0 = static_cast<const CCollidableAABox&>(collision.GetLeft().GetPrim());
const CCollidableAABox& box1 = static_cast<const CCollidableAABox&>(collision.GetRight().GetPrim());
zeus::CAABox aabb0 = box0.Transform(collision.GetLeft().GetTransform());
zeus::CAABox aabb1 = box1.Transform(collision.GetRight().GetTransform());
return CollisionUtil::AABoxAABoxIntersection(aabb0, aabb1);
}
}