summaryrefslogtreecommitdiffhomepage
path: root/Opcode/OPC_OBBCollider.h
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 16:00:07 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2011-12-08 16:00:07 +0000
commit78e29455c5cb4acce769498a5a32be6a3c6085b4 (patch)
treec71549e69f306cfc302d4c76b48cf99afd7f2f76 /Opcode/OPC_OBBCollider.h
parente33e19d0587146859d48a134ec9fd94e7b7ba5cd (diff)
downloadstarshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.zip
starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.tar.gz
starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.tar.bz2
Fixing up faulty references to class "Point" to "IcePoint"
Diffstat (limited to 'Opcode/OPC_OBBCollider.h')
-rw-r--r--Opcode/OPC_OBBCollider.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/Opcode/OPC_OBBCollider.h b/Opcode/OPC_OBBCollider.h
index b5c1de2..0601b20 100644
--- a/Opcode/OPC_OBBCollider.h
+++ b/Opcode/OPC_OBBCollider.h
@@ -85,12 +85,12 @@
Matrix3x3 mAR; //!< Absolute rotation matrix
Matrix3x3 mRModelToBox; //!< Rotation from model space to obb space
Matrix3x3 mRBoxToModel; //!< Rotation from obb space to model space
- Point mTModelToBox; //!< Translation from model space to obb space
- Point mTBoxToModel; //!< Translation from obb space to model space
+ IcePoint mTModelToBox; //!< Translation from model space to obb space
+ IcePoint mTBoxToModel; //!< Translation from obb space to model space
- Point mBoxExtents;
- Point mB0; //!< - mTModelToBox + mBoxExtents
- Point mB1; //!< - mTModelToBox - mBoxExtents
+ IcePoint mBoxExtents;
+ IcePoint mB0; //!< - mTModelToBox + mBoxExtents
+ IcePoint mB1; //!< - mTModelToBox - mBoxExtents
float mBBx1;
float mBBy1;
@@ -107,7 +107,7 @@
float mBB_9;
// Leaf description
- Point mLeafVerts[3]; //!< Triangle vertices
+ IcePoint mLeafVerts[3]; //!< Triangle vertices
// Settings
bool mFullBoxBoxTest; //!< Perform full BV-BV tests (true) or SAT-lite tests (false)
// Internal methods
@@ -120,8 +120,8 @@
void _CollideNoPrimitiveTest(const AABBQuantizedNode* node);
void _CollideNoPrimitiveTest(const AABBQuantizedNoLeafNode* node);
// Overlap tests
- inline_ BOOL OBBContainsBox(const Point& bc, const Point& be);
- inline_ BOOL BoxBoxOverlap(const Point& extents, const Point& center);
+ inline_ BOOL OBBContainsBox(const IcePoint& bc, const IcePoint& be);
+ inline_ BOOL BoxBoxOverlap(const IcePoint& extents, const IcePoint& center);
inline_ BOOL TriBoxOverlap();
// Init methods
BOOL InitQuery(OBBCache& cache, const OBB& box, const Matrix4x4* worldb=null, const Matrix4x4* worldm=null);