From d3bf27e8db5b60284300b4cfff8ef0445736784e Mon Sep 17 00:00:00 2001 From: minjaesong Date: Thu, 5 Dec 2019 10:34:52 +0900 Subject: [PATCH] lightmaprenderer: removing minOf() --- src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt | 2 +- src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt b/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt index 2b39c702a..723207663 100644 --- a/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt +++ b/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt @@ -71,7 +71,7 @@ internal object LightmapHDRMap : Disposable { 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, - 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f // isn't it beautiful? + 1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f,1.0000f, 1f // isn't it beautiful? ) val ptr = UnsafeHelper.allocate(4L * THE_LUT.size) diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt b/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt index 68ce71fba..4edac3966 100644 --- a/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt @@ -734,7 +734,7 @@ object LightmapRenderer { // input: 0..1 for int 0..1023 private fun hdr(intensity: Float): Float { val intervalStart = (intensity * CHANNEL_MAX).floorInt() - val intervalEnd = minOf(LightmapHDRMap.lastIndex, (intensity * CHANNEL_MAX).floorInt() + 1) + val intervalEnd = (intensity * CHANNEL_MAX).floorInt() + 1 if (intervalStart == intervalEnd) return LightmapHDRMap[intervalStart]