Skip to content

Commit fde1f10

Browse files
thelsingthelsing
committed
fix build after merge
1 parent 3bd138e commit fde1f10

5 files changed

Lines changed: 24 additions & 39 deletions

File tree

‎build.gradle‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ def javaArgs = [
4040
"-DMAPTOOL_DATADIR=.maptool-" + vendor.toLowerCase(), "-XX:+ShowCodeDetailsInExceptionMessages",
4141
"--add-opens=java.desktop/java.awt=ALL-UNNAMED", "--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED",
4242
"--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED", "--add-opens=java.base/java.util=ALL-UNNAMED",
43-
"--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED",
43+
"--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED",
44+
"--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED","--add-opens=java.base/java.lang=ALL-UNNAMED",
45+
"--add-opens=java.desktop/sun.awt=ALL-UNNAMED", "--add-opens=java.desktop/sun.java2d=ALL-UNNAMED",
4446
"--add-opens=java.desktop/javax.swing=ALL-UNNAMED","--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED",
4547
"--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED"]
4648

@@ -483,10 +485,6 @@ shadowJar {
483485
exclude 'module-info.class' //This is to make sure maptool doesn't become a module by including module-info of dependencies. Probably needs to be fixed before we go to jdk 11+
484486
}
485487

486-
configurations.all {
487-
resolutionStrategy.cacheDynamicVersionsFor 10, 'minutes'
488-
}
489-
490488
jar {
491489
manifest {
492490
attributes 'Implementation-Title': project.name + developerRelease,

‎src/main/java/net/rptools/maptool/client/ui/zone/gdx/AreaRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public FloatArray pathToFloatArray(PathIterator it) {
276276
segmentIndicies.add(index);
277277
index += 1;
278278
break;
279-
// return tmpFloat;
279+
// return tmpFloat;
280280
case PathIterator.SEG_LINETO:
281281
// System.out.println("Line to: ( " + floatsFromArea[0] + ", " +
282282
// floatsFromArea[1] + ")");

‎src/main/java/net/rptools/maptool/client/ui/zone/gdx/GdxRenderer.java‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@
4848
import net.rptools.maptool.client.swing.ImageBorder;
4949
import net.rptools.maptool.client.swing.SwingUtil;
5050
import net.rptools.maptool.client.tool.Tool;
51-
import net.rptools.maptool.client.tool.drawing.FreehandExposeTool;
52-
import net.rptools.maptool.client.tool.drawing.OvalExposeTool;
53-
import net.rptools.maptool.client.tool.drawing.PolygonExposeTool;
54-
import net.rptools.maptool.client.tool.drawing.RectangleExposeTool;
51+
import net.rptools.maptool.client.tool.WallTopologyTool;
5552
import net.rptools.maptool.client.ui.Scale;
5653
import net.rptools.maptool.client.ui.theme.Borders;
5754
import net.rptools.maptool.client.ui.theme.RessourceManager;
@@ -325,7 +322,7 @@ public void render() {
325322
}
326323

327324
private void updateVbl() {
328-
var currentVbl = zoneCache.getZone().getTopology(Zone.TopologyType.WALL_VBL);
325+
var currentVbl = zoneCache.getZone().getMaskTopology(Zone.TopologyType.WALL_VBL);
329326
// if (currentVbl.equals(vbl)) return;
330327

331328
vbl = currentVbl;
@@ -780,7 +777,7 @@ private void paintlightSourceIconOverlay() {
780777
if (token.hasLightSources()) {
781778
boolean foundNormalLight = false;
782779
for (AttachedLightSource attachedLightSource : token.getLightSources()) {
783-
LightSource lightSource = attachedLightSource.resolve(MapTool.getCampaign());
780+
LightSource lightSource = attachedLightSource.resolve(token, MapTool.getCampaign());
784781
if (lightSource != null && lightSource.getType() == LightSource.Type.NORMAL) {
785782
foundNormalLight = true;
786783
break;
@@ -846,8 +843,7 @@ private void renderGMVisionOverlay(PlayerView view) {
846843

847844
private void renderVisionOverlay(PlayerView view) {
848845
var tokenUnderMouse = zoneCache.getZoneRenderer().getTokenUnderMouse();
849-
if (tokenUnderMouse == null)
850-
return;
846+
if (tokenUnderMouse == null) return;
851847

852848
Area currentTokenVisionArea = zoneCache.getZoneView().getVisibleArea(tokenUnderMouse, view);
853849
if (currentTokenVisionArea == null) {
@@ -887,7 +883,7 @@ private void renderHaloArea(Area visible) {
887883
if (tokenUnderMouse == null) return;
888884

889885
boolean useHaloColor =
890-
tokenUnderMouse.getHaloColor() != null && AppPreferences.getUseHaloColorOnVisionOverlay();
886+
tokenUnderMouse.getHaloColor() != null && AppPreferences.useHaloColorOnVisionOverlay.get();
891887
if (tokenUnderMouse.getVisionOverlayColor() != null || useHaloColor) {
892888
java.awt.Color visionColor =
893889
useHaloColor ? tokenUnderMouse.getHaloColor() : tokenUnderMouse.getVisionOverlayColor();
@@ -896,7 +892,7 @@ private void renderHaloArea(Area visible) {
896892
visionColor.getRed() / 255f,
897893
visionColor.getGreen() / 255f,
898894
visionColor.getBlue() / 255f,
899-
AppPreferences.getHaloOverlayOpacity() / 255f);
895+
AppPreferences.haloOverlayOpacity.get() / 255f);
900896
areaRenderer.setColor(tmpColor);
901897
areaRenderer.fillArea(batch, visible);
902898
}
@@ -977,7 +973,7 @@ private void setProjectionMatrix(Matrix4 matrix) {
977973
private void renderFogArea(Area softFog, Area visibleArea) {
978974
if (zoneCache.getZoneView().isUsingVision()) {
979975
if (visibleArea != null && !visibleArea.isEmpty()) {
980-
tmpColor.set(0, 0, 0, AppPreferences.getFogOverlayOpacity() / 255.0f);
976+
tmpColor.set(0, 0, 0, AppPreferences.fogOverlayOpacity.get() / 255.0f);
981977
areaRenderer.setColor(tmpColor);
982978
// Fill in the exposed area
983979
areaRenderer.fillArea(batch, softFog);
@@ -988,7 +984,7 @@ private void renderFogArea(Area softFog, Area visibleArea) {
988984

989985
areaRenderer.fillArea(batch, visibleArea);
990986
} else {
991-
tmpColor.set(0, 0, 0, AppPreferences.getFogOverlayOpacity() / 255.0f);
987+
tmpColor.set(0, 0, 0, AppPreferences.fogOverlayOpacity.get() / 255.0f);
992988
areaRenderer.setColor(tmpColor);
993989
areaRenderer.fillArea(batch, softFog);
994990
}
@@ -1257,7 +1253,7 @@ private void showBlockedMoves(ZonePoint zp, double angle, Sprite image, float si
12571253
}
12581254

12591255
private void renderAuras(PlayerView view) {
1260-
var alpha = AppPreferences.getAuraOverlayOpacity() / 255.0f;
1256+
var alpha = AppPreferences.auraOverlayOpacity.get() / 255.0f;
12611257

12621258
// Setup
12631259
timer.start("renderAuras:getAuras");
@@ -1284,7 +1280,7 @@ private void renderLights(PlayerView view) {
12841280

12851281
renderLightOverlay(
12861282
drawableLights,
1287-
AppPreferences.getLightOverlayOpacity() / 255.f,
1283+
AppPreferences.lightOverlayOpacity.get() / 255.f,
12881284
GL20.GL_SRC_COLOR,
12891285
GL20.GL_ONE_MINUS_SRC_COLOR);
12901286
timer.stop("renderLights:renderLightOverlay");
@@ -1293,7 +1289,7 @@ private void renderLights(PlayerView view) {
12931289
if (AppState.isShowLumensOverlay()) {
12941290
// Lumens overlay enabled.
12951291
timer.start("renderLights:renderLumensOverlay");
1296-
renderLumensOverlay(view, AppPreferences.getLumensOverlayOpacity() / 255.0f);
1292+
renderLumensOverlay(view, AppPreferences.lumensOverlayOpacity.get() / 255.0f);
12971293
timer.stop("renderLights:renderLumensOverlay");
12981294
}
12991295
}
@@ -1370,7 +1366,7 @@ private void renderLumensOverlay(PlayerView view, float overlayAlpha) {
13701366
batch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
13711367
// Now draw borders around each region if configured.
13721368
batch.setColor(Color.WHITE);
1373-
final var borderThickness = AppPreferences.getLumensOverlayBorderThickness();
1369+
final var borderThickness = AppPreferences.lumensOverlayBorderThickness.get();
13741370
if (borderThickness > 0) {
13751371
tmpColor.set(0.f, 0.f, 0.f, 1.f);
13761372
for (final var lumensLevel : disjointLumensLevels) {
@@ -1559,7 +1555,7 @@ private void renderTokens(List<Token> tokenList, PlayerView view, boolean figure
15591555
batch,
15601556
zoneCache.getZone().getGrid().getTokenCellArea(tokenBounds),
15611557
false,
1562-
AppPreferences.getHaloLineWidth());
1558+
AppPreferences.haloLineWidth.get());
15631559
}
15641560

15651561
// Calculate alpha Transparency from token and use opacity for indicating that token is moving
@@ -1626,7 +1622,7 @@ private void renderTokens(List<Token> tokenList, PlayerView view, boolean figure
16261622
case FIGURE:
16271623
if (token.getHasImageTable()
16281624
&& token.hasFacing()
1629-
&& AppPreferences.getForceFacingArrow() == false) {
1625+
&& AppPreferences.forceFacingArrow.get() == false) {
16301626
break;
16311627
}
16321628
java.awt.Shape arrow =
@@ -1659,7 +1655,7 @@ private void renderTokens(List<Token> tokenList, PlayerView view, boolean figure
16591655

16601656
break;
16611657
case TOP_DOWN:
1662-
if (AppPreferences.getForceFacingArrow() == false) {
1658+
if (AppPreferences.forceFacingArrow.get() == false) {
16631659
break;
16641660
}
16651661
case CIRCLE:
@@ -1796,12 +1792,7 @@ private void renderTokens(List<Token> tokenList, PlayerView view, boolean figure
17961792
}
17971793
if (useIF && token.getLayer().supportsVision() && zoneCache.getZoneView().isUsingVision()) {
17981794
Tool tool = MapTool.getFrame().getToolbox().getSelectedTool();
1799-
if (tool
1800-
instanceof
1801-
RectangleExposeTool // XXX Change to use marker interface such as ExposeTool?
1802-
|| tool instanceof OvalExposeTool
1803-
|| tool instanceof FreehandExposeTool
1804-
|| tool instanceof PolygonExposeTool) {
1795+
if (tool instanceof WallTopologyTool) {
18051796
selectedBorder = RessourceManager.getBorder(Borders.FOW_TOOLS);
18061797
}
18071798
}
@@ -1866,7 +1857,7 @@ private void renderTokens(List<Token> tokenList, PlayerView view, boolean figure
18661857
// Stacks
18671858
// TODO: find a cleaner way to indicate token layer
18681859
if (!tokenList.isEmpty() && tokenList.get(0).getLayer().isTokenLayer()) {
1869-
boolean hideTSI = AppPreferences.getHideTokenStackIndicator();
1860+
boolean hideTSI = AppPreferences.hideTokenStackIndicator.get();
18701861
if (tokenStackMap != null
18711862
&& !hideTSI) { // FIXME Needed to prevent NPE but how can it be null?
18721863
for (Token token : tokenStackMap.keySet()) {

‎src/main/java/net/rptools/maptool/client/ui/zone/gdx/GridRenderer.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@
1717
import com.badlogic.gdx.graphics.Camera;
1818
import com.badlogic.gdx.graphics.Color;
1919
import com.badlogic.gdx.graphics.g2d.Batch;
20-
import com.badlogic.gdx.math.Matrix4;
2120
import com.badlogic.gdx.utils.Pools;
21+
import java.awt.*;
2222
import net.rptools.maptool.client.AppState;
23-
import net.rptools.maptool.client.swing.SwingUtil;
2423
import net.rptools.maptool.client.ui.zone.renderer.ZoneRendererConstants;
2524
import net.rptools.maptool.model.*;
26-
import space.earlygrey.shapedrawer.JoinType;
2725
import space.earlygrey.shapedrawer.ShapeDrawer;
2826

29-
import java.awt.*;
30-
3127
public class GridRenderer {
3228
private ZoneCache zoneCache;
3329
private final AreaRenderer areaRenderer;

‎src/main/java/net/rptools/maptool/model/HexGrid.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public Point2D.Double getCenterOffset() {
103103
public double getEdgeProjection() {
104104
return edgeProjection;
105105
}
106+
106107
/**
107108
* Length all edges. For a regular hexagon, this will also be the distance from the center point
108109
* to any vertex, but for a stretch hexagon this does not hold different.
@@ -228,8 +229,7 @@ private void setDimensions(int size, double diameter) {
228229
// edgeProjection = (diameter - edgeLength) / 2
229230
}
230231

231-
public GeneralPath createHalfShape(
232-
double minorRadius, double edgeProjection, double edgeLength) {
232+
public GeneralPath createHalfShape(double minorRadius, double edgeProjection, double edgeLength) {
233233
GeneralPath hex = new GeneralPath();
234234
hex.moveTo(0, minorRadius);
235235
hex.lineTo(edgeProjection, 0);

0 commit comments

Comments
 (0)