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_LSSTriOverlap.h | |
| 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_LSSTriOverlap.h')
| -rw-r--r-- | Opcode/OPC_LSSTriOverlap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Opcode/OPC_LSSTriOverlap.h b/Opcode/OPC_LSSTriOverlap.h index b60ab88..39c9df8 100644 --- a/Opcode/OPC_LSSTriOverlap.h +++ b/Opcode/OPC_LSSTriOverlap.h @@ -150,7 +150,7 @@ static float OPC_PointTriangleSqrDist(const IcePoint& Point, const IcePoint& p0, return fabsf(fSqrDist);
}
-static float OPC_SegmentSegmentSqrDist(const Segment& rkSeg0, const Segment& rkSeg1)
+static float OPC_SegmentSegmentSqrDist(const IceSegment& rkSeg0, const IceSegment& rkSeg1)
{
// Hook
IcePoint rkSeg0Direction = rkSeg0.ComputeDirection();
@@ -347,12 +347,12 @@ static float OPC_SegmentSegmentSqrDist(const Segment& rkSeg0, const Segment& rkS return fabsf(fSqrDist);
}
-inline_ float OPC_SegmentRaySqrDist(const Segment& rkSeg0, const Ray& rkSeg1)
+inline_ float OPC_SegmentRaySqrDist(const IceSegment& rkSeg0, const Ray& rkSeg1)
{
- return OPC_SegmentSegmentSqrDist(rkSeg0, Segment(rkSeg1.mOrig, rkSeg1.mOrig + rkSeg1.mDir));
+ return OPC_SegmentSegmentSqrDist(rkSeg0, IceSegment(rkSeg1.mOrig, rkSeg1.mOrig + rkSeg1.mDir));
}
-static float OPC_SegmentTriangleSqrDist(const Segment& segment, const IcePoint& p0, const IcePoint& p1, const IcePoint& p2)
+static float OPC_SegmentTriangleSqrDist(const IceSegment& segment, const IcePoint& p0, const IcePoint& p1, const IcePoint& p2)
{
// Hook
const IcePoint TriEdge0 = p1 - p0;
|