From 585a20542f1dcb7c708c404585c2323f9d2aaf57 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 25 May 2019 01:11:42 +0900 Subject: [PATCH] minor improvement --- src/net/torvald/terrarum/worlddrawer/Cvec.kt | 2 +- .../torvald/terrarum/worlddrawer/LightmapRendererNew.kt | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/net/torvald/terrarum/worlddrawer/Cvec.kt b/src/net/torvald/terrarum/worlddrawer/Cvec.kt index 64acd987c..032ae4968 100644 --- a/src/net/torvald/terrarum/worlddrawer/Cvec.kt +++ b/src/net/torvald/terrarum/worlddrawer/Cvec.kt @@ -28,7 +28,7 @@ This time I removed the TypeProfileLevel part. It now runs slightly faster than <> */ - //constructor(floatArray: FloatArray) : this(FloatVector.fromArray(SPECIES, floatArray, 0)) + constructor(floatArray: FloatArray) : this(FloatVector.fromArray(SPECIES, floatArray, 0)) constructor(r: Float, g: Float, b: Float, a: Float) : this(FloatVector.scalars(SPECIES, r, g, b, a)) constructor(scalar: Float) : this(FloatVector.scalars(SPECIES, scalar, scalar, scalar, scalar)) constructor() : this(FloatVector.zero(SPECIES)) diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt b/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt index 3d45b3b25..b491817c8 100644 --- a/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt +++ b/src/net/torvald/terrarum/worlddrawer/LightmapRendererNew.kt @@ -777,12 +777,8 @@ object LightmapRenderer { /** To eliminated visible edge on the gradient when 255/1023 is exceeded */ internal fun Cvec.normaliseToHDR(): Cvec { // equation: hdr(this.coerceIn) - return Cvec( - hdr(this.vec.lane(0).coerceIn(0f, 1f)), - hdr(this.vec.lane(1).coerceIn(0f, 1f)), - hdr(this.vec.lane(2).coerceIn(0f, 1f)), - hdr(this.vec.lane(3).coerceIn(0f, 1f)) - ) + val arr = this.vec.toArray().map { hdr(it.coerceIn(0f, 1f)) } + return Cvec(arr.toFloatArray()) } val histogram: Histogram