Merge branch 'dev'

.classpath

@@ -12,8 +12,9 @@
 		</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">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

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

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

.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,8 +12,8 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

LICENSE

@@ -1,6 +1,6 @@
-Copyright 2013-2022 Mark C. Slee, Heron Arts LLC
+Copyright 2013-2024 Mark C. Slee, Heron Arts LLC		
 
-LX STUDIO SOFTWARE LICENSE AND DISTRIBUTION AGREEMENT
+CHROMATIK / LX SOFTWARE LICENSE AND DISTRIBUTION AGREEMENT
 
 This Software License and Distribution Agreement (the "Agreement") is entered 
 into by and between Heron Arts LLC, with offices at 7 Heron Street, San 
@@ -18,7 +18,7 @@ Software, in object code or executable form only.
 with all Licensee Applications, taken together, for any 12-month period during 
 the term of this Agreement, with no deductions.
 
-1.4. "Software" means the Heron Arts LX software libraries, including all 
+1.4. "Software" means the Heron Arts LX, GLX, Chromatik, and LX Studio software libraries, including all 
 Updates supplied by Heron Arts under this Agreement.
 
 1.5. "Update" means any correction, update, upgrade, patch or other 
@@ -54,7 +54,7 @@ is at least as favorable to Heron Arts as this Agreement.
 2.3. Proprietary Notices. On each Software copy, Licensee shall reproduce all 
 copyright or other proprietary notices contained on the Software, as provided 
 by Heron Arts. Licensee shall not alter or remove or in any other way obscure 
-or hide from display any Heron Arts or LX Studio logo or proprietary notice 
+or hide from display any any Heron Arts, Chromatik, or LX Studio logo or proprietary notice 
 from the Application user interface or in the Software.
 
 2.4. Third Party Open Source Software. Notwithstanding Section 2.1, Licensee 
@@ -76,7 +76,7 @@ and interest in the Software, and all intellectual property rights therein.
 
 4. Use of Heron Arts Trademarks. Licensee shall state that the Application 
 includes the Software and may use such applicable trademarks, trade names and
-logos of Heron Arts (including the LX Studio trademarks) as required to do so
+logos of Heron Arts (including the Chromatik and LX Studio trademarks) as required to do so
 (collectively, the "Heron Arts Trademarks"). Any and all good will arising from
 Licensee's use of the Heron Arts Trademarks will inure solely to the benefit of
 Heron Arts. Licensee shall not assert any claim to the Heron Arts Trademarks
@@ -86,8 +86,8 @@ Arts Trademark, in any jurisdiction.
 
 5. Heron Arts Portfolio. (i) Licensee hereby grants to Heron Arts the right to
 publicize Licensee's use of the Software and (ii) Heron Arts may use Licensee's
-logo on the LX Studio website in areas naming licensees of the software, and in
-LX Studio portfolios or marketing presentations listing licensees of the
+logo on the Chromatik or LX Studio website in areas naming licensees of the software, and in
+Chromatik or LX Studio portfolios or marketing presentations listing licensees of the
 Software.
 
 6. Term and Termination.

README.md

@@ -1,16 +1,16 @@
-**BY DOWNLOADING OR USING THE LX SOFTWARE OR ANY PART THEREOF, YOU AGREE TO THE TERMS AND CONDITIONS OF THE [LX STUDIO SOFTWARE LICENSE AND DISTRIBUTION AGREEMENT](http://lx.studio/license).**
+**BY DOWNLOADING OR USING THE LX SOFTWARE OR ANY PART THEREOF, YOU AGREE TO THE TERMS AND CONDITIONS OF THE [CHROMATIK / LX SOFTWARE LICENSE AND DISTRIBUTION AGREEMENT](http://chromatik.co/license/).**
 
-Please note that LX is not open-source software. The license grants permission to use this software freely in non-commercial applications. Commercial use is subject to a total annual revenue limit of $25K on any and all projects associated with the software. If this licensing is obstructive to your needs or you are unclear as to whether your desired use case is compliant, contact me to discuss proprietary licensing: [email protected]
+Please note that LX is not open-source software. The license grants permission to use this software freely in non-commercial applications. Commercial use is subject to a total annual revenue limit of $25K on any and all projects associated with the software. If this licensing is obstructive to your needs or you are unclear as to whether your desired use case is compliant, contact me to discuss proprietary licensing: [email protected]
 
 ---
 
-### GLX Overview ###
+### GLX ###
 
-GLX is an experimental fork of P3LX to run LX on top of the LWJGL rather than Processing. The build files have not been cleaned up as of now, and a few things in here may be out of sync or still being ported. I don't recommend anyone work with this just yet.
+GLX embeds the [LX](https://github.com/heronarts/LX/) framework in a cross-platform GUI environment using [LWJGL](https://www.lwjgl.org/) and [bgfx](https://github.com/bkaradzic/bgfx). This forms the foundation of the [Chromatik](https://chromatik.co) digital lighting workstation application. 
 
 ### Contact and Collaboration ###
 
-Building a big cool project? I'm probably interested in hearing about it! Want to solicit some help, request new framework features, or just ask a random question? Drop me a line: mark@heronarts.com
+Building a big cool project? I'm probably interested in hearing about it! Want to solicit some help, request new framework features, or just ask a random question? Feel free to open a GitHub issue directly on this project, drop me a line at mark@chromatik.co or [join the Discord](https://chromatik.co/discord).
 
 ---
 

assets/textures/build.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+for f in led1 led2 led3 led4 led5 sparkle1 sparkle2 sparkle3 sparkle4 sparkle5
+do
+  echo "Compiling $f"
+  ./texturec -f "$f.png" -o "../../src/main/resources/textures/$f.ktx"
+done
+echo "Done."