diff options
author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-08 16:00:07 +0000 |
---|---|---|
committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-08 16:00:07 +0000 |
commit | 78e29455c5cb4acce769498a5a32be6a3c6085b4 (patch) | |
tree | c71549e69f306cfc302d4c76b48cf99afd7f2f76 /Opcode/OPC_SphereCollider.h | |
parent | e33e19d0587146859d48a134ec9fd94e7b7ba5cd (diff) | |
download | starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.zip starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.tar.gz starshatter-78e29455c5cb4acce769498a5a32be6a3c6085b4.tar.bz2 |
Fixing up faulty references to class "Point" to "IcePoint"
Diffstat (limited to 'Opcode/OPC_SphereCollider.h')
-rw-r--r-- | Opcode/OPC_SphereCollider.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Opcode/OPC_SphereCollider.h b/Opcode/OPC_SphereCollider.h index aa53fdf..ee7a278 100644 --- a/Opcode/OPC_SphereCollider.h +++ b/Opcode/OPC_SphereCollider.h @@ -26,7 +26,7 @@ ~SphereCache() {}
// Cached faces signature
- Point Center; //!< Sphere used when performing the query resulting in cached faces
+ IcePoint Center; //!< Sphere used when performing the query resulting in cached faces
float FatRadius2; //!< Sphere used when performing the query resulting in cached faces
// User settings
float FatCoeff; //!< mRadius2 multiplier used to create a fat sphere
@@ -61,7 +61,7 @@ bool Collide(SphereCache& cache, const Sphere& sphere, const AABBTree* tree);
protected:
// Sphere in model space
- Point mCenter; //!< Sphere center
+ IcePoint mCenter; //!< Sphere center
float mRadius2; //!< Sphere radius squared
// Internal methods
void _Collide(const AABBCollisionNode* node);
@@ -74,9 +74,9 @@ void _CollideNoPrimitiveTest(const AABBQuantizedNode* node);
void _CollideNoPrimitiveTest(const AABBQuantizedNoLeafNode* node);
// Overlap tests
- inline_ BOOL SphereContainsBox(const Point& bc, const Point& be);
- inline_ BOOL SphereAABBOverlap(const Point& center, const Point& extents);
- BOOL SphereTriOverlap(const Point& vert0, const Point& vert1, const Point& vert2);
+ inline_ BOOL SphereContainsBox(const IcePoint& bc, const IcePoint& be);
+ inline_ BOOL SphereAABBOverlap(const IcePoint& center, const IcePoint& extents);
+ BOOL SphereTriOverlap(const IcePoint& vert0, const IcePoint& vert1, const IcePoint& vert2);
// Init methods
BOOL InitQuery(SphereCache& cache, const Sphere& sphere, const Matrix4x4* worlds=null, const Matrix4x4* worldm=null);
};
|