fix block outline rendering

Author: Bixilon

src/main/java/de/bixilon/minosoft/data/text/formatting/color/RGBAColor.kt

@@ -13,8 +13,6 @@
 
 package de.bixilon.minosoft.data.text.formatting.color
 
-import glm_.vec3.Vec3
-import glm_.vec4.Vec4
 import de.bixilon.kutil.primitive.IntUtil.toHex
 import de.bixilon.minosoft.data.text.ChatComponent
 import de.bixilon.minosoft.data.text.TextComponent
@@ -24,16 +22,16 @@ import de.bixilon.minosoft.data.text.formatting.color.Color.Companion.MASK
 import de.bixilon.minosoft.data.text.formatting.color.Color.Companion.MAX
 import de.bixilon.minosoft.data.text.formatting.color.Color.Companion.TIMES
 import de.bixilon.minosoft.data.text.formatting.color.Color.Companion.clamp
+import glm_.vec3.Vec3
+import glm_.vec4.Vec4
 
 
 @JvmInline
 value class RGBAColor(val rgba: Int) : Color, TextFormattable {
 
-    constructor(red: Int, green: Int, blue: Int) : this(red, green, blue, MAX)
-    constructor(red: Int, green: Int, blue: Int, alpha: Int) : this(((alpha.clamp() and MASK) shl ALPHA_SHIFT) or ((red.clamp() and MASK) shl RED_SHIFT) or ((green.clamp() and MASK) shl GREEN_SHIFT) or ((blue.clamp() and MASK) shl BLUE_SHIFT))
+    constructor(red: Int, green: Int, blue: Int, alpha: Int = MAX) : this(((alpha.clamp() and MASK) shl ALPHA_SHIFT) or ((red.clamp() and MASK) shl RED_SHIFT) or ((green.clamp() and MASK) shl GREEN_SHIFT) or ((blue.clamp() and MASK) shl BLUE_SHIFT))
 
-    constructor(red: Float, green: Float, blue: Float) : this(Color.fromFloat(red), Color.fromFloat(green), Color.fromFloat(blue))
-    constructor(red: Float, green: Float, blue: Float, alpha: Float) : this(Color.fromFloat(red), Color.fromFloat(green), Color.fromFloat(blue), Color.fromFloat(alpha))
+    constructor(red: Float, green: Float, blue: Float, alpha: Float = 1.0f) : this(Color.fromFloat(red), Color.fromFloat(green), Color.fromFloat(blue), Color.fromFloat(alpha))
 
     override inline val red: Int get() = (rgba ushr RED_SHIFT) and MASK
     override inline val green: Int get() = (rgba ushr GREEN_SHIFT) and MASK

src/main/java/de/bixilon/minosoft/gui/rendering/util/mesh/LineMesh.kt

@@ -13,8 +13,6 @@
 
 package de.bixilon.minosoft.gui.rendering.util.mesh
 
-import glm_.vec3.Vec3
-import glm_.vec3.Vec3d
 import de.bixilon.kutil.exception.Broken
 import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.registries.shapes.aabb.AABB
@@ -26,6 +24,8 @@ import de.bixilon.minosoft.gui.rendering.models.util.CuboidUtil
 import de.bixilon.minosoft.gui.rendering.system.base.MeshUtil.buffer
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.minus
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.minus
+import glm_.vec3.Vec3
+import glm_.vec3.Vec3d
 
 open class LineMesh(context: RenderContext, initialCacheSize: Int = 1000) : GenericColorMesh(context, initialCacheSize = initialCacheSize) {
 
@@ -70,7 +70,7 @@ open class LineMesh(context: RenderContext, initialCacheSize: Int = 1000) : Gene
     }
 
     fun tryDrawLine(startX: Float, startY: Float, startZ: Float, endX: Float, endY: Float, endZ: Float, lineWidth: Float = RenderConstants.DEFAULT_LINE_WIDTH, color: RGBAColor, shape: Shape? = null) {
-        if (shape != null) { // && !shape.shouldDrawLine(startX, startY, startZ, endX, endY, endZ)
+        if (shape != null && !shape.shouldDrawLine(Vec3(startX, startY, startZ), Vec3(endX, endY, endZ))) {
             return
         }
         drawLine(startX, startY, startZ, endX, endY, endZ, lineWidth, color)