From dd6e5ef8bd7a11279efc533f61b33930387bf4e0 Mon Sep 17 00:00:00 2001 From: fayer3 Date: Mon, 13 Jan 2025 14:35:35 +0100 Subject: [PATCH] fix crosshair on radial menu/pointer keyboard --- .../vivecraft/client_vr/render/helpers/RenderHelper.java | 6 +++--- .../vivecraft/client_vr/render/helpers/VRPassHelper.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java index 92132e639..953185f77 100644 --- a/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java +++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java @@ -253,13 +253,13 @@ public static void setupPolyRendering(boolean enable) { /** * renders the given screen to the current main target and generates mipmaps for it * - * @param poseStack PoseStack to render with * @param partialTick partial tick for the screen rendering * @param screen the Screen to render * @param maxGuiScale if set, renders the screen at max gui scale */ - public static void drawScreen(PoseStack poseStack, float partialTick, Screen screen, boolean maxGuiScale) { + public static void drawScreen(float partialTick, Screen screen, boolean maxGuiScale) { // setup modelview for screen rendering + PoseStack poseStack = RenderSystem.getModelViewStack(); poseStack.pushPose(); poseStack.setIdentity(); poseStack.translate(0.0F, 0.0F, -2000.0F); @@ -283,7 +283,7 @@ public static void drawScreen(PoseStack poseStack, float partialTick, Screen scr GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); - screen.render(poseStack, 0, 0, partialTick); + screen.render(new PoseStack(), 0, 0, partialTick); RenderSystem.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java index bb19565cf..0f28c0f5e 100644 --- a/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java +++ b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VRPassHelper.java @@ -169,7 +169,7 @@ public static void renderAndSubmit(boolean renderLevel, long nanoTime, float act MC.mainRenderTarget = KeyboardHandler.FRAMEBUFFER; MC.mainRenderTarget.clear(Minecraft.ON_OSX); MC.mainRenderTarget.bindWrite(true); - RenderHelper.drawScreen(new PoseStack(), actualPartialTick, KeyboardHandler.UI, true); + RenderHelper.drawScreen(actualPartialTick, KeyboardHandler.UI, true); } MC.getProfiler().popPush("Radial Menu"); @@ -177,7 +177,7 @@ public static void renderAndSubmit(boolean renderLevel, long nanoTime, float act MC.mainRenderTarget = RadialHandler.FRAMEBUFFER; MC.mainRenderTarget.clear(Minecraft.ON_OSX); MC.mainRenderTarget.bindWrite(true); - RenderHelper.drawScreen(new PoseStack(), actualPartialTick, RadialHandler.UI, true); + RenderHelper.drawScreen(actualPartialTick, RadialHandler.UI, true); } MC.getProfiler().pop(); RenderHelper.checkGLError("post 2d ");