Skip to content

Commit 1fa3d04

Browse files
committed
SDF settings
1 parent a63d0a1 commit 1fa3d04

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

common/src/main/kotlin/com/lambda/graphics/renderer/gui/font/FontRenderer.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
4242
private val emojis get() = RenderSettings.emojiFont
4343

4444
private val shadowShift get() = RenderSettings.shadowShift * 10.0
45-
private val baselineOffset get() = RenderSettings.baselineOffset * 2.0f - 10f
45+
private val baselineOffset get() = RenderSettings.baselineOffset * 2.0f - 16f
4646
private val gap get() = RenderSettings.gap * 0.5f - 0.8f
4747

4848
/**
@@ -65,8 +65,8 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
6565
) = render {
6666
shader["u_FontTexture"] = 0
6767
shader["u_EmojiTexture"] = 1
68-
shader["u_SDFMin"] = 0.4
69-
shader["u_SDFMax"] = 1.0
68+
shader["u_SDFMin"] = RenderSettings.sdfMin
69+
shader["u_SDFMax"] = RenderSettings.sdfMax
7070

7171
bind(chars, emojis)
7272

@@ -91,8 +91,8 @@ object FontRenderer : AbstractGUIRenderer(VertexAttrib.Group.FONT, shader("font/
9191
) = render {
9292
shader["u_FontTexture"] = 0
9393
shader["u_EmojiTexture"] = 1
94-
shader["u_SDFMin"] = 0.4
95-
shader["u_SDFMax"] = 1.0
94+
shader["u_SDFMin"] = RenderSettings.sdfMin
95+
shader["u_SDFMax"] = RenderSettings.sdfMax
9696

9797
bind(chars, emojis)
9898

common/src/main/kotlin/com/lambda/gui/impl/clickgui/core/SliderLayout.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import com.lambda.gui.impl.clickgui.module.settings.SettingSlider
2828
import com.lambda.module.modules.client.ClickGui
2929
import com.lambda.util.Mouse
3030
import com.lambda.util.math.Vec2d
31+
import com.lambda.util.math.multAlpha
3132
import com.lambda.util.math.setAlpha
3233
import com.lambda.util.math.transform
3334
import java.awt.Color
@@ -89,7 +90,7 @@ class SliderLayout(
8990
setProgressBlock(dragProgress)
9091
}
9192

92-
val progress = rect {
93+
rect {
9394
onUpdate { // progress
9495
rect = bg.rect
9596
width *= renderProgress
@@ -102,8 +103,10 @@ class SliderLayout(
102103

103104
outline {
104105
onUpdate {
105-
rect = progress.rect
106-
setColor(bg.leftTopColor)
106+
rect = bg.rect
107+
val c = Color.BLACK.setAlpha(0.3 * showAnim)
108+
val a = transform(renderProgress, 0.5, 1.0, 0.0, 1.0).coerceIn(0.0, 1.0)
109+
setColorH(c, c.multAlpha(a))
107110
roundRadius = 100.0
108111
}
109112
}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/SettingSlider.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ import com.lambda.gui.impl.clickgui.core.SliderLayout.Companion.sliderBehind
2727
import com.lambda.gui.impl.clickgui.module.SettingLayout
2828
import com.lambda.module.modules.client.ClickGui
2929
import com.lambda.util.math.lerp
30-
import kotlin.math.PI
31-
import kotlin.math.pow
32-
import kotlin.math.sin
3330

3431
abstract class SettingSlider <V : Any, T: AbstractSetting<V>>(
3532
owner: Layout, setting: T
@@ -61,7 +58,7 @@ abstract class SettingSlider <V : Any, T: AbstractSetting<V>>(
6158
}
6259

6360
textField {
64-
var lastValue = ""
61+
var lastValue: String
6562

6663
onUpdate {
6764
lastValue = text
@@ -77,7 +74,6 @@ abstract class SettingSlider <V : Any, T: AbstractSetting<V>>(
7774
color = textField.color
7875

7976
scale = textField.scale * lerp(changeAnimation, 1.1, 1.0)
80-
8177
}
8278
}
8379
}

common/src/main/kotlin/com/lambda/module/modules/client/RenderSettings.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ object RenderSettings : Module(
3939
val gap by setting("Gap", 1.5, -10.0..10.0, 0.5) { page == Page.Font }
4040
val baselineOffset by setting("Vertical Offset", 0.0, -10.0..10.0, 0.5) { page == Page.Font }
4141
val highlightColor by setting("Text Highlight Color", Color(214, 55, 87), visibility = { page == Page.Font })
42+
val sdfMin by setting("SDF Min", 0.4, 0.0..1.0, 0.01, visibility = { page == Page.Font })
43+
val sdfMax by setting("SDF Max", 1.0, 0.0..1.0, 0.01, visibility = { page == Page.Font })
4244

4345
// ESP
4446
val uploadsPerTick by setting("Uploads", 16, 1..256, 1, unit = " chunk/tick") { page == Page.ESP }

0 commit comments

Comments
 (0)