Merge pull request #4553 from kwvanderlinde/feature/331-unique-light-…

…source-ui-minimal Add UI for defining unique lights
RPTools · Dec 15, 2023 · 53d8009 · 53d8009
2 parents 47d9899 + 0f92499
commit 53d8009
Show file tree

Hide file tree

Showing 8 changed files with 776 additions and 581 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/campaignproperties/CampaignPropertiesDialog.java b/src/main/java/net/rptools/maptool/client/ui/campaignproperties/CampaignPropertiesDialog.java
diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java
@@ -87,6 +87,7 @@
 import net.rptools.maptool.util.ExtractHeroLab;
 import net.rptools.maptool.util.FunctionUtil;
 import net.rptools.maptool.util.ImageManager;
+import net.rptools.maptool.util.LightSyntax;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
@@ -172,6 +173,10 @@ public void initTerrainModifiersIgnoredList() {
     EnumSet.allOf(TerrainModifierOperation.class).forEach(operationModel::addElement);
   }
 
+  public void initUniqueLightSourcesTextPane() {
+    setUniqueLightSourcesEnabled(MapTool.getPlayer().isGM());
+  }
+
   public void initJtsMethodComboBox() {
     getJtsMethodComboBox().setModel(new DefaultComboBoxModel<>(JTS_SimplifyMethodType.values()));
   }
@@ -201,6 +206,8 @@ public void closeDialog() {
     setGmNotesEnabled(MapTool.getPlayer().isGM());
     getComponent("@GMName").setEnabled(MapTool.getPlayer().isGM());
 
+    setUniqueLightSourcesEnabled(MapTool.getPlayer().isGM());
+
     dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
     setLibTokenPaneEnabled(token.isLibToken());
@@ -371,6 +378,9 @@ public void bind(final Token token) {
                 .mapToInt(Integer::valueOf)
                 .toArray());
 
+    getUniqueLightSourcesTextPane()
+        .setText(new LightSyntax().stringifyLights(token.getUniqueLightSources()));
+
     // Jamz: Init the Topology tab...
     JTabbedPane tabbedPane = getTabbedPane();
 
@@ -709,6 +719,15 @@ public JList<TerrainModifierOperation> getTerrainModifiersIgnoredList() {
     return (JList<TerrainModifierOperation>) getComponent("terrainModifiersIgnored");
   }
 
+  public void setUniqueLightSourcesEnabled(boolean enabled) {
+    getUniqueLightSourcesTextPane().setEnabled(enabled);
+    getLabel("uniqueLightSourcesLabel").setEnabled(enabled);
+  }
+
+  public JTextPane getUniqueLightSourcesTextPane() {
+    return (JTextPane) getComponent("uniqueLightSources");
+  }
+
   public JLabel getLibTokenURIErrorLabel() {
     return (JLabel) getComponent("Label.LibURIError");
   }
@@ -783,6 +802,14 @@ public boolean commit() {
     token.setTerrainModifiersIgnored(
         new HashSet<>(getTerrainModifiersIgnoredList().getSelectedValuesList()));
 
+    var uniqueLightSources =
+        new LightSyntax()
+            .parseLights(getUniqueLightSourcesTextPane().getText(), token.getUniqueLightSources());
+    token.removeAllUniqueLightsources();
+    for (var lightSource : uniqueLightSources.values()) {
+      token.addUniqueLightSource(lightSource);
+    }
+
     // Get the states
     Component[] stateComponents = getStatesPanel().getComponents();
     Container barPanel = null;
@@ -1210,6 +1237,7 @@ public void initTokenDetails() {
 
   public void initTokenLayoutPanel() {
     TokenLayoutPanel layoutPanel = new TokenLayoutPanel();
+    layoutPanel.setMinimumSize(new Dimension(150, 125));
     layoutPanel.setPreferredSize(new Dimension(150, 125));
     layoutPanel.setName("tokenLayout");
 
@@ -1218,6 +1246,7 @@ public void initTokenLayoutPanel() {
 
   public void initCharsheetPanel() {
     ImageAssetPanel panel = new ImageAssetPanel();
+    panel.setMinimumSize(new Dimension(150, 125));
     panel.setPreferredSize(new Dimension(150, 125));
     panel.setName("charsheet");
     panel.setLayout(new GridLayout());
@@ -1227,6 +1256,7 @@ public void initCharsheetPanel() {
 
   public void initPortraitPanel() {
     ImageAssetPanel panel = new ImageAssetPanel();
+    panel.setMinimumSize(new Dimension(150, 125));
     panel.setPreferredSize(new Dimension(150, 125));
     panel.setName("portrait");
     panel.setLayout(new GridLayout());

diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form
diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.java b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.java
@@ -14,7 +14,6 @@
  */
 package net.rptools.maptool.client.ui.token.dialog.edit;
 
-import java.awt.*;
 import javax.swing.*;
 import net.rptools.maptool.client.swing.htmleditorsplit.HtmlEditorSplit;
 

diff --git a/src/main/java/net/rptools/maptool/model/Token.java b/src/main/java/net/rptools/maptool/model/Token.java
@@ -933,6 +933,10 @@ public void removeUniqueLightSource(GUID lightSourceId) {
     uniqueLightSources.remove(lightSourceId);
   }
 
+  public void removeAllUniqueLightsources() {
+    uniqueLightSources.clear();
+  }
+
   public void addLightSource(GUID lightSourceId) {
     if (lightSourceList.stream().anyMatch(source -> source.matches(lightSourceId))) {
       // Avoid duplicates.