curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

removing redundant maths ops on hitbox intersect detection with ROUNDWORLD

Browse Source
This commit is contained in:
minjaesong
2022-07-28 23:40:55 +09:00
parent d7d3e430ef
commit 8b2cabcbdc
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/torvald/terrarum/gameactors/Hitbox.kt
View File

@@ -159,14 +159,17 @@ class Hitbox {
}
/** *ROUNDWORLD*-aware version of intersects(Double, Double). */
fun containsPoint(worldWidth: Double, x: Double, y: Double) = intersects(x, y) || intersects(x + worldWidth, y) || intersects(x - worldWidth, y)
fun containsPoint(worldWidth: Double, x: Double, y: Double) =
((x in startX..endX) || (x + worldWidth in startX..endX) || (x - worldWidth in startX..endX)) && (y in startY..endY)
/** *ROUNDWORLD*-aware version of intersects(Poind2d). */
fun containsPoint(worldWidth: Double, p: Point2d) = containsPoint(worldWidth, p.x, p.y)
/** *ROUNDWORLD*-aware version of intersects(Hitbox). */
fun containsHitbox(worldWidth: Double, other: Hitbox): Boolean {
val osx = other.startX; val osy = other.startY; val oex = other.endX; val oey = other.endY // to avoid redundant maths operations
return intersects(osx, osy, oex, oey) || intersects(osx + worldWidth, osy, oex + worldWidth, oey) || intersects(osx - worldWidth, osy, oex - worldWidth, oey)
}
fun containsHitbox(worldWidth: Double, other: Hitbox) =
(
(this.endX >= other.startX && other.endX >= this.startX) ||
(this.endX >= other.startX + worldWidth && other.endX + worldWidth >= this.startX) ||
(this.endX >= other.startX - worldWidth && other.endX - worldWidth >= this.startX)
) && (this.endY >= other.startY && other.endY >= this.startY)
fun intersects(px: Double, py: Double) =
(px in startX..endX) &&