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_RayCollider.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_RayCollider.h')
-rw-r--r-- | Opcode/OPC_RayCollider.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Opcode/OPC_RayCollider.h b/Opcode/OPC_RayCollider.h index f3b0065..64dc2b4 100644 --- a/Opcode/OPC_RayCollider.h +++ b/Opcode/OPC_RayCollider.h @@ -177,10 +177,10 @@ protected:
// Ray in local space
- Point mOrigin; //!< Ray origin
- Point mDir; //!< Ray direction (normalized)
- Point mFDir; //!< fabsf(mDir)
- Point mData, mData2;
+ IcePoint mOrigin; //!< Ray origin
+ IcePoint mDir; //!< Ray direction (normalized)
+ IcePoint mFDir; //!< fabsf(mDir)
+ IcePoint mData, mData2;
// Stabbed faces
CollisionFace mStabbedFace; //!< Current stabbed face
#ifdef OPC_RAYHIT_CALLBACK
@@ -195,8 +195,8 @@ // In-out test
udword mNbIntersections; //!< Number of valid intersections
// Dequantization coeffs
- Point mCenterCoeff;
- Point mExtentsCoeff;
+ IcePoint mCenterCoeff;
+ IcePoint mExtentsCoeff;
// Settings
float mMaxDist; //!< Valid segment on the ray
#ifndef OPC_RAYHIT_CALLBACK
@@ -215,9 +215,9 @@ void _RayStab(const AABBQuantizedNoLeafNode* node);
void _RayStab(const AABBTreeNode* node, Container& box_indices);
// Overlap tests
- inline_ BOOL RayAABBOverlap(const Point& center, const Point& extents);
- inline_ BOOL SegmentAABBOverlap(const Point& center, const Point& extents);
- inline_ BOOL RayTriOverlap(const Point& vert0, const Point& vert1, const Point& vert2);
+ inline_ BOOL RayAABBOverlap(const IcePoint& center, const IcePoint& extents);
+ inline_ BOOL SegmentAABBOverlap(const IcePoint& center, const IcePoint& extents);
+ inline_ BOOL RayTriOverlap(const IcePoint& vert0, const IcePoint& vert1, const IcePoint& vert2);
// Init methods
BOOL InitQuery(const Ray& world_ray, const Matrix4x4* world=null, udword* face_id=null);
};
|