Factor out more rendering logic into separate renderers

src/main/java/net/rptools/maptool/client/ui/zone/ZoneView.java

@@ -610,12 +610,7 @@ private Area getTokenVisibleArea(@Nonnull Token token) {
    * @param token the token to get the visible area of.
    * @return the visible area of a token, including the effect of other lights.
    */
-  public Area getVisibleArea(Token token, PlayerView view) {
-    // Sanity
-    if (token == null) {
-      return null;
-    }
-
+  public Area getVisibleArea(@Nonnull Token token, PlayerView view) {
     // Cache ?
     Map<GUID, Area> tokenVisionCache =
         tokenVisionCachePerView.computeIfAbsent(view, v -> new HashMap<>());

src/main/java/net/rptools/maptool/client/ui/zone/renderer/DarknessRenderer.java

@@ -0,0 +1,57 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.client.ui.zone.renderer;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.Area;
+import net.rptools.maptool.client.ui.zone.PlayerView;
+import net.rptools.maptool.client.ui.zone.ZoneView;
+
+/**
+ * Draws a solid black overlay wherever a non-GM player should see darkness.
+ *
+ * <p>If the current view is a GM view, this renders nothing since darkness is rendered as a light
+ * source for GMs.
+ */
+public class DarknessRenderer {
+  private final RenderHelper renderHelper;
+  private final ZoneView zoneView;
+
+  public DarknessRenderer(RenderHelper renderHelper, ZoneView zoneView) {
+    this.renderHelper = renderHelper;
+    this.zoneView = zoneView;
+  }
+
+  public void render(Graphics2D g2d, PlayerView view) {
+    if (!view.isGMView()) {
+      return;
+    }
+    final Area darkness = zoneView.getIllumination(view).getDarkenedArea();
+    if (darkness.isEmpty()) {
+      // Skip the rendering work if it isn't necessary.
+      return;
+    }
+
+    renderHelper.render(g2d, worldG -> renderWorld(worldG, darkness));
+  }
+
+  private void renderWorld(Graphics2D worldG, Area darkness) {
+    worldG.setComposite(AlphaComposite.Src);
+    worldG.setPaint(Color.black);
+    worldG.fill(darkness);
+  }
+}

src/main/java/net/rptools/maptool/client/ui/zone/renderer/DebugRenderer.java

@@ -0,0 +1,64 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.client.ui.zone.renderer;
+
+import com.google.common.collect.Iterators;
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Shape;
+
+public class DebugRenderer {
+  private final RenderHelper renderHelper;
+  private final Color[] palette;
+
+  public DebugRenderer(RenderHelper renderHelper) {
+    this.renderHelper = renderHelper;
+    palette = new Color[] {Color.red, Color.green, Color.blue};
+  }
+
+  public void renderShapes(Graphics2D g2d, Iterable<Shape> shapes) {
+    renderHelper.render(g2d, worldG -> renderWorld(worldG, shapes));
+  }
+
+  private void renderWorld(Graphics2D worldG, Iterable<Shape> shapes) {
+    worldG.setComposite(AlphaComposite.SrcOver);
+    // Keep the line a consistent thickness
+    worldG.setStroke(new BasicStroke(1 / (float) worldG.getTransform().getScaleX()));
+
+    var paletteIterator = Iterators.cycle(palette);
+    for (final var shape : shapes) {
+      final var color = paletteIterator.next();
+
+      if (shape == null) {
+        continue;
+      }
+
+      var fillColor = color.darker();
+      fillColor =
+          new Color(
+              fillColor.getRed(),
+              fillColor.getGreen(),
+              fillColor.getBlue(),
+              fillColor.getAlpha() / 3);
+      worldG.setColor(fillColor);
+      worldG.fill(shape);
+
+      worldG.setColor(color);
+      worldG.draw(shape);
+    }
+  }
+}

src/main/java/net/rptools/maptool/client/ui/zone/renderer/FogRenderer.java

@@ -0,0 +1,127 @@
+/*
+ * This software Copyright by the RPTools.net development team, and
+ * licensed under the Affero GPL Version 3 or, at your option, any later
+ * version.
+ *
+ * MapTool Source Code is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License * along with this source Code.  If not, please visit
+ * <http://www.gnu.org/licenses/> and specifically the Affero license
+ * text at <http://www.gnu.org/licenses/agpl.html>.
+ */
+package net.rptools.maptool.client.ui.zone.renderer;
+
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.Area;
+import net.rptools.lib.CodeTimer;
+import net.rptools.maptool.client.AppPreferences;
+import net.rptools.maptool.client.ui.zone.PlayerView;
+import net.rptools.maptool.client.ui.zone.ZoneView;
+import net.rptools.maptool.model.Zone;
+
+public class FogRenderer {
+  private final RenderHelper renderHelper;
+  private final Zone zone;
+  private final ZoneView zoneView;
+
+  public FogRenderer(RenderHelper renderHelper, Zone zone, ZoneView zoneView) {
+    this.renderHelper = renderHelper;
+    this.zone = zone;
+    this.zoneView = zoneView;
+  }
+
+  public void render(Graphics2D g, PlayerView view) {
+    var timer = CodeTimer.get();
+    timer.start("renderFog");
+    try {
+      if (!zone.hasFog()) {
+        return;
+      }
+
+      this.renderHelper.bufferedRender(
+          g, AlphaComposite.SrcOver, worldG -> renderWorld(worldG, view));
+    } finally {
+      timer.stop("renderFog");
+    }
+  }
+
+  private void renderWorld(Graphics2D worldG, PlayerView view) {
+    var timer = CodeTimer.get();
+
+    /* The tricky thing in this method is that the areas we have (exposed, visible) are the areas
+     * where we should _not_ render. So we have to do clipped fills and clears instead of directly
+     * rendering the areas. */
+    timer.start("renderFog-getVisibleArea");
+    Area visibleArea = zoneView.getVisibleArea(view);
+    timer.stop("renderFog-getVisibleArea");
+
+    String msg = null;
+    if (timer.isEnabled()) {
+      msg =
+          "renderFog-getExposedArea("
+              + (view.isUsingTokenView() ? view.getTokens().size() : 0)
+              + ")";
+    }
+    timer.start(msg);
+    Area exposedArea = zoneView.getExposedArea(view);
+    timer.stop(msg);
+
+    // Hard FOW is cleared by exposed areas. The exposed area itself has two regions: the visible
+    // area (rendered clear) and the soft FOW area (rendered translucent). But if vision is off,
+    // treat the entire exposed area as visible.
+    Area softFogArea;
+    Area clearArea;
+    if (zoneView.isUsingVision()) {
+      softFogArea = exposedArea;
+      clearArea = new Area(visibleArea);
+      clearArea.intersect(softFogArea);
+    } else {
+      softFogArea = new Area();
+      clearArea = exposedArea;
+    }
+
+    var originalClip = worldG.getClip();
+
+    timer.start("renderFog-hardFow");
+    // Fill. This will be cleared out later to produce soft fog and clear visible area.
+    worldG.setPaint(zone.getFogPaint().getPaint());
+    // JFJ this fixes the GM exposed area view.
+    worldG.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC, view.isGMView() ? .6f : 1f));
+    var bounds = originalClip.getBounds();
+    worldG.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
+    timer.start("renderFog-hardFow");
+
+    timer.start("renderFog-softFow");
+    if (!softFogArea.isEmpty()) {
+      worldG.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC));
+      worldG.setColor(new Color(0, 0, 0, AppPreferences.getFogOverlayOpacity()));
+      worldG.fill(softFogArea);
+    }
+    timer.stop("renderFog-softFow");
+
+    timer.start("renderFog-exposedArea");
+    if (!clearArea.isEmpty()) {
+      // Now fill in the visible area.
+      worldG.setComposite(AlphaComposite.getInstance(AlphaComposite.CLEAR));
+      worldG.fill(clearArea);
+    }
+    timer.stop("renderFog-exposedArea");
+
+    timer.start("renderFog-outline");
+    // If there is no boundary between soft fog and visible area, there is no need for an outline.
+    if (!softFogArea.isEmpty() && !clearArea.isEmpty()) {
+      worldG.setComposite(AlphaComposite.Src);
+      // Keep the line a consistent thickness
+      worldG.setStroke(new BasicStroke(1 / (float) worldG.getTransform().getScaleX()));
+      worldG.setColor(Color.BLACK);
+      worldG.draw(clearArea);
+    }
+    timer.stop("renderFog-outline");
+  }
+}