Skip to content

Merge 1.18 into develop #5789

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

Merged
kwvanderlinde merged 2 commits into from
Sep 24, 2025
Merged

Merge 1.18 into develop #5789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13607db
Remove remaining references to GdxRenderer
kwvanderlinde Sep 16, 2025
c1db4b6
Merge pull request #5784 from kwvanderlinde/bugfix/5780-remove-GdxRen…
kwvanderlinde Sep 19, 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
9 changes: 0 additions & 9 deletions src/main/java/net/rptools/maptool/client/ui/zone/renderer/ZoneRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import net.rptools.maptool.client.ui.token.BarTokenOverlay;
import net.rptools.maptool.client.ui.token.dialog.create.NewTokenDialog;
import net.rptools.maptool.client.ui.zone.*;
import net.rptools.maptool.client.ui.zone.gdx.GdxRenderer;
import net.rptools.maptool.client.ui.zone.renderer.tokenRender.FacingArrowRenderer;
import net.rptools.maptool.client.ui.zone.renderer.tokenRender.TokenRenderer;
import net.rptools.maptool.client.walker.ZoneWalker;
Expand Down Expand Up @@ -534,7 +533,6 @@ public boolean isTokenMoving(Token token) {

protected void setViewOffset(int x, int y) {
zoneScale.setOffset(x, y);
GdxRenderer.getInstance().setScale(zoneScale);
}

public void centerOn(ZonePoint point) {
Expand Down Expand Up @@ -567,7 +565,6 @@ public void flush(Token token) {
visibleScreenArea = null;

zoneView.flush(token);
GdxRenderer.getInstance().flushFog();
}

/**
Expand Down Expand Up @@ -608,7 +605,6 @@ public void flushLight() {
public void flushFog() {
visibleScreenArea = null;
repaintDebouncer.dispatch();
GdxRenderer.getInstance().flushFog();
}

/**
Expand Down Expand Up @@ -647,19 +643,16 @@ public void moveViewByCells(int dx, int dy) {
public void zoomReset(int x, int y) {
zoneScale.zoomReset(x, y);
MapTool.getFrame().getZoomStatusBar().update();
GdxRenderer.getInstance().setScale(zoneScale);
}

public void zoomIn(int x, int y) {
zoneScale.zoomIn(x, y);
MapTool.getFrame().getZoomStatusBar().update();
GdxRenderer.getInstance().setScale(zoneScale);
}

public void zoomOut(int x, int y) {
zoneScale.zoomOut(x, y);
MapTool.getFrame().getZoomStatusBar().update();
GdxRenderer.getInstance().setScale(zoneScale);
}

public void enforceView(int x, int y, double scale, int gmWidth, int gmHeight) {
Expand All @@ -679,7 +672,6 @@ public void enforceView(int x, int y, double scale, int gmWidth, int gmHeight) {

setScale(scale);
centerOn(new ZonePoint(x, y));
GdxRenderer.getInstance().setScale(zoneScale);
}

public void restoreView() {
Expand All @@ -688,7 +680,6 @@ public void restoreView() {

centerOn(previousZonePoint);
setScale(previousScale);
GdxRenderer.getInstance().setScale(zoneScale);
}

public void forcePlayersView() {
Expand Down
Loading