From 3e0bb525fa91e04ec3bc25fd8b03b350ced737a3 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Thu, 12 Sep 2024 07:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=BB=E7=82=AEHUD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/screens/CannonHudOverlay.java | 12 +++++++---- .../client/screens/M79UIOverlay.java | 20 ++++++++---------- .../cannon/cannon_crosshair_notzoom.png | Bin 0 -> 1235 bytes 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/superbwarfare/textures/screens/cannon/cannon_crosshair_notzoom.png diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java index f0e7d7f42..0f10d3641 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/CannonHudOverlay.java @@ -52,8 +52,13 @@ public class CannonHudOverlay { int j = Mth.floor(f * f1); int k = (w - i) / 2; int l = (h - j) / 2; - preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j); - preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/indicator.png"), k + 15.6f * diffY * fovAdjust, l + 20.4f * diffX * fovAdjust, 0, 0.0F, i, j, i, j); + if (GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS) { + preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/cannon_crosshair.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/indicator.png"), k + 32.2f * diffY * fovAdjust, l + 39.1f * diffX * fovAdjust, 0, 0.0F, i, j, i, j); + } else { + preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/cannon_crosshair_notzoom.png"), k, l, 0, 0.0F, i, j, i, j); + preciseBlit(event.getGuiGraphics(), new ResourceLocation(ModUtils.MODID, "textures/screens/cannon/indicator.png"), k + (float) Math.tan(Mth.clamp(Mth.DEG_TO_RAD * diffY, -1.5, 1.5)) * 230 * fovAdjust, l + (float) Math.tan(Mth.clamp(Mth.DEG_TO_RAD * diffX, -1.5, 1.5)) * 230, 0, 0.0F, i, j, i, j); + } } RenderSystem.depthMask(true); RenderSystem.defaultBlendFunc(); @@ -66,7 +71,6 @@ public class CannonHudOverlay { if (player == null) return false; return !player.isSpectator() && !(player.getMainHandItem().getItem() instanceof GunItem) - && (player.getVehicle() != null && (player.getVehicle() instanceof ICannonEntity)) - && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) == GLFW.GLFW_PRESS; + && (player.getVehicle() != null && (player.getVehicle() instanceof ICannonEntity)); } } diff --git a/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java b/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java index d536ee6a6..a4d77dd76 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java +++ b/src/main/java/net/mcreator/superbwarfare/client/screens/M79UIOverlay.java @@ -5,7 +5,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.mcreator.superbwarfare.ModUtils; import net.mcreator.superbwarfare.entity.ICannonEntity; import net.mcreator.superbwarfare.init.ModItems; -import net.mcreator.superbwarfare.item.gun.GunItem; import net.minecraft.client.CameraType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; @@ -32,7 +31,7 @@ public class M79UIOverlay { RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); RenderSystem.setShaderColor(1, 1, 1, 1); - if (shouldRenderCrossHair(player) || shouldRenderCrossHair2(player)) { + if (shouldRenderCrossHair(player)) { event.getGuiGraphics().blit(new ResourceLocation(ModUtils.MODID, "textures/screens/rex.png"), w / 2 - 16, h / 2 - 16, 0, 0, 32, 32, 32, 32); } RenderSystem.depthMask(true); @@ -49,13 +48,12 @@ public class M79UIOverlay { && (Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON || (player.isPassenger() && player.getVehicle() instanceof ICannonEntity)) && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS; } - - private static boolean shouldRenderCrossHair2(Player player) { - if (player == null) return false; - return !player.isSpectator() - && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS - && player.isPassenger() - && player.getVehicle() instanceof ICannonEntity - && !(player.getMainHandItem().getItem() instanceof GunItem); - } +// private static boolean shouldRenderCrossHair2(Player player) { +// if (player == null) return false; +// return !player.isSpectator() +// && GLFW.glfwGetMouseButton(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_MOUSE_BUTTON_RIGHT) != GLFW.GLFW_PRESS +// && player.isPassenger() +// && player.getVehicle() instanceof ICannonEntity +// && !(player.getMainHandItem().getItem() instanceof GunItem); +// } } diff --git a/src/main/resources/assets/superbwarfare/textures/screens/cannon/cannon_crosshair_notzoom.png b/src/main/resources/assets/superbwarfare/textures/screens/cannon/cannon_crosshair_notzoom.png new file mode 100644 index 0000000000000000000000000000000000000000..474f92d1b7638026516e41e065d6a20b9ff2022f GIT binary patch literal 1235 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn2Hfk$L90|U1(2s1Lwnj^u$ zz|!jJ;uumf=j|OsE+#_}hl4M4i=Fyc_AY&)b>zT4$s2kq`){*1_AmmqkAjgG0tepf z?PhP-v9sX)?Sq^9*F`_Pe3PNT>hrz}75^X4yT9(Xf%1k6rQaDC4*cKA)UY=OEt%+_ zd8jDI;9>boNTDDoj)|o~0jR(cm@u1IfGLlYfq_Gafk8lpfkDB8fx%${0|R*q7zB*w i%a6Rc88$wiV#^>m_u|y24s9nue)4qnb6Mw<&;$S^woKRn literal 0 HcmV?d00001