fix more somewhat fov-related bugs

Author: moehreag

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

@@ -57,9 +57,8 @@ public void render(PoseStack stack, MultiBufferSource.BufferSource source, float
 		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);
+		RenderSystem.enableBlend();
 		worldRendererWaypoints.clear();
 
 		for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {
@@ -97,22 +96,23 @@ private void renderWaypoint(Waypoint waypoint, PoseStack stack, Vec3 camPos, Cam
 		stack.mulPose(cam.rotation());
 		float scale = 0.04F;
 		stack.scale(-scale, -scale, scale);
-		//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());
+		drawFontBatch(waypoint.display(), -textWidth / 2f, -textHeight / 2f, stack.last().pose(), bufferSource);
+		fillRect(stack, bufferSource, -width / 2f, -height / 2f, 0.001f, width / 2f, height / 2f, waypoint.color().toInt());
 		stack.popPose();
 	}
 
 	private void fillRect(PoseStack stack, MultiBufferSource.BufferSource source, float x, float y, float z, float x2, float y2, int color) {
-		var buf = source.getBuffer(RenderType.textBackgroundSeeThrough());
+		var buf = source.getBuffer(RenderType.gui());
 		var matrix = stack.last().pose();
 		buf.vertex(matrix, x, y, z).color(color).uv2(0xF000F0).endVertex();
 		buf.vertex(matrix, x, y2, z).color(color).uv2(0xF000F0).endVertex();
 		buf.vertex(matrix, x2, y2, z).color(color).uv2(0xF000F0).endVertex();
 		buf.vertex(matrix, x2, y, z).color(color).uv2(0xF000F0).endVertex();
+		source.endBatch();
 	}
 
-	private void drawFontBatch(String text, float x, float y, Matrix4f matrix, MultiBufferSource bufferSource, int bgColor) {
-		minecraft.font.drawInBatch(text, x, y, -1, false, matrix, bufferSource, Font.DisplayMode.NORMAL, bgColor, 0xF000F0);
+	private void drawFontBatch(String text, float x, float y, Matrix4f matrix, MultiBufferSource bufferSource) {
+		minecraft.font.drawInBatch(text, x, y, -1, false, matrix, bufferSource, Font.DisplayMode.NORMAL, 0, 0xF000F0);
 	}
 
 	public void renderWaypoints(GuiGraphics graphics, float delta) {
@@ -182,7 +182,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick,
 				maxX > 0 && minY > 0 && maxX < guiWidth && minY < guiHeight ||
 				minX < guiWidth && maxX > 0 && minY < guiHeight && maxY > 0;
 		} else {
-			_3dOnScreen = false;
+		_3dOnScreen = false;
 		}
 		boolean displayX = Math.abs(result.x() - graphics.guiWidth() / 2f) < (_3dOnScreen ? Math.max(projWidth, width) : width) / 2f + graphics.guiWidth() / 4f;
 		boolean displayY = Math.abs(result.y() - graphics.guiHeight() / 2f) < (_3dOnScreen ? Math.max(height, projHeight) : height) / 2f + graphics.guiHeight() / 4f;
@@ -235,7 +235,6 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick,
 		projection.mul(view);
 		viewProj.mul(projection);
 
-
 		if (orthoOffset == null && AxolotlClientWaypoints.renderOutOfViewWaypointsOnScreenEdge.get()) {
 			viewProj.w = Math.max(Math.abs(viewProj.x()), Math.max(Math.abs(viewProj.y()), viewProj.w()));
 		}
@@ -251,7 +250,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick,
 		//float x = (graphics.guiWidth()/2f) + ((graphics.guiWidth() - width) * (viewProj.x() / 2f));
 		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 resultY = minecraft.getWindow().getGuiScaledWidth() * (0.5f - projY / 2) + (height * projY) / 2f;
+		float resultY = minecraft.getWindow().getGuiScaledHeight() * (0.5f - projY / 2) + (height * projY) / 2f;
 		return new Result(resultX, resultY);
 	}
 

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

@@ -66,6 +66,7 @@ public void render(DeltaTracker deltaTracker) {
 		stack.mulPose(cam.rotation().invert());
 		var camPos = minecraft.gameRenderer.getMainCamera().getPosition();
 		float fov = (float) ((GameRendererAccessor) minecraft.gameRenderer).invokeGetFov(cam, deltaTracker.getGameTimeDeltaPartialTick(true), true);
+		minecraft.gameRenderer.resetProjectionMatrix(minecraft.gameRenderer.getProjectionMatrix(fov));
 		worldRendererWaypoints.clear();
 
 		for (Waypoint waypoint : AxolotlClientWaypoints.getCurrentWaypoints()) {

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.0.1-beta.17
+
+- fix more somewhat fov-related bugs
+
 ### 0.0.1-beta.16
 
 - fix waypoints being rendered wrong on changed FoVs (<=1.21.1)

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=0.0.1-beta.16+3.1.5
+version=0.0.1-beta.17+3.1.5
 
 maven_group=io.github.axolotlclient.waypoints