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_RayCollider.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Opcode/OPC_RayCollider.cpp') diff --git a/Opcode/OPC_RayCollider.cpp b/Opcode/OPC_RayCollider.cpp index 875ae12..c0389f6 100644 --- a/Opcode/OPC_RayCollider.cpp +++ b/Opcode/OPC_RayCollider.cpp @@ -412,7 +412,7 @@ BOOL RayCollider::InitQuery(const Ray& world_ray, const Matrix4x4* world, udword } #else // New code - // We handle both Segment/ray queries with the same segment code, and a possible infinite limit + // We handle both IceSegment/ray queries with the same segment code, and a possible infinite limit SEGMENT_PRIM(*face_id, OPC_TEMPORAL_CONTACT) // Return immediately if possible @@ -423,7 +423,7 @@ BOOL RayCollider::InitQuery(const Ray& world_ray, const Matrix4x4* world, udword // Precompute data (moved after temporal coherence since only needed for ray-AABB) if(IR(mMaxDist)!=IEEE_MAX_FLOAT) { - // For Segment-AABB overlap + // For IceSegment-AABB overlap mData = 0.5f * mDir * mMaxDist; mData2 = mOrigin + mData; @@ -492,7 +492,7 @@ bool RayCollider::Collide(const Ray& world_ray, const AABBTree* tree, Container& /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// void RayCollider::_SegmentStab(const AABBCollisionNode* node) { - // Perform Segment-AABB overlap test + // Perform IceSegment-AABB overlap test if(!SegmentAABBOverlap(node->mAABB.mCenter, node->mAABB.mExtents)) return; if(node->IsLeaf()) @@ -522,7 +522,7 @@ void RayCollider::_SegmentStab(const AABBQuantizedNode* node) const IcePoint Center(float(Box.mCenter[0]) * mCenterCoeff.x, float(Box.mCenter[1]) * mCenterCoeff.y, float(Box.mCenter[2]) * mCenterCoeff.z); const IcePoint Extents(float(Box.mExtents[0]) * mExtentsCoeff.x, float(Box.mExtents[1]) * mExtentsCoeff.y, float(Box.mExtents[2]) * mExtentsCoeff.z); - // Perform Segment-AABB overlap test + // Perform IceSegment-AABB overlap test if(!SegmentAABBOverlap(Center, Extents)) return; if(node->IsLeaf()) @@ -547,7 +547,7 @@ void RayCollider::_SegmentStab(const AABBQuantizedNode* node) /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// void RayCollider::_SegmentStab(const AABBNoLeafNode* node) { - // Perform Segment-AABB overlap test + // Perform IceSegment-AABB overlap test if(!SegmentAABBOverlap(node->mAABB.mCenter, node->mAABB.mExtents)) return; if(node->HasPosLeaf()) @@ -578,7 +578,7 @@ void RayCollider::_SegmentStab(const AABBQuantizedNoLeafNode* node) const IcePoint Center(float(Box.mCenter[0]) * mCenterCoeff.x, float(Box.mCenter[1]) * mCenterCoeff.y, float(Box.mCenter[2]) * mCenterCoeff.z); const IcePoint Extents(float(Box.mExtents[0]) * mExtentsCoeff.x, float(Box.mExtents[1]) * mExtentsCoeff.y, float(Box.mExtents[2]) * mExtentsCoeff.z); - // Perform Segment-AABB overlap test + // Perform IceSegment-AABB overlap test if(!SegmentAABBOverlap(Center, Extents)) return; if(node->HasPosLeaf()) -- cgit v1.1