curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-20 15:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixing bug where the hitbox won't change when actor is rescaled, wip issue #34

Browse Source
This commit is contained in:
minjaesong
2020-03-10 06:52:40 +09:00
parent 48b431f4b7
commit 7345a1015f
6 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,9 +33,21 @@ class Hitbox (x1: Double, y1: Double, width: Double, height: Double, var suppres
}
}
override fun toString(): String {
return "[$hitboxStart - $hitboxEnd]"
}
val startX: Double
get() = hitboxStart.x
val startY: Double
get() = hitboxStart.y
val endX: Double
get() = hitboxStart.x + width
val endY: Double
get() = hitboxStart.y + height
val centeredX: Double
get() = hitboxStart.x + width * 0.5
val centeredY: Double
get() = hitboxStart.y + height * 0.5
/**
* @return bottom-centered point of hitbox.
@@ -49,11 +61,6 @@ class Hitbox (x1: Double, y1: Double, width: Double, height: Double, var suppres
inline val canonicalY: Double
get() = endY
val endX: Double
get() = hitboxStart.x + width
val endY: Double
get() = hitboxStart.y + height
/**
* Set to the point top left
* @param x1
@@ -111,34 +118,31 @@ class Hitbox (x1: Double, y1: Double, width: Double, height: Double, var suppres
return this
}
/**
* For initial setup only. Use CanonicalResize for graceful resizing
*/
fun setDimension(w: Double, h: Double): Hitbox {
width = w
height = h
return this
}
fun canonicalResize(w: Double, h: Double): Hitbox {
// sx_1 + 0.5w_1 = sx_2 + 0.5w_2 // equals because the final point must not move. sx_1: old start-x, sx_2: new start-x which is what we want
// sx_2 = sx_1 + 0.5w_1 - 0.5w_2 // move variables to right-hand side to derive final value sx_2
hitboxStart.set(
startX + 0.5 * width - 0.5 * w,
startY + height - h
)
width = w
height = h
return this
}
fun containsPoint(x: Double, y: Double) = (hitboxStart.x - x) in 0.0..width && (hitboxStart.y - y) in 0.0..height
fun containsPoint(p: Point2d) = containsPoint(p.x, p.y)
/**
* Returns x value of start point
* @return top-left point startX
*/
val startX: Double
get() = hitboxStart.x
/**
* Returns y value of start point
* @return top-left point startY
*/
val startY: Double
get() = hitboxStart.y
val centeredX: Double
get() = hitboxStart.x + width * 0.5
val centeredY: Double
get() = hitboxStart.y + height * 0.5
infix fun intersects(position: Point2d) =
(position.x >= startX && position.x <= startX + width) &&
@@ -162,4 +166,8 @@ class Hitbox (x1: Double, y1: Double, width: Double, height: Double, var suppres
this.width == other.width &&
this.height == other.height
}
override fun toString(): String {
return "[$hitboxStart - $hitboxEnd]"
}
}