DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix Line2d.distanceTo

Browse Source
This commit is contained in:
DBotThePony 2024-05-06 14:18:38 +07:00
parent 79e606f609
commit 19038dea7d
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/ru/dbotthepony/kstarbound/math/Line2d.kt
View File

@ -163,7 +163,7 @@ data class Line2d(val p0: Vector2d, val p1: Vector2d) {
if (!infinite)
proj = proj.coerceIn(0.0, 1.0)
return (Vector2d(other) - p0 + difference * proj).length
return (Vector2d(other) - (p0 + difference * proj)).length
}
fun distanceTo(other: Vector2d, infinite: Boolean = false): Double {
@ -172,7 +172,7 @@ data class Line2d(val p0: Vector2d, val p1: Vector2d) {
if (!infinite)
proj = proj.coerceIn(0.0, 1.0)
return (other - p0 + difference * proj).length
return (other - (p0 + difference * proj)).length
}
class Adapter(gson: Gson) : TypeAdapter<Line2d>() {

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/WorldGeometry.kt
View File

@ -240,7 +240,7 @@ data class WorldGeometry(val size: Vector2i, val loopX: Boolean = true, val loop
fun nearestTo(source: IStruct2d, target: IStruct2d) = Vector2d(x.nearestTo(source.component1(), target.component1()), y.nearestTo(source.component2(), target.component2()))
fun polyDistance(poly: Poly, point: IStruct2d): Double {
return poly.distance(nearestTo(poly.centre, point))
return split(poly).minOf { it.distance(nearestTo(it.centre, point)) }
}
val splitLines: ImmutableList<Pair<Line2d, Pair<Vector2d, Vector2d>>> by lazy {