From 35d45057bab40ae6a8e0edca4fedfcef3168ab68 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Tue, 31 Jan 2023 07:54:36 -0600 Subject: [PATCH] Add 2 potential fixes for the optifine render resolution bug --- .../wrappers/minecraft/MinecraftRenderWrapper.java | 14 ++++++++++++++ coreSubProjects | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java index 6923a65b4..63a00d78c 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -34,6 +34,7 @@ import com.seibel.lod.common.wrappers.misc.LightMapWrapper; import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.lod.core.render.glObject.GLProxy; import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; import com.mojang.math.Vector3f; @@ -68,6 +69,7 @@ import net.minecraft.world.level.material.FogType; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import org.apache.logging.log4j.Logger; +import org.lwjgl.glfw.GLFW; /** @@ -193,6 +195,18 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper @Override public int getScreenWidth() { + // alternate ways of getting the window's resolution, + // using one of these methods may fix the optifine render resolution bug + // TODO: test these once we can run with Optifine again +// int[] heightArray = new int[1]; +// int[] widthArray = new int[1]; +// +// long window = GLProxy.getInstance().minecraftGlContext; +// GLFW.glfwGetWindowSize(window, widthArray, heightArray); // option 1 +// GLFW.glfwGetFramebufferSize(window, widthArray, heightArray); // option 2 + + + int width = MC.getWindow().getWidth(); if (OPTIFINE_ACCESSOR != null) { diff --git a/coreSubProjects b/coreSubProjects index 226fa9056..7f5a53382 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 226fa90561e432da193445b1f35849cce5f7e27f +Subproject commit 7f5a533827e94d56c9042fb27d4f5b588152b9a3