-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # common/src/main/java/xaeroplus/mixin/client/MixinMinimapFBORenderer.java # common/src/main/java/xaeroplus/mixin/client/MixinMinimapRenderer.java
- Loading branch information
Showing
9 changed files
with
295 additions
and
291 deletions.
There are no files selected for viewing
115 changes: 115 additions & 0 deletions
115
common/src/main/java/xaeroplus/feature/render/WaypointBeaconRenderer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package xaeroplus.feature.render; | ||
|
|
||
| import com.mojang.blaze3d.vertex.PoseStack; | ||
| import net.minecraft.client.Camera; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.client.renderer.MultiBufferSource; | ||
| import net.minecraft.client.renderer.blockentity.BeaconRenderer; | ||
| import net.minecraft.client.renderer.culling.Frustum; | ||
| import net.minecraft.client.renderer.entity.EntityRenderDispatcher; | ||
| import net.minecraft.world.phys.AABB; | ||
| import net.minecraft.world.phys.Vec3; | ||
| import xaero.common.HudMod; | ||
| import xaero.common.minimap.waypoints.Waypoint; | ||
| import xaero.common.minimap.waypoints.WaypointVisibilityType; | ||
| import xaero.common.settings.ModSettings; | ||
| import xaero.hud.minimap.BuiltInHudModules; | ||
| import xaero.hud.minimap.module.MinimapSession; | ||
| import xaeroplus.settings.Settings; | ||
| import xaeroplus.util.ColorHelper; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static net.minecraft.client.renderer.blockentity.BeaconRenderer.BEAM_LOCATION; | ||
|
|
||
| public class WaypointBeaconRenderer { | ||
| public static final WaypointBeaconRenderer INSTANCE = new WaypointBeaconRenderer(); | ||
| private final List<Waypoint> waypointList = new ArrayList<>(); | ||
| private long lastWaypointRenderListUpdate = -1L; | ||
|
|
||
| public void updateWaypointRenderList(final MinimapSession session, final ModSettings settings) { | ||
| waypointList.clear(); | ||
| session.getWaypointSession().getCollector().collect(waypointList); | ||
| waypointList.removeIf(w -> { | ||
| if (w.isDisabled() | ||
| || w.getVisibility() == WaypointVisibilityType.WORLD_MAP_LOCAL | ||
| || w.getVisibility() == WaypointVisibilityType.WORLD_MAP_GLOBAL) { | ||
| return true; | ||
| } | ||
| return !settings.getDeathpoints() && w.getPurpose().isDeath(); | ||
| }); | ||
| waypointList.sort(Waypoint::compareTo); | ||
| } | ||
|
|
||
| public void renderWaypointBeacons(float tickDelta, PoseStack matrixStack) { | ||
| var session = BuiltInHudModules.MINIMAP.getCurrentSession(); | ||
| if (session == null) return; | ||
| var settings = HudMod.INSTANCE.getSettings(); | ||
| if (settings == null) return; | ||
| if (!settings.getShowIngameWaypoints()) return; | ||
| var currentWorld = session.getWorldManager().getCurrentWorld(); | ||
| if (currentWorld == null) return; | ||
| if (System.currentTimeMillis() - lastWaypointRenderListUpdate > 50L) { | ||
| updateWaypointRenderList(session, settings); | ||
| lastWaypointRenderListUpdate = System.currentTimeMillis(); | ||
| } | ||
| var dimDiv = session.getDimensionHelper().getDimensionDivision(currentWorld); | ||
| var mc = Minecraft.getInstance(); | ||
| if (mc.level == null || mc.cameraEntity == null) return; | ||
| var cameraPos = mc.cameraEntity.position(); | ||
| double distanceScale = settings.dimensionScaledMaxWaypointDistance ? mc.level.dimensionType().coordinateScale() : 1.0; | ||
| double waypointsDistance = settings.getMaxWaypointsDistance(); | ||
| double waypointsDistanceMin = settings.waypointsDistanceMin; | ||
| for (int i = 0; i < waypointList.size(); i++) { | ||
| final var w = waypointList.get(i); | ||
| double offX = (double)w.getX(dimDiv) - cameraPos.x + 0.5; | ||
| double offZ = (double)w.getZ(dimDiv) - cameraPos.z + 0.5; | ||
| double unscaledDistance2D = Math.sqrt(offX * offX + offZ * offZ); | ||
| double distance2D = unscaledDistance2D * distanceScale; | ||
| var shouldRender = w.isDestination() | ||
| || (w.getPurpose().isDeath() | ||
| || w.isGlobal() | ||
| || w.isTemporary() && settings.temporaryWaypointsGlobal | ||
| || waypointsDistance == 0.0 | ||
| || !(distance2D > waypointsDistance) | ||
| ) && (waypointsDistanceMin == 0.0 || !(unscaledDistance2D < waypointsDistanceMin));; | ||
| if (shouldRender) | ||
| renderWaypointBeacon(w, dimDiv, tickDelta, matrixStack); | ||
| } | ||
| } | ||
|
|
||
| public void renderWaypointBeacon(final Waypoint waypoint, final double dimDiv, float tickDelta, PoseStack matrixStack) { | ||
| final Minecraft mc = Minecraft.getInstance(); | ||
| if (mc.level == null || mc.cameraEntity == null) return; | ||
| final Vec3 playerVec = mc.cameraEntity.position(); | ||
| Vec3 waypointVec = new Vec3(waypoint.getX(dimDiv), playerVec.y, waypoint.getZ(dimDiv)); | ||
| final double xzDistance = playerVec.distanceTo(waypointVec); | ||
| if (xzDistance < Settings.REGISTRY.waypointBeaconDistanceMin.getAsInt()) return; | ||
| final int farScale = Settings.REGISTRY.waypointBeaconScaleMin.getAsInt(); | ||
| final double maxRenderDistance = Math.min(mc.options.renderDistance().get() << 4, farScale == 0 ? Integer.MAX_VALUE : farScale << 4); | ||
| if (xzDistance > maxRenderDistance) { | ||
| final Vec3 delta = waypointVec.subtract(playerVec).normalize(); | ||
| waypointVec = playerVec.add(new Vec3(delta.x * maxRenderDistance, delta.y * maxRenderDistance, delta.z * maxRenderDistance)); | ||
| } | ||
| final EntityRenderDispatcher entityRenderDispatcher = mc.getEntityRenderDispatcher(); | ||
| final Camera camera = entityRenderDispatcher.camera; | ||
| final Frustum frustum = mc.levelRenderer.cullingFrustum; | ||
| if (camera == null || frustum == null) return; | ||
| final double viewX = camera.getPosition().x(); | ||
| final double viewZ = camera.getPosition().z(); | ||
| final double x = waypointVec.x - viewX; | ||
| final double z = waypointVec.z - viewZ; | ||
| final double y = -100; | ||
| if (!frustum.isVisible(new AABB(waypointVec.x-1, -100, waypointVec.z-1, waypointVec.x+1, 500, waypointVec.z+1))) return; | ||
| final int color = waypoint.getWaypointColor().getHex(); | ||
| final MultiBufferSource.BufferSource entityVertexConsumers = mc.renderBuffers().bufferSource(); | ||
| final long time = mc.level.getGameTime(); | ||
| matrixStack.pushPose(); | ||
| matrixStack.translate(x, y, z); | ||
| BeaconRenderer.renderBeaconBeam( | ||
| matrixStack, entityVertexConsumers, BEAM_LOCATION, tickDelta, 1.0f, time, 0, 355, | ||
| ColorHelper.getColorRGBA(color), 0.2f, 0.25f); | ||
| matrixStack.popPose(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.