From 5e6773397cc101c7c3d08482efc456daa91734e9 Mon Sep 17 00:00:00 2001 From: Aki Date: Fri, 1 Oct 2021 22:52:04 +0200 Subject: Switched to use only one version of Opcode --- Opcode/OPC_PlanesCollider.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Opcode/OPC_PlanesCollider.h') diff --git a/Opcode/OPC_PlanesCollider.h b/Opcode/OPC_PlanesCollider.h index 5fea18d..5a0af9f 100644 --- a/Opcode/OPC_PlanesCollider.h +++ b/Opcode/OPC_PlanesCollider.h @@ -50,12 +50,12 @@ * \warning SCALE NOT SUPPORTED. The matrices must contain rotation & translation parts only. */ /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - bool Collide(PlanesCache& cache, const Plane* planes, udword nb_planes, const Model& model, const Matrix4x4* worldm=null); + bool Collide(PlanesCache& cache, const IcePlane* planes, udword nb_planes, const Model& model, const Matrix4x4* worldm=null); // Mutant box-with-planes collision queries inline_ bool Collide(PlanesCache& cache, const OBB& box, const Model& model, const Matrix4x4* worldb=null, const Matrix4x4* worldm=null) { - Plane PL[6]; + IcePlane PL[6]; if(worldb) { @@ -87,7 +87,7 @@ protected: // Planes in model space udword mNbPlanes; - Plane* mPlanes; + IcePlane* mPlanes; // Leaf description VertexPointers mVP; // Internal methods @@ -103,7 +103,7 @@ inline_ BOOL PlanesAABBOverlap(const IcePoint& center, const IcePoint& extents, udword& out_clip_mask, udword in_clip_mask); inline_ BOOL PlanesTriOverlap(udword in_clip_mask); // Init methods - BOOL InitQuery(PlanesCache& cache, const Plane* planes, udword nb_planes, const Matrix4x4* worldm=null); + BOOL InitQuery(PlanesCache& cache, const IcePlane* planes, udword nb_planes, const Matrix4x4* worldm=null); }; class OPCODE_API HybridPlanesCollider : public PlanesCollider @@ -113,7 +113,7 @@ HybridPlanesCollider(); virtual ~HybridPlanesCollider(); - bool Collide(PlanesCache& cache, const Plane* planes, udword nb_planes, const HybridModel& model, const Matrix4x4* worldm=null); + bool Collide(PlanesCache& cache, const IcePlane* planes, udword nb_planes, const HybridModel& model, const Matrix4x4* worldm=null); protected: Container mTouchedBoxes; }; -- cgit v1.1