Merge pull request #4 from mcslee/dev

Merge 0.4.0 release

.classpath

@@ -6,7 +6,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/LX"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding/<project>=UTF-8

VERSION

@@ -1,3 +1,8 @@
+0.4.0
+December 1, 2021
+- Update to Processing 4 / P4LX
+- Add mappable recall parameter for LXPattern triggering
+
 0.2.3
 November 30, 2021
 - Add support for custom model view layer, per-channel view settings

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.heronarts</groupId>
     <artifactId>glx</artifactId>
-    <version>0.2.3</version>
+    <version>0.4.0</version>
 	<packaging>jar</packaging>
 
     <properties>

src/main/java/heronarts/glx/ui/component/UIButton.java

@@ -566,7 +566,10 @@ public BooleanParameter getTriggerTarget() {
     return this.triggerable ? getTriggerParameter() : null;
   }
 
-  private BooleanParameter getTriggerParameter() {
+  protected BooleanParameter getTriggerParameter() {
+    if (this.controlTarget instanceof BooleanParameter) {
+      return (BooleanParameter) this.controlTarget;
+    }
     if (this.booleanParameter != null && this.booleanParameter.isMappable() && this.booleanParameter.getParent() != null) {
       return this.booleanParameter;
     }