diff options
| author | Aki <please@ignore.pl> | 2021-10-01 22:52:04 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2021-10-01 23:45:09 +0200 |
| commit | 5e6773397cc101c7c3d08482efc456daa91734e9 (patch) | |
| tree | d6a116bb2c12dab6ff5e0f212676a9ac6bd19346 /Opcode/OPC_PlanesCollider.cpp | |
| parent | c2d2c3551501110fddd78674d5435bfaa70382a3 (diff) | |
| download | starshatter-5e6773397cc101c7c3d08482efc456daa91734e9.zip starshatter-5e6773397cc101c7c3d08482efc456daa91734e9.tar.gz starshatter-5e6773397cc101c7c3d08482efc456daa91734e9.tar.bz2 | |
Switched to use only one version of Opcode
Diffstat (limited to 'Opcode/OPC_PlanesCollider.cpp')
| -rw-r--r-- | Opcode/OPC_PlanesCollider.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Opcode/OPC_PlanesCollider.cpp b/Opcode/OPC_PlanesCollider.cpp index b8ada6f..ef0088e 100644 --- a/Opcode/OPC_PlanesCollider.cpp +++ b/Opcode/OPC_PlanesCollider.cpp @@ -100,7 +100,7 @@ const char* PlanesCollider::ValidateSettings() * \warning SCALE NOT SUPPORTED. The matrices must contain rotation & translation parts only.
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool PlanesCollider::Collide(PlanesCache& cache, const Plane* planes, udword nb_planes, const Model& model, const Matrix4x4* worldm)
+bool PlanesCollider::Collide(PlanesCache& cache, const IcePlane* planes, udword nb_planes, const Model& model, const Matrix4x4* worldm)
{
// Checkings
if(!Setup(&model)) return false;
@@ -174,7 +174,7 @@ bool PlanesCollider::Collide(PlanesCache& cache, const Plane* planes, udword nb_ * \warning SCALE NOT SUPPORTED. The matrix must contain rotation & translation parts only.
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL PlanesCollider::InitQuery(PlanesCache& cache, const Plane* planes, udword nb_planes, const Matrix4x4* worldm)
+BOOL PlanesCollider::InitQuery(PlanesCache& cache, const IcePlane* planes, udword nb_planes, const Matrix4x4* worldm)
{
// 1) Call the base method
VolumeCollider::InitQuery();
@@ -183,7 +183,7 @@ BOOL PlanesCollider::InitQuery(PlanesCache& cache, const Plane* planes, udword n if(nb_planes>mNbPlanes)
{
DELETEARRAY(mPlanes);
- mPlanes = new Plane[nb_planes];
+ mPlanes = new IcePlane[nb_planes];
}
mNbPlanes = nb_planes;
@@ -195,7 +195,7 @@ BOOL PlanesCollider::InitQuery(PlanesCache& cache, const Plane* planes, udword n // for(udword i=0;i<nb_planes;i++) mPlanes[i] = planes[i] * InvWorldM;
for(udword i=0;i<nb_planes;i++) TransformPlane(mPlanes[i], planes[i], InvWorldM);
}
- else CopyMemory(mPlanes, planes, nb_planes*sizeof(Plane));
+ else CopyMemory(mPlanes, planes, nb_planes*sizeof(IcePlane));
// 3) Setup destination pointer
mTouchedPrimitives = &cache.TouchedPrimitives;
@@ -523,7 +523,7 @@ HybridPlanesCollider::~HybridPlanesCollider() {
}
-bool HybridPlanesCollider::Collide(PlanesCache& cache, const Plane* planes, udword nb_planes, const HybridModel& model, const Matrix4x4* worldm)
+bool HybridPlanesCollider::Collide(PlanesCache& cache, const IcePlane* planes, udword nb_planes, const HybridModel& model, const Matrix4x4* worldm)
{
// We don't want primitive tests here!
mFlags |= OPC_NO_PRIMITIVE_TESTS;
|