PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 16:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Start CollisionUtil

Browse Source 
Former-commit-id: 6f8b62feca
This commit is contained in:
Phillip Stephens
2022-12-31 14:07:51 -08:00
parent 05f5fba3db
commit 3bf5eba181
10 changed files with 97 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/Collision/CollisionUtil.hpp
View File

@@ -1,9 +1,22 @@
#ifndef _COLLISIONUTIL
#define _COLLISIONUTIL
#include "Kyoto/Math/CVector3f.hpp"
class CCollisionInfoList;
class CVector3f;
/* TODO: Figure out a better place for this, borks CBallFilter here, but is needed for CCollidableAABox/Sphere
(Best solution would be to find a Tardis and go back and slap the dev responsible for this)
static const CVector3f normalTable[6] = {
CVector3f(-1.f, 0.f, 0.f),
CVector3f(1.f, 0.f, 0.f),
CVector3f(0.f, -1.f, 0.f),
CVector3f(0.f, 1.f, 0.f),
CVector3f(0.f, 0.f, -1.f),
CVector3f(0.f, 0.f, 1.f),
};
*/
namespace CollisionUtil {
void AddAverageToFront(const CCollisionInfoList& in, CCollisionInfoList& out);

6
include/Kyoto/Math/CSphere.hpp
View File

@@ -8,12 +8,14 @@
class CSphere {
public:
CSphere(const CVector3f& pos, float radius) : x0_pos(pos), xc_radius(radius) {}
CSphere(const CVector3f& pos, float radius) : x0_center(pos), xc_radius(radius) {}
CVector3f GetCenter() const { return x0_center; }
float GetRadius() const { return xc_radius; }
CUnitVector3f GetSurfaceNormal(const CVector3f& v) const;
private:
CVector3f x0_pos;
CVector3f x0_center;
float xc_radius;
};
CHECK_SIZEOF(CSphere, 0x10)