text width update on render

odtheking · Apr 30, 2024 · 61da845 · 61da845
1 parent 0b9f2da
commit 61da845
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/odinmain/src/main/kotlin/com/github/stivais/ui/elements/impl/Text.kt b/odinmain/src/main/kotlin/com/github/stivais/ui/elements/impl/Text.kt
@@ -20,23 +20,30 @@ class Text(
         set(value) {
             if (field == value) return
             field = value
-            (constraints.width as Pixel).pixels = renderer.textWidth(value, height)
-
+            needsUpdate = true
+//            (constraints.width as Pixel).pixels = renderer.textWidth(value, height)
         }
 
+    private var needsUpdate = true
+
     init {
         this.color = textColor
 
         onInitialization {
-            // needs size to be set
-            parent?.position()
-            val width = renderer.textWidth(text, height)
-            (this.constraints.width as Pixel).pixels = width
-            this.width = width
+//            // needs size to be set
+//            parent?.position()
+//            val width = renderer.textWidth(text, height)
+//            (this.constraints.width as Pixel).pixels = width
+//            this.width = width
         }
     }
 
     override fun draw() {
+        if (needsUpdate) {
+            parent?.position() // sub optimal
+            (constraints.width as Pixel).pixels = renderer.textWidth(text, height)
+            needsUpdate = false
+        }
         renderer.text(text, x, y, height, color!!.rgba)
     }
 }
diff --git a/odinmain/src/main/kotlin/com/github/stivais/ui/renderer/NVGRenderer.kt b/odinmain/src/main/kotlin/com/github/stivais/ui/renderer/NVGRenderer.kt
@@ -4,6 +4,7 @@ import com.github.stivais.ui.color.alpha
 import com.github.stivais.ui.color.blue
 import com.github.stivais.ui.color.green
 import com.github.stivais.ui.color.red
+import net.minecraft.client.renderer.GlStateManager
 import org.apache.commons.io.IOUtils
 import org.lwjgl.nanovg.NVGColor
 import org.lwjgl.nanovg.NanoVG.*
@@ -31,13 +32,15 @@ object NVGRenderer : Renderer {
     override fun beginFrame(width: Float, height: Float) {
         if (drawing) throw IllegalStateException("Already drawing, but called NVGRenderer beginFrame")
         drawing = true
+        GlStateManager.disableCull()
         nvgBeginFrame(vg, width, height, 1f)
     }
 
     override fun endFrame() {
         if (!drawing) throw IllegalStateException("Not drawing, but called NVGRenderer endFrame")
         nvgEndFrame(vg)
         drawing = false
+        GlStateManager.enableCull()
     }
 
     override fun rect(x: Float, y: Float, w: Float, h: Float, color: Int) {
@@ -83,18 +86,19 @@ object NVGRenderer : Renderer {
     override fun text(text: String, x: Float, y: Float, size: Float, color: Int) {
         nvgBeginPath(vg)
         nvgFontSize(vg, size)
-        nvgFontFace(vg, tempFont.name)
+        nvgFontFaceId(vg, tempFont.id)
         nvgTextAlign(vg, NVG_ALIGN_LEFT or NVG_ALIGN_TOP)
         val nvgColor = color(color)
         nvgFillColor(vg, nvgColor)
         nvgText(vg, x, y, text)
+        nvgClosePath(vg)
         nvgColor.free()
     }
 
     override fun textWidth(text: String, size: Float): Float {
         val bounds = FloatArray(4)
         nvgFontSize(vg, size)
-        nvgFontFace(vg, tempFont.name)
+        nvgFontFaceId(vg, tempFont.id)
         return nvgTextBounds(vg, 0f, 0f, text, bounds)
     }
 
@@ -106,16 +110,17 @@ object NVGRenderer : Renderer {
 
     class NVGFont(val name: String, path: String) {
 
-        val id: Int
+        var id: Int = -1
 
         init {
             val stream = this::class.java.getResourceAsStream(path) ?: throw FileNotFoundException(path)
             val bytes =  IOUtils.toByteArray(stream)
+            stream.close()
             val data = ByteBuffer.allocateDirect(bytes.size).order(ByteOrder.nativeOrder()).put(bytes)
             data.flip()
             id = nvgCreateFontMem(vg, name, data, false)
+            require(id != -1) { "Font failed to initialize" }
             println("!!! $id font id")
-            stream.close()
         }
     }
 }