AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-15 18:34:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

store tints more dynamically

Browse Source
This commit is contained in:
Bixilon 2021-04-06 18:59:04 +02:00
parent 697b704d2d
commit 4c1a9ba223
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/de/bixilon/minosoft/gui/rendering/TintColorCalculator.kt
View File

@ -26,12 +26,13 @@ import de.bixilon.minosoft.gui.rendering.textures.Texture
import glm_.vec3.Vec3i import glm_.vec3.Vec3i
class TintColorCalculator(val world: World) { class TintColorCalculator(val world: World) {
val colorMaps: MutableMap<ResourceLocation, Array<RGBColor>> = mutableMapOf()
private lateinit var grassColorMap: Array<RGBColor> private lateinit var grassColorMap: Array<RGBColor>
private lateinit var foliageColorMap: Array<RGBColor> private lateinit var foliageColorMap: Array<RGBColor>
fun init(assetsManager: MinecraftAssetsManager) { fun init(assetsManager: MinecraftAssetsManager) {
grassColorMap = assetsManager.readPixelArrayAsset(Texture.getResourceTextureIdentifier(textureName = "colormap/grass.png")) colorMaps[DEFAULT_GRASS_COLOR_MAP] = assetsManager.readPixelArrayAsset(Texture.getResourceTextureIdentifier(textureName = "colormap/grass.png"))
foliageColorMap = assetsManager.readPixelArrayAsset(Texture.getResourceTextureIdentifier(textureName = "colormap/foliage.png")) colorMaps[DEFAULT_FOLIAGE_COLOR_MAP] = assetsManager.readPixelArrayAsset(Texture.getResourceTextureIdentifier(textureName = "colormap/foliage.png"))
} }
fun getAverageTint(biome: Biome?, blockState: BlockState, blockPosition: Vec3i): RGBColor? { fun getAverageTint(biome: Biome?, blockState: BlockState, blockPosition: Vec3i): RGBColor? {
@ -85,10 +86,29 @@ class TintColorCalculator(val world: World) {
} }
private fun calculateTint(tint: ResourceLocation, biome: Biome, blockPosition: Vec3i): RGBColor? { private fun calculateTint(tint: ResourceLocation, biome: Biome, blockPosition: Vec3i): RGBColor? {
return when (tint) { return TINTS[tint]?.invoke(biome, blockPosition, colorMaps)
WATER_TINT_RESOURCE_LOCATION -> biome.waterColor }
GRASS_TINT_RESOURCE_LOCATION, SUGAR_CANE_TINT_RESOURCE_LOCATION, SHEARING_DOUBLE_PLANT_TINT_RESOURCE_LOCATION -> {
biome.grassColorOverride?.let { return it }
companion object {
val TINTS: MutableMap<ResourceLocation, (biome: Biome, blockPosition: Vec3i, colorMaps: Map<ResourceLocation, Array<RGBColor>>) -> RGBColor?> = mutableMapOf()
private val DEFAULT_GRASS_COLOR_MAP = ResourceLocation("minecraft:grass_colormap")
private val DEFAULT_FOLIAGE_COLOR_MAP = ResourceLocation("minecraft:grass_colormap")
private val WATER_TINT_RESOURCE_LOCATION = ResourceLocation("water_tint")
private val GRASS_TINT_RESOURCE_LOCATION = ResourceLocation("grass_tint")
private val SUGAR_CANE_TINT_RESOURCE_LOCATION = ResourceLocation("sugar_cane_tint")
private val SHEARING_DOUBLE_PLANT_TINT_RESOURCE_LOCATION = ResourceLocation("shearing_double_plant_tint")
private val FOLIAGE_TINT_RESOURCE_LOCATION = ResourceLocation("foliage_tint")
private val LILY_PAD_TINT_RESOURCE_LOCATION = ResourceLocation("lily_pad_tint")
init {
TINTS[WATER_TINT_RESOURCE_LOCATION] = { biome, _, _ ->
biome.waterColor
}
val grassTintCalculator = tint@{ biome: Biome, blockPosition: Vec3i, colorMaps: Map<ResourceLocation, Array<RGBColor>> ->
biome.grassColorOverride?.let { return@tint it }
val grassColorMap = colorMaps[DEFAULT_GRASS_COLOR_MAP]!!
val colorMapPixelIndex = biome.downfallColorMapCoordinate shl 8 or biome.temperatureColorMapCoordinate val colorMapPixelIndex = biome.downfallColorMapCoordinate shl 8 or biome.temperatureColorMapCoordinate
var color = if (colorMapPixelIndex > grassColorMap.size) { var color = if (colorMapPixelIndex > grassColorMap.size) {
@ -101,23 +121,21 @@ class TintColorCalculator(val world: World) {
} }
biome.grassColorModifier.modifier.invoke(color) biome.grassColorModifier.modifier.invoke(color)
} }
FOLIAGE_TINT_RESOURCE_LOCATION -> { TINTS[GRASS_TINT_RESOURCE_LOCATION] = grassTintCalculator
biome.foliageColorOverride?.let { return it } TINTS[SUGAR_CANE_TINT_RESOURCE_LOCATION] = grassTintCalculator
TINTS[SHEARING_DOUBLE_PLANT_TINT_RESOURCE_LOCATION] = grassTintCalculator
TINTS[FOLIAGE_TINT_RESOURCE_LOCATION] = tint@{ biome, blockPosition, colorMaps ->
biome.foliageColorOverride?.let { return@tint it }
val foliageColorMap = colorMaps[DEFAULT_FOLIAGE_COLOR_MAP]!!
foliageColorMap[biome.downfallColorMapCoordinate shl 8 or biome.getClampedTemperature(blockPosition.y)] foliageColorMap[biome.downfallColorMapCoordinate shl 8 or biome.getClampedTemperature(blockPosition.y)]
} }
LILY_PAD_TINT_RESOURCE_LOCATION -> RenderConstants.LILY_PAD_BLOCK_COLOR
else -> null
}
}
TINTS[LILY_PAD_TINT_RESOURCE_LOCATION] = { _, _, _ -> RenderConstants.LILY_PAD_BLOCK_COLOR }
companion object { }
private val WATER_TINT_RESOURCE_LOCATION = ResourceLocation("water_tint")
private val GRASS_TINT_RESOURCE_LOCATION = ResourceLocation("grass_tint")
private val SUGAR_CANE_TINT_RESOURCE_LOCATION = ResourceLocation("sugar_cane_tint")
private val SHEARING_DOUBLE_PLANT_TINT_RESOURCE_LOCATION = ResourceLocation("shearing_double_plant_tint")
private val FOLIAGE_TINT_RESOURCE_LOCATION = ResourceLocation("foliage_tint")
private val LILY_PAD_TINT_RESOURCE_LOCATION = ResourceLocation("lily_pad_tint")
fun getJsonColor(color: Int): RGBColor? { fun getJsonColor(color: Int): RGBColor? {