curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-14 07:36:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

somewhat successful walk/idle anim impl

Browse Source
This commit is contained in:
minjaesong
2019-01-04 17:44:22 +09:00
parent a8cb95ed74
commit 9bcf8fa478
14 changed files with 192 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/net/torvald/colourutil/CIEXYZUtil.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.colourutil
import com.jme3.math.FastMath
import com.badlogic.gdx.graphics.Color
import com.jme3.math.FastMath
/**
* Created by minjaesong on 2017-01-12.
@@ -11,25 +11,27 @@ object CIEXYZUtil {
/**
* 0..255 -> 0.0..1.0
*/
private val rgbLineariseLUT = Array<Float>(257, {
val step = minOf(it, 255) / 255f
private val rgbLinLUT = FloatArray(256) {
val step = it / 255f
if (step > 0.04045f)
((step + 0.055f) / 1.055f).powerOf(2.4f)
else step / 12.92f
})
}
/**
* 0..255 -> 0.0..1.0
*/
private val rgbUnLineariseLUT = Array<Float>(257, {
val step = minOf(it, 255) / 255f
private val rgbUnLinLUT = FloatArray(256) {
val step = it / 255f
if (step > 0.0031308f)
1.055f * step.powerOf(1f / 2.4f) - 0.055f
else
step * 12.92f
})
}
private val rgbToXyzLut_XR = FloatArray(256) { 0.4124564f * (it / 255f) }
@@ -65,8 +67,35 @@ object CIEXYZUtil {
fun Color.toXYZ(): CIEXYZ = RGB(this).toXYZ()
/**
* "Linearise" the sRGB triads. This use lookup table to speed up calculation.
* Integer values (1/255, 2/255, .. , 254/255, 255/255) are accurate but any values in between are
* linearly interpolated and thus slightly less accurate. Visually there's little-to-no difference,
* but may not optimal for rigorous maths.
*/
fun RGB.linearise(): RGB {
/*val newR = if (r > 0.04045f)
val out = floatArrayOf(0f, 0f, 0f)
for (i in 0..2) {
val value = when (i) {
0 -> this.r
1 -> this.g
2 -> this.b
else -> throw InternalError("Fuck you")
}
val step = value.clampOne() * 255f // 0.0 .. 255.0
val intStep = step.toInt() // 0 .. 255
val NeXTSTEP = minOf(intStep + 1, 255) // 1 .. 255
out[i] = interpolateLinear(step - intStep, rgbLinLUT[intStep], rgbLinLUT[NeXTSTEP])
}
return RGB(out[0], out[1], out[2], alpha)
}
/** Suitable for rigorous maths but slower */
fun RGB.lineariseSuper(): RGB {
val newR = if (r > 0.04045f)
((r + 0.055f) / 1.055f).powerOf(2.4f)
else r / 12.92f
val newG = if (g > 0.04045f)
@@ -77,28 +106,38 @@ object CIEXYZUtil {
else b / 12.92f
return RGB(newR, newG, newB, alpha)*/
return RGB(newR, newG, newB, alpha)
}
/**
* "Un-linearise" the RGB triads. That is, codes the linear RGB into sRGB. This use lookup table to speed up calculation.
* Integer values (1/255, 2/255, .. , 254/255, 255/255) are accurate but any values in between are
* linearly interpolated and thus slightly less accurate. Visually there's little-to-no difference,
* but may not optimal for rigorous maths.
*/
fun RGB.unLinearise(): RGB {
val out = floatArrayOf(0f, 0f, 0f)
for (i in 0..2) {
val value = when (i) {
0 -> this.r
1 -> this.g
2 -> this.b
else -> throw Exception("Fuck you")
else -> throw InternalError("Fuck you")
}
val step = value.clampOne() * 255f
val intStep = step.toInt()
val step = value.clampOne() * 255f // 0.0 .. 255.0
val intStep = step.toInt() // 0 .. 255
val NeXTSTEP = minOf(intStep + 1, 255) // 1 .. 255
out[i] = interpolateLinear(step - intStep, rgbLineariseLUT[intStep], rgbLineariseLUT[intStep + 1])
out[i] = interpolateLinear(step - intStep, rgbUnLinLUT[intStep], rgbUnLinLUT[NeXTSTEP])
}
return RGB(out[0], out[1], out[2], alpha)
}
fun RGB.unLinearise(): RGB {
/*val newR = if (r > 0.0031308f)
/** Suitable for rigorous maths but slower */
fun RGB.unLineariseSuper(): RGB {
val newR = if (r > 0.0031308f)
1.055f * r.powerOf(1f / 2.4f) - 0.055f
else
r * 12.92f
@@ -112,24 +151,7 @@ object CIEXYZUtil {
b * 12.92f
return RGB(newR, newG, newB, alpha)*/
val out = floatArrayOf(0f, 0f, 0f)
for (i in 0..2) {
val value = when (i) {
0 -> this.r
1 -> this.g
2 -> this.b
else -> throw Exception("Fuck you")
}
val step = value.clampOne() * 255f
val intStep = step.toInt()
out[i] = interpolateLinear(step - intStep, rgbUnLineariseLUT[intStep], rgbUnLineariseLUT[intStep + 1])
}
return RGB(out[0], out[1], out[2], alpha)
return RGB(newR, newG, newB, alpha)
}
fun RGB.toXYZ(): CIEXYZ {

16
src/net/torvald/colourutil/ColourUtil.kt
View File

@@ -1,7 +1,8 @@
package net.torvald.colourutil
import com.jme3.math.FastMath
import com.badlogic.gdx.graphics.Color
import com.jme3.math.FastMath
import net.torvald.colourutil.CIEXYZUtil.linearise
/**
* Created by minjaesong on 2016-07-26.
@@ -20,4 +21,17 @@ object ColourUtil {
return Color(r, g, b, a)
}
/** Get luminosity level using CIEXYZ colour space. Slow but accurate. */
fun RGB.getLuminosity(): Float {
val new = this.linearise()
return 0.2126729f * new.r + 0.7151522f * new.g + 0.0721750f * new.b // from RGB.toXYZ
}
/** Get luminosity level using CIEXYZ colour space. Slow but accurate. */
fun Color.getLuminosity() = RGB(this).getLuminosity()
/** Get luminosity level using NTSC standard. Fast, less accurate but should be good enough. */
fun RGB.getLuminosityQuick() = 0.3f * this.r + 0.59f * this.g + 0.11f * this.b // NTSC standard
/** Get luminosity level using NTSC standard. Fast, less accurate but should be good enough. */
fun Color.getLuminosityQuick() = 0.3f * this.r + 0.59f * this.g + 0.11f * this.b // NTSC standard
}