primitive shader delegates, some shader cleanup

Author: Bixilon

src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmRenderer.kt

@@ -97,7 +97,7 @@ class ArmRenderer(override val context: RenderContext) : Renderer, Drawable {
         shader.use()
         shader.skinParts = renderer.model?.skinParts ?: 0xFF
         shader.texture = renderer.skin?.shaderId ?: context.textures.debugTexture.shaderId
-        shader.tint = ChatColors.WHITE
+        shader.tint = ChatColors.WHITE.rgb()
 
         val pivot = Vec3f((if (arm == Arms.RIGHT) 6f else -6f) / 16f, 24 / 16f, 0f)
 

src/main/java/de/bixilon/minosoft/gui/rendering/camera/arm/ArmShader.kt

@@ -24,7 +24,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureManager
 class ArmShader(override val native: NativeShader) : Shader(), TintedShader, TextureShader {
     override var textures: TextureManager by textureManager()
     var texture by uniform("uIndexLayerAnimation", 0x00, NativeShader::setUInt)
-    override var tint by uniform("uTintColor", ChatColors.WHITE) { shader, name, value -> shader.setUInt(name, value.rgb) }
+    override var tint by uniform("uTintColor", ChatColors.WHITE.rgb())
     var skinParts by uniform("uSkinParts", 0xFF, NativeShader::setUInt)
     var transform by uniform("uTransform", Mat4f.EMPTY)
 }

src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderShader.kt

@@ -24,13 +24,13 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureManager
 
 class WorldBorderShader(
     override val native: NativeShader,
-) : Shader(), TextureShader, ViewProjectionShader, FogShader, CameraPositionShader, TintedShader {
+) : Shader(), TextureShader, ViewProjectionShader, FogShader, CameraPositionShader {
     override var textures: TextureManager by textureManager()
     override var viewProjectionMatrix: Mat4f by viewProjectionMatrix()
     override var cameraPosition: Vec3f by cameraPosition()
     override var fog: FogManager by fog()
 
-    override var tint by uniform("uTintColor", ChatColors.BLACK)
+    var tint by uniform("uTintColor", ChatColors.BLACK)
 
     var textureIndexLayer by uniform("uIndexLayerAnimation", 0, NativeShader::setUInt)
     var textureOffset by uniform("uTextureOffset", 0.0f)

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt

@@ -72,7 +72,7 @@ open class SkeletalFeature(
     }
 
     override fun draw() {
-        var tint = renderer.light.value.rgba()
+        var tint = renderer.light.value
         if (renderer is LivingEntityRenderer<*>) {
             tint *= renderer.damage.value
         }

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockFeature.kt

@@ -79,7 +79,7 @@ open class BlockFeature(
     protected open fun draw(mesh: BlockMesh, shader: BlockShader) {
         shader.use()
         shader.matrix = matrix.unsafe
-        shader.tint = renderer.light.value.rgba()
+        shader.tint = renderer.light.value
         super.draw(mesh)
     }
 

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/BlockShader.kt

@@ -33,5 +33,5 @@ open class BlockShader(
     override var cameraPosition: Vec3f by cameraPosition()
     override var fog: FogManager by fog()
     var matrix: Mat4f by uniform("uMatrix", Mat4f())
-    override var tint by uniform("uTintColor", ChatColors.WHITE) { shader, name, value -> shader.setUInt(name, value.rgb) }
+    override var tint by uniform("uTintColor", ChatColors.WHITE.rgb()) { shader, name, value -> shader.setUInt(name, value.rgb) }
 }

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/flashing/FlashingBlockFeature.kt

@@ -17,6 +17,7 @@ import de.bixilon.kmath.vec.vec3.f.Vec3f
 import de.bixilon.minosoft.data.registries.blocks.state.BlockState
 import de.bixilon.minosoft.data.text.formatting.color.ChatColors
 import de.bixilon.minosoft.data.text.formatting.color.RGBAColor
+import de.bixilon.minosoft.data.text.formatting.color.RGBColor
 import de.bixilon.minosoft.gui.rendering.entities.feature.block.BlockFeature
 import de.bixilon.minosoft.gui.rendering.entities.feature.block.BlockMesh
 import de.bixilon.minosoft.gui.rendering.entities.feature.block.BlockShader
@@ -29,7 +30,7 @@ open class FlashingBlockFeature(
     renderer: EntityRenderer<*>,
     state: BlockState?,
     scale: Vec3f = DEFAULT_SCALE,
-    var flashColor: RGBAColor = ChatColors.WHITE,
+    var flashColor: RGBColor = ChatColors.WHITE.rgb(),
     var flashInterval: Float = 0.2f,
     var maxFlash: Float = 0.5f
 ) : BlockFeature(renderer, state, scale) {

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/block/flashing/FlashingBlockShader.kt

@@ -1,6 +1,6 @@
 /*
  * Minosoft
- * Copyright (C) 2020-2023 Moritz Zwerger
+ * Copyright (C) 2020-2025 Moritz Zwerger
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  *
@@ -20,6 +20,6 @@ import de.bixilon.minosoft.gui.rendering.system.base.shader.NativeShader
 class FlashingBlockShader(
     native: NativeShader,
 ) : BlockShader(native) {
-    var flashColor by uniform("uFlashColor", ChatColors.WHITE) { shader, name, value -> shader.setUInt(name, value.rgb) }
+    var flashColor by uniform("uFlashColor", ChatColors.WHITE.rgb())
     var flashProgress by uniform("uFlashProgress", 0.0f)
 }

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/item/ItemFeature.kt

@@ -116,7 +116,7 @@ open class ItemFeature(
     protected open fun draw(mesh: BlockMesh, shader: BlockShader) {
         shader.use()
         shader.matrix = matrix.unsafe
-        shader.tint = renderer.light.value.rgba()
+        shader.tint = renderer.light.value
         super.draw(mesh)
     }
 

src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/text/BillboardTextFeature.kt

@@ -103,7 +103,7 @@ open class BillboardTextFeature(
         val shader = renderer.renderer.features.text.shader
         shader.use()
         shader.matrix = matrix.unsafe
-        shader.tint = renderer.light.value.rgba()
+        shader.tint = renderer.light.value
         super.draw(mesh)
     }