2ndbeam/ktheightmap
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved GetHeightsMul algorithm

Browse source
This commit is contained in:
Alexey 2025-11-11 13:04:45 +03:00
commit 4ecdbb1c48
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/com/mirenkov/ktheightmap/MapCanvas.kt
View file

@ -33,6 +33,7 @@ import com.mirenkov.ktheightmap.Config.Companion.MAP_START_OFFSET_X
import com.mirenkov.ktheightmap.Config.Companion.MAP_START_OFFSET_Y import com.mirenkov.ktheightmap.Config.Companion.MAP_START_OFFSET_Y
import com.mirenkov.ktheightmap.parser.KhmParser import com.mirenkov.ktheightmap.parser.KhmParser
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
import kotlin.math.ceil
import kotlin.math.floor import kotlin.math.floor
import kotlin.math.min import kotlin.math.min
import kotlin.math.pow import kotlin.math.pow
@ -257,7 +258,7 @@ fun DrawScope.drawPointInfo(
val latDiff = lat - pointLat val latDiff = lat - pointLat
val lonDiff = lon - pointLon val lonDiff = lon - pointLon
val distance = sqrt((latDiff).pow(2) + (lonDiff).pow(2)) val distance = sqrt((latDiff).pow(2) + (lonDiff).pow(2))
val valuesCount = min(floor(distance / valueDistance).toInt(),1000) val valuesCount = min(ceil(distance / valueDistance).toInt(), 1000)
val array: Array<Pair<Float, Float>> = Array(valuesCount) { step -> val array: Array<Pair<Float, Float>> = Array(valuesCount) { step ->
val interCoef = 1F - step.toFloat() / valuesCount val interCoef = 1F - step.toFloat() / valuesCount
Pair(lon - lonDiff * interCoef, lat - latDiff * interCoef) Pair(lon - lonDiff * interCoef, lat - latDiff * interCoef)

8
app/src/main/java/com/mirenkov/ktheightmap/parser/KhmParser.kt
View file

@ -122,10 +122,14 @@ class KhmParser {
return Pair( return Pair(
UShortArray(coords.size) { i -> UShortArray(coords.size) { i ->
if (cutOffsets[i] > 0) { when {
(cutOffsets[i] > 0) -> {
dis.skipBytes(cutOffsets[i]) dis.skipBytes(cutOffsets[i])
dis.readUnsignedShort().toUShort() dis.readUnsignedShort().toUShort()
} else 0u }, }
(cutOffsets[i] == 0) -> {dis.readUnsignedShort().toUShort()}
else -> 0u
} },
if (reversed) coords else coords.reversed().toTypedArray()) if (reversed) coords else coords.reversed().toTypedArray())
} }
} }