Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues with scaling when mapScale != guiScale. #273

Open
wants to merge 2 commits into
base: 1.20
Choose a base branch
from
Open

Fix issues with scaling when mapScale != guiScale. #273

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d73904
Fix issues with scaling when mapScale != guiScale.
murphy-slaw Feb 14, 2025
75cdad4
Oops, markerScale is different. Reverting that change.
murphy-slaw Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/main/java/folk/sisby/antique_atlas/gui/AtlasScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@ private int getMapScale() {
};
}

private float getEffectiveScale(){
return (float)(mapScale/MinecraftClient.getInstance().getWindow().getScaleFactor());
}

public AtlasScreen prepareToOpen() {
MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.ITEM_BOOK_PAGE_TURN, 1.0F));

Expand Down Expand Up @@ -389,7 +393,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
}

private double getPixelsPerBlock() {
return ((double) mapScale / MinecraftClient.getInstance().getWindow().getScaleFactor()) * ((double) tilePixels) / ((double) tileChunks * 16.0);
return (double) getEffectiveScale() * ((double) tilePixels) / ((double) tileChunks * 16.0);
}

@Override
Expand Down Expand Up @@ -501,7 +505,7 @@ private double getTargetPositionY() {
private void updateScaleBookmark() {
int tileSizeBlocks = (tileChunks * 16 * 16) / tilePixels;
int defaultTileSizeBlocks = 16;
int rulerSizeBlocks = (tileSizeBlocks * (int) MinecraftClient.getInstance().getWindow().getScaleFactor()) / mapScale;
int rulerSizeBlocks = (int)(tileSizeBlocks * getEffectiveScale());
resetScaleBookmark.setLabel(Text.literal(
rulerSizeBlocks == 16 | rulerSizeBlocks >= 32 ? "%dc".formatted(rulerSizeBlocks / 16) : "%db".formatted(rulerSizeBlocks)).formatted(
tileSizeBlocks < defaultTileSizeBlocks ? Formatting.DARK_RED : tileSizeBlocks == defaultTileSizeBlocks ? Formatting.BLACK : Formatting.DARK_BLUE
Expand Down Expand Up @@ -660,7 +664,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float par3) {
if (playerSummary != null) orderedFriends.put(SurveyorClient.getClientUuid(), playerSummary);
orderedFriends.forEach((uuid, friend) -> {
if (state.is(HIDING_MARKERS) && (!playerBookmark.isSelected() || friend != playerSummary)) return;
renderPlayer(context, friend, 1, hoveredFriend == friend && markerModal.getParent() == null, friend == playerSummary);
renderPlayer(context, friend, (float)(mapScale/guiScale), hoveredFriend == friend && markerModal.getParent() == null, friend == playerSummary);
});
context.getMatrices().pop();

Expand Down Expand Up @@ -701,9 +705,10 @@ public void render(DrawContext context, int mouseX, int mouseY, float par3) {
}

public static void renderTiles(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int mapX, int mapY, int mapWidth, int mapHeight, double mapStartScreenX, double mapStartScreenY, double mapScale, int pixelsPerTile, double guiScale, int light, TileRenderIterator tiles) {
float effectiveScale = (float)(mapScale/guiScale);
matrices.push();
matrices.translate(mapStartScreenX, mapStartScreenY, 0);
matrices.scale((float) (mapScale / guiScale), (float) (mapScale / guiScale), 1.0F);
matrices.scale(effectiveScale, effectiveScale, 1.0F);

Map<TileTexture, Collection<SubTile>> tileTextures = new Reference2ObjectArrayMap<>();
for (SubTileQuartet subTiles : tiles) {
Expand All @@ -719,7 +724,7 @@ public static void renderTiles(MatrixStack matrices, VertexConsumerProvider vert
int drawX = subtile.x * subTilePixels;
int drawY = subtile.y * subTilePixels;
// a non-scope bounds check allows subtile-level accuracy, and keeps border tiling accurate.
if (drawX * (guiScale / mapScale) > mapX + mapWidth - mapStartScreenX || drawY * (guiScale / mapScale) > mapY + mapHeight - mapStartScreenY || (drawX + subTilePixels) * (guiScale / mapScale) < mapX - mapStartScreenX || (drawY + subTilePixels) * (guiScale / mapScale) < mapY - mapStartScreenY) continue;
if (drawX * effectiveScale > mapX + mapWidth - mapStartScreenX || drawY * effectiveScale > mapY + mapHeight - mapStartScreenY || (drawX + subTilePixels) * effectiveScale < mapX - mapStartScreenX || (drawY + subTilePixels) * effectiveScale < mapY - mapStartScreenY) continue;
batcher.add(drawX, drawY, subTilePixels, subTilePixels, subtile.getTextureU() * 8, subtile.getTextureV() * 8, 8, 8, 0xFFFFFFFF);
}
}
Expand Down