diff --git a/common/src/main/java/org/vivecraft/client/gui/settings/GuiMainVRSettings.java b/common/src/main/java/org/vivecraft/client/gui/settings/GuiMainVRSettings.java index 0936cd6be..77302a1b3 100644 --- a/common/src/main/java/org/vivecraft/client/gui/settings/GuiMainVRSettings.java +++ b/common/src/main/java/org/vivecraft/client/gui/settings/GuiMainVRSettings.java @@ -15,16 +15,6 @@ public class GuiMainVRSettings extends GuiVROptionsBase { new VROptionLayout(GuiOtherHUDSettings.class, VROptionLayout.Position.POS_RIGHT, 2.0F, true, "vivecraft.options.screen.guiother.button"), new VROptionLayout(VRSettings.VrOptions.WORLD_SCALE, VROptionLayout.Position.POS_LEFT, 6.0F, true, null), new VROptionLayout(VRSettings.VrOptions.WORLD_ROTATION, VROptionLayout.Position.POS_RIGHT, 6.0F, true, null), - new VROptionLayout(VRSettings.VrOptions.PLAY_MODE_SEATED, (button, mousePos) -> { - this.reinit = true; - - if (!this.dataholder.vrSettings.seated) { - this.isConfirm = true; - return true; - } else { - return false; - } - }, VROptionLayout.Position.POS_LEFT, 0.0F, true, null), new VROptionLayout(VRSettings.VrOptions.VR_HOTSWITCH, VROptionLayout.Position.POS_RIGHT, 0.0F, true, null), new VROptionLayout(VRSettings.VrOptions.LOW_HEALTH_INDICATOR, VROptionLayout.Position.POS_RIGHT, 7.0F, true, null) }; @@ -48,7 +38,7 @@ public class GuiMainVRSettings extends GuiVROptionsBase { return false; }, VROptionLayout.Position.POS_RIGHT, 2.0F, true, "gui.cancel"), new VROptionLayout((button, mousePos) -> { - this.dataholder.vrSettings.seated = true; + // this.dataholder.vrSettings.seated = true; this.settings.saveOptions(); this.reinit = true; this.isConfirm = false; diff --git a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java index 956fbc565..a82382b4f 100644 --- a/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java +++ b/common/src/main/java/org/vivecraft/client_vr/settings/VRSettings.java @@ -456,13 +456,13 @@ public enum UpdateType implements OptionEnum { @SettingField(VrOptions.CHAT_MESSAGE_STENCIL) public boolean showChatMessageStencil = true; @SettingField(value = VrOptions.VR_ENABLED, config = "vrEnabled") - public boolean vrEnabled = false; + public boolean vrEnabled = true; @SettingField(VrOptions.VR_REMEMBER_ENABLED) public boolean rememberVr = true; @SettingField(VrOptions.VR_HOTSWITCH) - public boolean vrHotswitchingEnabled = true; + public boolean vrHotswitchingEnabled = false; @SettingField(value = VrOptions.VR_TOGGLE_BUTTON_VISIBLE, config = "vrToggleButtonEnabled") - public boolean vrToggleButtonEnabled = true; + public boolean vrToggleButtonEnabled = false; @SettingField(value = VrOptions.VR_SETTINGS_BUTTON_VISIBLE, config = "vrSettingsButtonEnabled") public boolean vrSettingsButtonEnabled = true; @SettingField(value = VrOptions.VR_SETTINGS_BUTTON_POSITION, config = "vrSettingsButtonPositionLeft") diff --git a/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh b/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh index ed7affa1c..96210edff 100644 --- a/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh +++ b/common/src/main/resources/assets/minecraft/shaders/core/fovreduction.vsh @@ -7,5 +7,5 @@ uniform mat4 ProjMat; out vec2 texCoordinates; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - texCoordinates = UV0; + texCoordinates = vec2(UV0.s, 1.0 - UV0.t); }