mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-22 05:12:16 +00:00
Adjust vsync and fps limiters, and fix WSR with player models (#2002)
This commit is contained in:
1 parent
8c31eec525
commit
3659b59db9
36 files changed
+1494
-292
No files matched your search
@@ -3,10 +3,10 @@ package jss.notfine.gui;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.config.SystemProperties;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import jss.notfine.config.NotFineConfig;
|
||||
import jss.notfine.core.Settings;
|
||||
import jss.notfine.core.SettingsManager;
|
||||
import me.jellysquid.mods.sodium.client.gui.FrameRateOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
|
||||
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
|
||||
import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
|
||||
@@ -43,6 +43,7 @@ public class NotFineGameOptionPages {
|
||||
public static OptionPage general() {
|
||||
List<OptionGroup> groups = new ArrayList<>();
|
||||
|
||||
final FrameRateOptions frameRate = FrameRateOptions.create(vanillaOpts, sodiumOpts);
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(GraphicsMode.class, vanillaOpts)
|
||||
.setName(I18n.format("options.graphics"))
|
||||
@@ -63,16 +64,7 @@ public class NotFineGameOptionPages {
|
||||
.setImpact(OptionImpact.HIGH)
|
||||
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
|
||||
.build())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.vsync"))
|
||||
.setTooltip(I18n.format("sodium.options.v_sync.tooltip"))
|
||||
.setControl(TickBoxControl::new)
|
||||
.setBinding((opts, value) -> {
|
||||
opts.enableVsync = value;
|
||||
GLStateManager.setVSyncEnabled(opts.enableVsync);
|
||||
}, opts -> opts.enableVsync)
|
||||
.setImpact(OptionImpact.VARIES)
|
||||
.build())
|
||||
.add(frameRate.vsync())
|
||||
.add(OptionImpl.createBuilder(boolean.class, vanillaOpts)
|
||||
.setName(I18n.format("options.fullscreen"))
|
||||
.setTooltip(I18n.format("sodium.options.fullscreen.tooltip"))
|
||||
@@ -90,12 +82,7 @@ public class NotFineGameOptionPages {
|
||||
.build());
|
||||
|
||||
groups.add(OptionGroup.createBuilder()
|
||||
.add(OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
.setName(I18n.format("options.framerateLimit"))
|
||||
.setTooltip(I18n.format("sodium.options.fps_limit.tooltip"))
|
||||
.setControl(option -> new SliderControl(option, 5, 260, 1, ControlValueFormatter.fpsLimit()))
|
||||
.setBinding((opts, value) -> opts.limitFramerate = value, opts -> opts.limitFramerate)
|
||||
.build())
|
||||
.add(frameRate.maxFramerate())
|
||||
.build());
|
||||
|
||||
final OptionImpl<GameSettings, Integer> mipmapLevels = OptionImpl.createBuilder(int.class, vanillaOpts)
|
||||
|
||||
Reference in new issue
Block a user