Fix 'static-scale'

toxicity188 · Jan 2, 2025 · ad55766 · ad55766
1 parent 39844c7
commit ad55766
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/changelog/1.11.2.md b/changelog/1.11.2.md
@@ -8,6 +8,11 @@
 ```
 world (bukkit)
 ```
+- These configuration added
+```
+force-split: false (Text layout)
+frame-type: local #global, local (Popup)
+```
 
 ### Fix
 - Fix shaders bug

diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/ShaderManagerImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/ShaderManagerImpl.kt
@@ -40,7 +40,7 @@ object ShaderManagerImpl : BetterHudManager, ShaderManager {
                         fun applyScale(offset: Int, scale: Double, pos: String) {
                             if (scale != 1.0 || static) {
                                 val scaleFloat = scale.toFloat()
-                                add("    pos.$pos = (pos.$pos - (${offset})) * ${if (static) "$scaleFloat * ui.$pos / ScreenSize.$pos" else scaleFloat} + (${offset});")
+                                add("    pos.$pos = (pos.$pos - (${offset})) * ${if (static) "$scaleFloat * uiScreen.$pos" else scaleFloat} + (${offset} * uiScreen.$pos);")
                             }
                         }
                         applyScale(shader.renderScale.relativeOffset.x, shader.renderScale.scale.x, "x")

diff --git a/dist/src/main/resources/text.vsh b/dist/src/main/resources/text.vsh
@@ -65,6 +65,7 @@ float getDistance(mat4 modelViewMat, vec3 pos, int shape) {
 void main() {
     vec3 pos = Position;
     vec2 ui = ceil(2 / vec2(ProjMat[0][0], -ProjMat[1][1]));
+    vec2 uiScreen = ui / ScreenSize;
     vec3 color = Color.xyz;
     vertexColor = Color * texelFetch(Sampler2, UV2 / 16, 0);
     applyColor = 0;