improve waypoint display

Author: moehreag

1.20/src/main/java/io/github/axolotlclient/waypoints/mixin/GameRendererMixin.java

@@ -42,7 +42,7 @@ public class GameRendererMixin {
 
 	@Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderLevel(Lcom/mojang/blaze3d/vertex/PoseStack;FJZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/GameRenderer;Lnet/minecraft/client/renderer/LightTexture;Lorg/joml/Matrix4f;)V", shift = At.Shift.AFTER))
 	private void render(float partialTicks, long finishTimeNano, PoseStack poseStack, CallbackInfo ci) {
-		AxolotlClientWaypoints.WAYPOINT_RENDERER.render(poseStack, minecraft.renderBuffers().bufferSource());
+		AxolotlClientWaypoints.WAYPOINT_RENDERER.render(poseStack, minecraft.renderBuffers().bufferSource(), partialTicks);
 	}
 
 }

1.20/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -22,10 +22,11 @@
 
 package io.github.axolotlclient.waypoints.waypoints;
 
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+import io.github.axolotlclient.AxolotlClientConfig.api.util.Colors;
 import io.github.axolotlclient.waypoints.AxolotlClientWaypoints;
 import io.github.axolotlclient.waypoints.mixin.GameRendererAccessor;
 import net.minecraft.client.Camera;
@@ -35,8 +36,10 @@
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 import org.joml.Quaternionf;
+import org.joml.Vector3f;
 import org.joml.Vector4f;
 
 public class WaypointRenderer {
@@ -46,19 +49,20 @@ public class WaypointRenderer {
 	private final Matrix4f view = new Matrix4f();
 	private final Vector4f viewProj = new Vector4f();
 
-	public void render(PoseStack stack, MultiBufferSource.BufferSource source) {
+	public void render(PoseStack stack, MultiBufferSource.BufferSource source, float tick) {
 		var profiler = Minecraft.getInstance().getProfiler();
 		profiler.popPush("waypoints");
 		stack.pushPose();
 		var cam = minecraft.gameRenderer.getMainCamera();
 		var camPos = cam.getPosition();
 		minecraft.gameRenderer.resetProjectionMatrix(minecraft.gameRenderer.getProjectionMatrix(((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(cam, 0, false)));
 		RenderSystem.enableBlend();
+		float fov = (float) ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(cam, tick, true);
 
 		for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {
 			if (waypoint.closerToThan(camPos.x(), camPos.y(), camPos.z(), CUTOFF_DIST / minecraft.getWindow().getGuiScale())) {
 				profiler.push(waypoint.name());
-				renderWaypoint(waypoint, stack, camPos, cam, source);
+				renderWaypoint(waypoint, stack, camPos, cam, source, fov);
 				profiler.pop();
 			}
 		}
@@ -69,16 +73,25 @@ public void render(PoseStack stack, MultiBufferSource.BufferSource source) {
 		}
 	}
 
-	private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Camera cam, MultiBufferSource.BufferSource bufferSource) {
+	private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Camera cam, MultiBufferSource.BufferSource bufferSource, float fov) {
+		int textWidth = minecraft.font.width(waypoint.display());
+		int width = textWidth + Waypoint.displayXOffset() * 2;
+		int textHeight = minecraft.font.lineHeight;
+		int height = textHeight + Waypoint.displayYOffset() * 2;
+		var displayStart = projectToScreen(cam, fov, width, height, waypoint.x() - (width / 2f * 0.04), waypoint.y() - (height / 2f * 0.04), waypoint.z());
+		if (displayStart == null) return;
+		var displayEnd = projectToScreen(cam, fov, width, height, waypoint.x() + (width / 2f * 0.04), waypoint.y() + (height / 2f * 0.04), waypoint.z());
+		if (displayEnd == null) return;
+		float projWidth = Math.abs(displayEnd.x() - displayStart.x());
+		float projHeight = Math.abs(displayEnd.y() - displayStart.y());
+		if (projWidth / width <= 1 && projHeight / height <= 1) {
+			return;
+		}
 		stack.pushPose();
 		stack.translate(waypoint.x() - camPos.x(), waypoint.y() - camPos.y(), waypoint.z() - camPos.z());
 		stack.mulPose(cam.rotation());
 		float scale = 0.04F;
 		stack.scale(-scale, -scale, scale);
-		int textWidth = minecraft.font.width(waypoint.display());
-		//int width = textWidth + Waypoint.displayXOffset() * 2;
-		int textHeight = minecraft.font.lineHeight;
-		//int height = textHeight + Waypoint.displayYOffset() * 2;
 		//fillRect(stack, bufferSource, -width / 2f, -height / 2f, 0f, width / 2f, height / 2f, waypoint.color().toInt());
 		drawFontBatch(waypoint.display(), -textWidth / 2f, -textHeight / 2f, stack.last().pose(), bufferSource, waypoint.color().toInt());
 		stack.popPose();
@@ -106,73 +119,101 @@ public void renderWaypoints(GuiGraphics graphics, float delta) {
 
 		graphics.pose().pushPose();
 		graphics.pose().translate(0.0F, 0.0F, -100.0F);
-		var positionDrawn = new AtomicBoolean();
+		var positionDrawer = new AtomicReference<Runnable>();
 		for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {
 			graphics.pose().pushPose();
-			renderWaypoint(waypoint, graphics, delta, cam, positionDrawn);
+			renderWaypoint(waypoint, graphics, delta, cam, positionDrawer);
 			graphics.pose().popPose();
 		}
+		if (positionDrawer.get() != null) {
+			positionDrawer.get().run();
+		}
 		graphics.pose().popPose();
 		profiler.pop();
 	}
 
-	private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick, Camera camera, AtomicBoolean positionDrawn) {
+	private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick, Camera camera, AtomicReference<Runnable> positionDrawn) {
 		var fov = ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(camera, tick, true);
 		var pose = graphics.pose();
 
 		var textWidth = minecraft.font.width(waypoint.display());
 		int width = textWidth + Waypoint.displayXOffset() * 2;
 		int textHeight = minecraft.font.lineHeight;
 		int height = textHeight + Waypoint.displayYOffset() * 2;
+		var camPos = camera.getPosition();
+
+		var displayStart = projectToScreen(camera, fov, width, height, waypoint.x() - (width / 2f * 0.04), waypoint.y() - (height / 2f * 0.04), waypoint.z());
+		if (displayStart == null) return;
+		var displayEnd = projectToScreen(camera, fov, width, height, waypoint.x() + (width / 2f * 0.04), waypoint.y() + (height / 2f * 0.04), waypoint.z());
+		if (displayEnd == null) return;
+		float projWidth = Math.abs(displayEnd.x() - displayStart.x());
+		float projHeight = Math.abs(displayEnd.y() - displayStart.y());
+		Result result = projectToScreen(camera, fov, width, height, waypoint.x(), waypoint.y(), waypoint.z());
+		if (result == null) return;
+
+		pose.translate(result.x(), result.y(), 0);
+
+		if (!AxolotlClientWaypoints.renderOutOfViewWaypointsOnScreenEdge.get() && (result.x() < -width / 2f || result.x() > graphics.guiWidth() + width / 2f || result.y() < -height / 2f || result.y() > graphics.guiHeight() + height / 2f)) {
+			return;
+		}
+		if (projWidth / width > 1 || projHeight / height > 1) {
+			return;
+		}
+
+		if (positionDrawn.get() == null && Math.abs(result.x() - graphics.guiWidth() / 2f) < width / 2f && Math.abs(result.y() - graphics.guiHeight() / 2f) < height / 2f) {
+			pose.pushPose();
+			pose.translate(0, height / 2f + 2, 0);
+			var pos = pose.last().pose().transformPosition(new Vector3f());
+			positionDrawn.set(() -> {
+				var line1 = waypoint.name();
+				pose.pushPose();
+				pose.last().pose().translate(pos);
+				int line1W = minecraft.font.width(line1);
+				graphics.fill(-line1W / 2 - 2, -2, line1W / 2 + 2, minecraft.font.lineHeight + 2, Colors.GRAY.withAlpha(100).toInt());
+				graphics.renderOutline(-line1W / 2 - 2, -2, line1W + 4, minecraft.font.lineHeight + 4, Colors.GRAY.toInt());
+				graphics.drawString(minecraft.font, line1, -line1W / 2, 0, -1, true);
+				if (!waypoint.closerToThan(camPos.x(), camPos.y(), camPos.z(), CUTOFF_DIST)) {
+					pose.translate(0, minecraft.font.lineHeight + 4, 0);
+					var line2 = AxolotlClientWaypoints.tr("distance", "%.2f".formatted(waypoint.distTo(camPos.x(), camPos.y(), camPos.z())));
+					graphics.drawString(minecraft.font, line2, -minecraft.font.width(line2) / 2, 0, -1, false);
+				}
+				pose.popPose();
+			});
+			pose.popPose();
+		}
+
+		graphics.fill(-width / 2, -height / 2, width / 2, height / 2, waypoint.color().toInt());
+		graphics.drawString(minecraft.font, waypoint.display(), -textWidth / 2, -textHeight / 2, -1, false);
+	}
 
-		viewProj.set(waypoint.x(), waypoint.y(), waypoint.z(), 1);
+	private @Nullable Result projectToScreen(Camera camera, double fov, int width, int height, double x, double y, double z) {
+		viewProj.set(x, y, z, 1);
 		view.rotation(camera.rotation().rotateY((float) -(Math.PI), new Quaternionf()).invert()).translate(camera.getPosition().toVector3f().negate());
 
 		Matrix4f projection = minecraft.gameRenderer.getProjectionMatrix(fov);
 		projection.mul(view);
 		viewProj.mul(projection);
 
-		var camPos = camera.getPosition();
 
 		if (AxolotlClientWaypoints.renderOutOfViewWaypointsOnScreenEdge.get()) {
 			viewProj.w = Math.max(Math.abs(viewProj.x()), Math.max(Math.abs(viewProj.y()), viewProj.w()));
 		}
 
 		if (viewProj.w() <= 0) {
-			return;
+			return null;
 		}
 		viewProj.div(viewProj.w());
 
 		float projX = viewProj.x();
 		float projY = viewProj.y();
 
 		//float x = (graphics.guiWidth()/2f) + ((graphics.guiWidth() - width) * (viewProj.x() / 2f));
-		float x = 0.5f * (graphics.guiWidth() * (projX + 1) - width * projX);
+		float resultX = 0.5f * (minecraft.getWindow().getGuiScaledWidth() * (projX + 1) - width * projX);
 		//float y = graphics.guiHeight() - (graphics.guiHeight()/2f + (graphics.guiHeight()-height) * (viewProj.y() / 2f));
-		float y = graphics.guiHeight() * (0.5f - projY / 2) + (height * projY) / 2f;
-
-		pose.translate(x, y, 0);
-
-		if (!AxolotlClientWaypoints.renderOutOfViewWaypointsOnScreenEdge.get() && (x < -width / 2f || x > graphics.guiWidth() + width / 2f || y < -height / 2f || y > graphics.guiHeight() + height / 2f)) {
-			return;
-		}
-		if (waypoint.closerToThan(camPos.x(), camPos.y(), camPos.z(), CUTOFF_DIST / minecraft.getWindow().getGuiScale())) {
-			return;
-		}
-
-		if (!positionDrawn.get() && Math.abs(x - graphics.guiWidth() / 2f) < 8 && Math.abs(y - graphics.guiHeight() / 2f) < 8) {
-			positionDrawn.set(true);
-			pose.pushPose();
-			pose.translate(0, height / 2f + 2, 0);
-			var line1 = waypoint.name();
-			graphics.drawString(minecraft.font, line1, -minecraft.font.width(line1) / 2, 0, -1, false);
-			pose.translate(0, minecraft.font.lineHeight + 2, 0);
-			var line2 = AxolotlClientWaypoints.tr("distance", "%.2f".formatted(waypoint.distTo(camPos.x(), camPos.y(), camPos.z())));
-			graphics.drawString(minecraft.font, line2, -minecraft.font.width(line2) / 2, 0, -1, false);
-			pose.popPose();
-		}
+		float resultY = minecraft.getWindow().getGuiScaledWidth() * (0.5f - projY / 2) + (height * projY) / 2f;
+		return new Result(resultX, resultY);
+	}
 
-		graphics.fill(-width / 2, -height / 2, width / 2, height / 2, waypoint.color().toInt());
-		graphics.drawString(minecraft.font, waypoint.display(), -textWidth / 2, -textHeight / 2, -1, false);
+	private record Result(float x, float y) {
 	}
 }