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

replacing min/max usage with kotlin's

Browse Source
This commit is contained in:
minjaesong
2023-07-11 01:54:46 +09:00
parent d96b7d1b84
commit 79f19120f2
66 changed files with 308 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/spriteassembler/ADProperties.kt
View File

@@ -8,6 +8,7 @@ import java.io.InputStream
import java.io.Reader
import java.io.StringReader
import java.util.*
import kotlin.math.max
internal data class Joint(val name: String, val position: ADPropertyObject.Vector2i) {
override fun toString() = "$name $position"
@@ -144,13 +145,13 @@ class ADProperties {
// if animFrames does not have our entry, add it.
// otherwise, max() against the existing value
if (animFrames.containsKey(animName)) {
animFrames[animName] = maxOf(animFrames[animName]!!, frameNumber)
animFrames[animName] = max(animFrames[animName]!!, frameNumber)
}
else {
animFrames[animName] = frameNumber
}
maxColFinder = maxOf(maxColFinder, frameNumber)
maxColFinder = max(maxColFinder, frameNumber)
}
}
// populate skeletons and animations
@@ -176,7 +177,7 @@ class ADProperties {
Skeleton(skeletonName, skeletonDef.toJoints())
)
maxRowFinder = maxOf(maxRowFinder, animations[s]!!.row)
maxRowFinder = max(maxRowFinder, animations[s]!!.row)
}
}