From c9ba76a2d1c5a1e1c71e456237270ea313731b51 Mon Sep 17 00:00:00 2001 From: zelophed Date: Sat, 27 Mar 2021 16:01:05 +0100 Subject: [PATCH 1/2] Assisted Placement, Part IV-c - indicator renders again - changed the config to allow the indicator to be disabled altogether --- .../create/foundation/config/CClient.java | 6 +- .../utility/placement/PlacementHelpers.java | 61 +++++++------------ 2 files changed, 26 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/config/CClient.java b/src/main/java/com/simibubi/create/foundation/config/CClient.java index 7b084d986..2f42a549a 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CClient.java +++ b/src/main/java/com/simibubi/create/foundation/config/CClient.java @@ -18,11 +18,15 @@ public class CClient extends ConfigBase { public ConfigInt overlayOffsetX = i(20, Integer.MIN_VALUE, Integer.MAX_VALUE, "overlayOffsetX", "Offset the overlay from goggle- and hover- information by this many pixels on the X axis; Use /create overlay"); public ConfigInt overlayOffsetY = i(0, Integer.MIN_VALUE, Integer.MAX_VALUE, "overlayOffsetY", "Offset the overlay from goggle- and hover- information by this many pixels on the Y axis; Use /create overlay"); - public ConfigBool smoothPlacementIndicator = b(false, "smoothPlacementIndicator", "Use an alternative indicator when showing where the assisted placement ends up relative to your crosshair"); + public ConfigEnum placementIndicator = e(PlacementIndicatorSetting.TEXTURE, "placementIndicator", "What indicator should be used when showing where the assisted placement ends up relative to your crosshair"); public ConfigBool ignoreFabulousWarning = b(false, "ignoreFabulousWarning", "Setting this to true will prevent Create from sending you a warning when playing with Fabulous graphics enabled"); @Override public String getName() { return "client"; } + + public enum PlacementIndicatorSetting { + TEXTURE, TRIANGLE, NONE + } } diff --git a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java b/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java index a76caf483..83e240fb6 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java +++ b/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java @@ -3,6 +3,7 @@ package com.simibubi.create.foundation.utility.placement; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CClient; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingAngle; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; @@ -20,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.api.distmarker.Dist; @@ -150,24 +152,12 @@ public class PlacementHelpers { if (player != null && animationTick > 0) { MainWindow res = event.getWindow(); - //MatrixStack matrix = event.getMatrix(); - //String text = "( )"; - //matrix.push(); - //matrix.translate(res.getScaledWidth() / 2F, res.getScaledHeight() / 2f - 4, 0); float screenY = res.getScaledHeight() / 2f; float screenX = res.getScaledWidth() / 2f; - //float y = screenY - 3.5f; - //float x = screenX; - //x -= mc.fontRenderer.getStringWidth(text)/2f - 0.25f; - float progress = Math.min(animationTick / 10f/* + event.getPartialTicks()*/, 1f); - //int opacity = ((int) (255 * (progress * progress))) << 24; - - //mc.fontRenderer.drawString(text, x, y, 0xFFFFFF | opacity); drawDirectionIndicator(event.getMatrixStack(), event.getPartialTicks(), screenX, screenY, progress); - //matrix.pop(); } } @@ -205,13 +195,11 @@ public class PlacementHelpers { float snappedAngle = (snapSize * Math.round(angle.get(0f) / snapSize)) % 360f; float length = 10; - //TOD O if the target is off screen, use length to show a meaningful distance - boolean flag = AllConfigs.CLIENT.smoothPlacementIndicator.get(); - if (flag) + CClient.PlacementIndicatorSetting mode = AllConfigs.CLIENT.placementIndicator.get(); + if (mode == CClient.PlacementIndicatorSetting.TRIANGLE) fadedArrow(ms, centerX, centerY, r, g, b, a, length, snappedAngle); - - else + else if (mode == CClient.PlacementIndicatorSetting.TEXTURE) textured(ms, centerX, centerY, a, snappedAngle); } @@ -231,15 +219,17 @@ public class PlacementHelpers { BufferBuilder bufferbuilder = tessellator.getBuffer(); bufferbuilder.begin(GL11.GL_POLYGON, DefaultVertexFormats.POSITION_COLOR); - bufferbuilder.vertex(0, - (10 + length), 0).color(r, g, b, a).endVertex(); + Matrix4f mat = ms.peek().getModel(); - bufferbuilder.vertex(-9, -3, 0).color(r, g, b, 0f).endVertex(); - bufferbuilder.vertex(-6, -6, 0).color(r, g, b, 0f).endVertex(); - bufferbuilder.vertex(-3, -8, 0).color(r, g, b, 0f).endVertex(); - bufferbuilder.vertex(0, -8.5, 0).color(r, g, b, 0f).endVertex(); - bufferbuilder.vertex(3, -8, 0).color(r, g, b, 0f).endVertex(); - bufferbuilder.vertex(6, -6, 0).color(r, g, b, 0f).endVertex(); - bufferbuilder.vertex(9, -3, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, 0, - (10 + length), 0).color(r, g, b, a).endVertex(); + + bufferbuilder.vertex(mat, -9, -3, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, -6, -6, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, -3, -8, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, 0, -8.5f, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, 3, -8, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, 6, -6, 0).color(r, g, b, 0f).endVertex(); + bufferbuilder.vertex(mat, 9, -3, 0).color(r, g, b, 0f).endVertex(); tessellator.draw(); RenderSystem.shadeModel(GL11.GL_FLAT); @@ -252,19 +242,13 @@ public class PlacementHelpers { private static void textured(MatrixStack ms, float centerX, float centerY, float alpha, float snappedAngle) { ms.push(); RenderSystem.enableTexture(); - //RenderSystem.disableTexture(); AllGuiTextures.PLACEMENT_INDICATOR_SHEET.bind(); RenderSystem.enableBlend(); - //RenderSystem.disableAlphaTest(); RenderSystem.enableAlphaTest(); RenderSystem.defaultBlendFunc(); - RenderSystem.color4f(1f, 1f, 1f, 1f); RenderSystem.shadeModel(GL11.GL_SMOOTH); ms.translate(centerX, centerY, 0); - //RenderSystem.rotatef(angle.get(0.1f), 0, 0, -1); - //RenderSystem.translated(0, 10, 0); - //RenderSystem.rotatef(angle.get(0.1f), 0, 0, 1); ms.scale(12, 12, 0); float index = snappedAngle / 22.5f; @@ -279,19 +263,16 @@ public class PlacementHelpers { BufferBuilder buffer = tessellator.getBuffer(); buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEXTURE); - - buffer.vertex(-1, -1, 0).color(1f, 1f, 1f, alpha).texture(tx, ty).endVertex(); - buffer.vertex(-1, 1, 0).color(1f, 1f, 1f, alpha).texture(tx, ty + th).endVertex(); - buffer.vertex(1, 1, 0).color(1f, 1f, 1f, alpha).texture(tx + tw, ty + th).endVertex(); - buffer.vertex(1, -1, 0).color(1f, 1f, 1f, alpha).texture(tx + tw, ty).endVertex(); + Matrix4f mat = ms.peek().getModel(); + buffer.vertex(mat, -1, -1, 0).color(1f, 1f, 1f, alpha).texture(tx, ty).endVertex(); + buffer.vertex(mat, -1, 1, 0).color(1f, 1f, 1f, alpha).texture(tx, ty + th).endVertex(); + buffer.vertex(mat, 1, 1, 0).color(1f, 1f, 1f, alpha).texture(tx + tw, ty + th).endVertex(); + buffer.vertex(mat, 1, -1, 0).color(1f, 1f, 1f, alpha).texture(tx + tw, ty).endVertex(); tessellator.draw(); + RenderSystem.shadeModel(GL11.GL_FLAT); - - //RenderSystem.enableTexture(); - RenderSystem.disableBlend(); - //RenderSystem.enableAlphaTest(); ms.pop(); } From a5a9ea1b7fcfd3f532b7dc07c2685d303ba49dfc Mon Sep 17 00:00:00 2001 From: zelophed Date: Sat, 27 Mar 2021 16:33:23 +0100 Subject: [PATCH 2/2] ponder particles, pog --- .../create/foundation/ponder/PonderWorldParticles.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderWorldParticles.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderWorldParticles.java index 6da7439c7..5e1ca9774 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderWorldParticles.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderWorldParticles.java @@ -70,8 +70,9 @@ public class PonderWorldParticles { RenderSystem.enableDepthTest(); RenderSystem.enableFog(); }; - ms.push(); - ms.peek().getModel().multiply(ms.peek().getModel()); + RenderSystem.pushMatrix(); + RenderSystem.multMatrix(ms.peek().getModel()); + //check ParticleManager#renderParticles for a replacement if RenderSystem#multMatrix gets removed for (IParticleRenderType iparticlerendertype : this.byType.keySet()) { // Forge: allow custom // IParticleRenderType's @@ -92,7 +93,7 @@ public class PonderWorldParticles { } } - ms.pop(); + RenderSystem.popMatrix(); RenderSystem.depthMask(true); RenderSystem.disableBlend(); RenderSystem.defaultAlphaFunc();