fix(tools): arrays and array hotspots

- core/src/main/kotlin/com/github/alfu32/sketch/ui/SketchUiOverlay.kt:5987
      - PLANAR_TRANSLATE_MULTIPLE now maps to multiple-copy-translate-planar
      - VOLUMETRIC_TRANSLATE_MULTIPLE now maps to multiple-copy-translate-volumetric

fix(snapcraft): release

- Moved the Snapcraft project file to the repo root:
      - snapcraft.yaml
  - Removed the old nested config:
      - snap/snapcraft.yaml
  - Kept the GUI assets under:
      - snap/gui/octodraw.desktop
      - snap/gui/icon.png

  Gradle change

  - lwjgl3/build.gradle
      - bundleLinuxSnap now copies:
          - root snapcraft.yaml into the Snapcraft project root
          - snap/ into the staged snap/ directory
      - local Snap build still uses Snapcraft, not mksquashfs

  CI change

  - .github/workflows/release.yml
      - Linux CI no longer installs Snapcraft
      - Linux CI no longer runs :lwjgl3:bundleLinuxSnap
      - Linux CI no longer uploads *.snap

Author: alferio

.github/workflows/release.yml

@@ -27,18 +27,13 @@ jobs:
         with:
           distribution: "temurin"
           java-version: "21"
-      - name: Install Snap packaging tools
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y squashfs-tools
-      - name: Build Linux bundle + Snap + JVM jars
-        run: ./gradlew :lwjgl3:bundleLinuxTar :lwjgl3:bundleLinuxSnap :lwjgl3:jarLinux :core:pluginApiJar -PreleaseNumber="${{ inputs.tag }}"
+      - name: Build Linux bundle + JVM jars
+        run: ./gradlew :lwjgl3:bundleLinuxTar :lwjgl3:jarLinux :core:pluginApiJar -PreleaseNumber="${{ inputs.tag }}"
       - uses: actions/upload-artifact@v4
         with:
           name: octodraw-linux
           path: |
             dist/*.tar.gz
-            dist/*.snap
             lwjgl3/build/libs/*.jar
             core/build/libs/octodraw-plugin*.jar
 

core/src/main/kotlin/com/github/alfu32/sketch/ui/SketchUiOverlay.kt

@@ -5984,8 +5984,8 @@ class SketchUiOverlay(
             ToolId.STRETCH -> "stretch"
             ToolId.ROTATE_STRETCH -> "stretch-rotate"
             ToolId.COPY_MULTIPLE -> "multiple-copy-translate"
-            ToolId.PLANAR_TRANSLATE_MULTIPLE -> "multiple-copy-planar-translate"
-            ToolId.VOLUMETRIC_TRANSLATE_MULTIPLE -> "multiple-copy-volumetric-translate"
+            ToolId.PLANAR_TRANSLATE_MULTIPLE -> "multiple-copy-translate-planar"
+            ToolId.VOLUMETRIC_TRANSLATE_MULTIPLE -> "multiple-copy-translate-volumetric"
             ToolId.PLANAR_ROTATE_MULTIPLE -> "multiple-copy-planar-rotate"
             ToolId.HELICOIDAL_ROTATE_MULTIPLE -> "multiple-copy-helicoidal-rotate"
             ToolId.PAINT -> "paint"

lwjgl3/build.gradle

@@ -467,11 +467,19 @@ set -eu
 HOST_RUNTIME_DIR="/run/user/$(id -u)"
 CURRENT_RUNTIME_DIR="${XDG_RUNTIME_DIR:-}"
 SNAP_LIB_DIR="$SNAP/lib"
+SNAP_USR_LIB_DIR="$SNAP/usr/lib/x86_64-linux-gnu"
+SNAP_DRI_DIR="$SNAP_USR_LIB_DIR/dri"
+SNAP_EGL_VENDOR_DIR="$SNAP/usr/share/glvnd/egl_vendor.d"
+SNAP_ALSA_CONF="$SNAP/usr/share/alsa/alsa.conf"
 
 if [ -d "$SNAP_LIB_DIR" ]; then
   export LD_LIBRARY_PATH="$SNAP_LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 fi
 
+if [ -d "$SNAP_USR_LIB_DIR" ]; then
+  export LD_LIBRARY_PATH="$SNAP_USR_LIB_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+fi
+
 if [ -z "$CURRENT_RUNTIME_DIR" ] || [ ! -d "$CURRENT_RUNTIME_DIR" ]; then
   export XDG_RUNTIME_DIR="$HOST_RUNTIME_DIR"
 fi
@@ -488,6 +496,18 @@ if [ -z "${XAUTHORITY:-}" ] && [ -f "$HOME/.Xauthority" ]; then
   export XAUTHORITY="$HOME/.Xauthority"
 fi
 
+if [ -d "$SNAP_DRI_DIR" ]; then
+  export LIBGL_DRIVERS_PATH="$SNAP_DRI_DIR"
+fi
+
+if [ -d "$SNAP_EGL_VENDOR_DIR" ]; then
+  export __EGL_VENDOR_LIBRARY_DIRS="$SNAP_EGL_VENDOR_DIR"
+fi
+
+if [ -f "$SNAP_ALSA_CONF" ]; then
+  export ALSA_CONFIG_PATH="$SNAP_ALSA_CONF"
+fi
+
 exec "$SNAP/octodraw-jre" "$@"
 '''
   launchFile.setExecutable(true, false)
@@ -496,7 +516,11 @@ exec "$SNAP/octodraw-jre" "$@"
 
 def copySnapDesktopRuntimeLibs = { File snapRoot ->
   def libDir = new File(snapRoot, "lib")
+  def usrLibDir = new File(snapRoot, "usr/lib/x86_64-linux-gnu")
+  def usrShareDir = new File(snapRoot, "usr/share")
   libDir.mkdirs()
+  usrLibDir.mkdirs()
+  usrShareDir.mkdirs()
   def searchRoots = [
     file("/usr/lib/x86_64-linux-gnu"),
     file("/lib/x86_64-linux-gnu"),
@@ -522,14 +546,42 @@ def copySnapDesktopRuntimeLibs = { File snapRoot ->
     "libGL.so.1",
     "libGLX.so.0",
     "libEGL.so.1",
+    "libGLX_mesa.so.0",
+    "libEGL_mesa.so.0",
+    "libGLdispatch.so.0",
+    "libOpenGL.so.0",
+    "libGLESv2.so.2",
     "libdrm.so.2",
+    "libdrm_amdgpu.so.1",
+    "libdrm_intel.so.1",
+    "libdrm_nouveau.so.2",
+    "libdrm_radeon.so.1",
     "libgbm.so.1",
     "libasound.so.2",
   ]
   requiredLibs.each { libName ->
     def source = searchRoots.collect { new File(it, libName) }.find { it.exists() }
     if (source != null) {
       ant.copy(file: source, tofile: new File(libDir, libName), overwrite: true)
+      ant.copy(file: source, tofile: new File(usrLibDir, libName), overwrite: true)
+    }
+  }
+  def driSourceDir = file("/usr/lib/x86_64-linux-gnu/dri")
+  if (driSourceDir.exists()) {
+    ant.copy(todir: new File(usrLibDir, "dri"), overwrite: true) {
+      fileset(dir: driSourceDir)
+    }
+  }
+  def glvndSourceDir = file("/usr/share/glvnd/egl_vendor.d")
+  if (glvndSourceDir.exists()) {
+    ant.copy(todir: new File(usrShareDir, "glvnd/egl_vendor.d"), overwrite: true) {
+      fileset(dir: glvndSourceDir)
+    }
+  }
+  def alsaSourceDir = file("/usr/share/alsa")
+  if (alsaSourceDir.exists()) {
+    ant.copy(todir: new File(usrShareDir, "alsa"), overwrite: true) {
+      fileset(dir: alsaSourceDir)
     }
   }
 }
@@ -747,7 +799,7 @@ tasks.register("bundleLinuxSnap") {
     }
     def probe = null
     try {
-      probe = new ProcessBuilder("mksquashfs", "-version")
+      probe = new ProcessBuilder("snapcraft", "--version")
         .directory(project.projectDir)
         .redirectErrorStream(true)
         .start()
@@ -756,39 +808,56 @@ tasks.register("bundleLinuxSnap") {
       probe = null
     }
     if (probe == null || probe.waitFor() != 0) {
-      throw new GradleException("mksquashfs not found. Install squashfs-tools to build the Snap package.")
+      throw new GradleException("snapcraft not found. Install Snapcraft to build the Snap package.")
     }
     def sourceDir = rootProject.file("dist/octodraw-dist-${bundleVersion}-linux")
     if (!sourceDir.exists()) {
       throw new GradleException("Linux bundle directory not found: ${sourceDir}")
     }
-    def snapRoot = file("$buildDir/snap/octodraw")
-    project.delete(snapRoot)
+    def snapcraftProjectDir = file("$buildDir/snapcraft/project")
+    def snapcraftSourceDir = new File(snapcraftProjectDir, "source")
+    def snapDir = new File(snapcraftProjectDir, "snap")
+    project.delete(snapcraftProjectDir)
     project.copy {
       from(sourceDir)
-      into(snapRoot)
+      into(snapcraftSourceDir)
+    }
+    project.copy {
+      from(rootProject.file("snapcraft.yaml"))
+      into(snapcraftProjectDir)
+    }
+    project.copy {
+      from(rootProject.file("snap"))
+      into(snapDir)
     }
-    ensureUnixRuntimeExecutables(snapRoot)
-    copySnapDesktopRuntimeLibs(snapRoot)
-    createSnapMetadata(snapRoot)
+    ensureUnixRuntimeExecutables(snapcraftSourceDir)
     def outFile = rootProject.file("dist/octodraw-dist-${bundleVersion}-linux.snap")
+    def defaultSnapName = "octodraw_${bundleVersion}_amd64.snap"
+    def builtSnap = new File(snapcraftProjectDir, defaultSnapName)
     project.delete(outFile)
-    def pack = new ProcessBuilder(
-      "mksquashfs",
-      snapRoot.absolutePath,
-      outFile.absolutePath,
-      "-noappend",
-      "-no-fragments",
-      "-comp",
-      "xz",
-      "-all-root",
-      "-no-xattrs"
-    )
-      .directory(project.projectDir)
+    project.delete(builtSnap)
+    def pack = new ProcessBuilder("snapcraft", "--destructive-mode")
+      .directory(snapcraftProjectDir)
       .inheritIO()
-      .start()
-    if (pack.waitFor() != 0) {
-      throw new GradleException("mksquashfs failed while building ${outFile.name}.")
+    pack.environment().put("OCTODRAW_SNAP_VERSION", bundleVersion)
+    def process = pack.start()
+    if (process.waitFor() != 0) {
+      throw new GradleException("snapcraft failed while building ${outFile.name}.")
+    }
+    if (!builtSnap.exists()) {
+      def candidates = snapcraftProjectDir.listFiles()?.findAll { it.name.endsWith(".snap") } ?: []
+      if (candidates.isEmpty()) {
+        throw new GradleException("snapcraft completed without producing a .snap artifact.")
+      }
+      builtSnap = candidates.max { it.lastModified() }
+    }
+    if (!builtSnap.exists()) {
+      throw new GradleException("Snap artifact not found after snapcraft build.")
+    }
+    project.copy {
+      from(builtSnap)
+      into(outFile.parentFile)
+      rename { outFile.name }
     }
   }
 }

snap/gui/icon.png

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Octodraw
+Comment=3D drafting and modeling tool
+Exec=octodraw %U
+Icon=${SNAP}/meta/gui/icon.png
+Terminal=false
+Type=Application
+Categories=Graphics;3DGraphics;Engineering;
+MimeType=application/octet-stream;
+StartupWMClass=Octodraw

snap/gui/octodraw.desktop

@@ -0,0 +1,53 @@
+name: octodraw
+title: Octodraw
+summary: 3D drafting and modeling tool
+description: |
+  Octodraw is a 3D drafting and modeling application.
+base: core22
+grade: stable
+confinement: strict
+adopt-info: octodraw
+
+architectures:
+  - build-on:
+      - amd64
+    build-for:
+      - amd64
+
+apps:
+  octodraw:
+    command: octodraw-jre
+    extensions:
+      - gnome
+    environment:
+      OCTODRAW_PLUGINS_DIR: $SNAP_USER_COMMON/plugins
+      ALSA_CONFIG_PATH: $SNAP/usr/share/alsa/alsa.conf
+    plugs:
+      - audio-playback
+      - home
+      - network
+      - network-bind
+      - removable-media
+
+parts:
+  octodraw:
+    plugin: dump
+    source: source
+    stage-packages:
+      - libasound2
+      - libasound2-data
+    override-pull: |
+      craftctl default
+      craftctl set version "${OCTODRAW_SNAP_VERSION:-0.0.0}"
+    override-build: |
+      craftctl default
+      chmod 755 "$CRAFT_PART_INSTALL/octodraw-editor" "$CRAFT_PART_INSTALL/octodraw-jre"
+      if [ -d "$CRAFT_PART_INSTALL/jre/bin" ]; then
+        find "$CRAFT_PART_INSTALL/jre/bin" -type f -exec chmod 755 {} \;
+      fi
+      if [ -f "$CRAFT_PART_INSTALL/jre/lib/jspawnhelper" ]; then
+        chmod 755 "$CRAFT_PART_INSTALL/jre/lib/jspawnhelper"
+      fi
+      if [ -f "$CRAFT_PART_INSTALL/jre/lib/jexec" ]; then
+        chmod 755 "$CRAFT_PART_INSTALL/jre/lib/jexec"
+      fi