fix crashes and radii issue

Author: nextdayy

gradle/libs.versions.toml

@@ -7,7 +7,7 @@ kotlinx-coroutines = "1.10.2"
 kotlinx-atomicfu = "0.29.0"
 fabric-language-kotlin = "1.13.5+kotlin.2.2.10"
 google-ksp = "2.2.10-2.0.2"
-polyui = "2.0.5"
+polyui = "2.0.6"
 annotations = "24.1.0"
 hypixel-modapi = "1.0.1"
 hypixel-data = "0.2.0" # Dep of hypixel-modapi

modules/config-impl/src/main/java/org/polyfrost/oneconfig/api/config/v1/ConfigManager.java

@@ -37,6 +37,7 @@
 import org.polyfrost.oneconfig.api.config.v1.collect.PropertyCollector;
 import org.polyfrost.oneconfig.api.config.v1.collect.impl.OneConfigCollector;
 import org.polyfrost.oneconfig.api.config.v1.serialize.ObjectSerializer;
+import org.polyfrost.oneconfig.api.config.v1.serialize.adapter.impl.FontAdapter;
 import org.polyfrost.oneconfig.api.config.v1.serialize.adapter.impl.PolyColorAdapter;
 import org.polyfrost.oneconfig.api.config.v1.serialize.adapter.impl.Vec4Adapter;
 import org.polyfrost.oneconfig.api.config.v1.serialize.impl.FileSerializer;
@@ -64,6 +65,7 @@ public final class ConfigManager {
 
     static {
         ObjectSerializer.INSTANCE.registerTypeAdapter(new PolyColorAdapter());
+        ObjectSerializer.INSTANCE.registerTypeAdapter(new FontAdapter());
         ObjectSerializer.INSTANCE.registerTypeAdapter(new Vec4Adapter());
         registerCollector(new OneConfigCollector());
     }

modules/config-impl/src/main/java/org/polyfrost/oneconfig/api/config/v1/serialize/adapter/impl/FontAdapter.java

@@ -0,0 +1,26 @@
+package org.polyfrost.oneconfig.api.config.v1.serialize.adapter.impl;
+
+import org.polyfrost.oneconfig.api.config.v1.serialize.adapter.Adapter;
+import org.polyfrost.polyui.data.Font;
+
+public class FontAdapter extends Adapter <Font, String> {
+    @Override
+    public Font deserialize(String in) {
+        return Font.of(in);
+    }
+
+    @Override
+    public String serialize(Font in) {
+        return in.getResourcePath();
+    }
+
+    @Override
+    public Class<Font> getTargetClass() {
+        return Font.class;
+    }
+
+    @Override
+    public Class<String> getOutputClass() {
+        return String.class;
+    }
+}

modules/config-impl/src/main/kotlin/org/polyfrost/oneconfig/api/config/v1/Visualizer.kt

@@ -230,7 +230,7 @@ fun interface Visualizer {
                 placeholder = placeholder,
                 image = "assets/oneconfig/ico/text.svg".image(),
                 size = Vec2(200f, 32f),
-                value = state,
+                value = state.value.toFloat().toString(dps = 2),
                 post = unit
             )
             s.getTextFromBoxedTextInput().numeric(min, max, state)

modules/config-impl/src/main/kotlin/org/polyfrost/oneconfig/api/config/v1/internal/ConfigVisualizer.kt

@@ -269,7 +269,6 @@ open class ConfigVisualizer {
         var contentHeight = -1f
         // asm: signature as it prevents re-wrapping of function
         val openInsn: Drawable.(Any?) -> Unit = {
-            open.value = !open.value
             val arrow = if (enabled != null) this[1][1] else this[1]
             val anim = Animations.Default.create(0.6.seconds)
             Rotate(arrow, if (!open.value) PI else 0.0, false, anim).add()
@@ -292,13 +291,13 @@ open class ConfigVisualizer {
                     size = 21f,
                     state = open
                 ).onChange(open) {
-                    enabled?.setAs(it)
+                    enabled?.set(it)
                     if (open.value != it) (parent.parent as Drawable).openInsn(null)
                 },
                 Image("polyui/chevron-down.svg").also { it.rotation = PI }
             )
             // lmao
-            open.value = !open.value
+            //open.value = !open.value
             @Suppress("UNCHECKED_CAST") // reason: #already-type-checked
             enabled = e as Property<Boolean>
         } else {

modules/ui/src/main/kotlin/org/polyfrost/oneconfig/api/ui/v1/internal/GLRendererImpl.kt

@@ -100,7 +100,6 @@ class GLRendererImpl(private val nsvg: NanoSvgApi, private val stb: StbApi) : Re
 
     // Current batch state
     private var count = 0
-    private var curTex = 0
     private var transformDepth = 0
     private var scissorDepth = 0
     private var transform = IDENTITY.copyOf()
@@ -145,9 +144,9 @@ class GLRendererImpl(private val nsvg: NanoSvgApi, private val stb: StbApi) : Re
             float py = step(0.0, p.y);
 
             // Select radius per quadrant
-            float rLeft  = mix(r.w, r.x, py); // bottom-left / top-left
-            float rRight = mix(r.z, r.y, py); // bottom-right / top-right
-            float radius = mix(rLeft, rRight, px);
+            float rLeft  = mix(r.x, r.w, py); // top-left / bottom-left
+            float rRight = mix(r.y, r.z, py); // top-right / bottom-right
+            float radius = mix(rLeft, rRight, px); // left vs right
 
             vec2 q = abs(p) - (b - radius);
             return length(max(q, 0.0)) + min(max(q.x, q.y), 0.0) - radius;
@@ -467,7 +466,7 @@ class GLRendererImpl(private val nsvg: NanoSvgApi, private val stb: StbApi) : Re
         }
 
         glActiveTexture(GL_TEXTURE0)
-        glBindTexture(GL_TEXTURE_2D, curTex)
+        glBindTexture(GL_TEXTURE_2D, atlas)
 
         // Quad attrib
         glBindBuffer(GL_ARRAY_BUFFER, quadVbo)
@@ -596,8 +595,6 @@ class GLRendererImpl(private val nsvg: NanoSvgApi, private val stb: StbApi) : Re
         colorMask: Int, topLeftRadius: Float, topRightRadius: Float, bottomLeftRadius: Float, bottomRightRadius: Float
     ) {
         if (count >= MAX_BATCH) flush()
-        if (count > 0 && curTex != atlas) flush()
-        curTex = atlas
 
         buffer.put(x).put(y).put(width).put(height)
         buffer.put(topLeftRadius).put(topRightRadius).put(bottomRightRadius).put(bottomLeftRadius)
@@ -616,8 +613,6 @@ class GLRendererImpl(private val nsvg: NanoSvgApi, private val stb: StbApi) : Re
         val s = transformScale()
         val fAtlasForRendering = if (s == 1f) fAtlas else getFontAtlas(font, fontSize * s)
         if (count >= MAX_BATCH) flush()
-        if (count > 0 && curTex != atlas) flush()
-        curTex = atlas
 
         var penX = x
         val scaleFactor = fontSize / fAtlas.renderedSize
@@ -918,8 +913,8 @@ class GLRendererImpl(private val nsvg: NanoSvgApi, private val stb: StbApi) : Re
         if (quadVbo != 0) glDeleteBuffers(quadVbo)
         if (instancedVbo != 0) glDeleteBuffers(instancedVbo)
         if (atlas != 0) glDeleteTextures(atlas)
+        if (vao != 0) org.lwjgl.opengl.GL30C.glDeleteVertexArrays(vao)
         fonts.clear()
-        buffer.clear()
     }
 
     override fun delete(font: Font?) {}