Merge branch 'master' into fix/locked-canvas

Author: riccardobl

.github/workflows/main.yml

@@ -443,29 +443,31 @@ jobs:
     name: Deploy Java Snapshot
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && github.ref_name == 'master'
+    permissions:
+      contents: read
     steps:
 
       # We need to clone everything again for uploadToMaven.sh ...
       - name: Clone the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 1
 
       # Setup jdk 21 used for building Maven-style artifacts
       - name: Setup the java environment
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
         with:
           distribution: 'temurin'
           java-version: '21'
 
       - name: Download natives for android
-        uses: actions/download-artifact@v8.0.1
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: android-natives
           path: build/native
 
       - name: Download natives for iOS
-        uses: actions/download-artifact@v8.0.1
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: ios-natives
           path: jme3-ios-native/template/META-INF/robovm/ios/libs/jme3-ios-native.xcframework
@@ -482,7 +484,6 @@ jobs:
             -PcentralUsername=${{ secrets.CENTRAL_USERNAME }} \
             -PsigningKey='${{ secrets.SIGNING_KEY }}' \
             -PsigningPassword='${{ secrets.SIGNING_PASSWORD }}' \
-            -PuseCommitHashAsVersionName=true \
             --console=plain --stacktrace
           fi
 

.gitignore

@@ -5,6 +5,7 @@
 **/.vscode/**
 **/out/
 /.gradle/
+**/.gradle/
 /.nb-gradle/
 /.idea/
 /dist/
@@ -45,4 +46,4 @@ javadoc_deploy.pub
 !.vscode/settings.json
 !.vscode/JME_style.xml
 !.vscode/extensions.json
-joysticks-*.txt
+joysticks-*.txt

.vscode/settings.json

@@ -5,5 +5,5 @@
     "editor.formatOnPaste": false,
     "editor.formatOnType": false,
     "editor.formatOnSave": false,
-    "java.jdt.ls.vmargs": "-Xms512M -Xmx2G -XX:+UseG1GC -XX:+UseStringDeduplication -XX:AdaptiveSizePolicyWeight=90"
+    "java.jdt.ls.vmargs": "-Xms512M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication -XX:AdaptiveSizePolicyWeight=90"
 }

build.gradle

@@ -12,6 +12,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'org.jmonkeyengine.nativeimage' apply false
+}
+
 import org.gradle.api.file.RelativePath
 
 // Set the license for IDEs that understand this
@@ -56,6 +60,25 @@ subprojects {
     }
 }
 
+def nativeImagePluginBuild = gradle.includedBuild('jme3-nativeimage-plugin')
+def nativeImagePluginPublishTasks = [
+        publish                                      : ':publish',
+        publishToMavenLocal                         : ':publishToMavenLocal',
+        install                                      : ':install',
+        publishAllPublicationsToCentralRepository   : ':publishAllPublicationsToCentralRepository',
+        publishAllPublicationsToSNAPSHOTRepository  : ':publishAllPublicationsToSNAPSHOTRepository',
+        publishAllPublicationsToDistRepository      : ':publishAllPublicationsToDistRepository'
+]
+
+subprojects {
+    tasks.configureEach { task ->
+        String includedTaskPath = nativeImagePluginPublishTasks[task.name]
+        if (includedTaskPath != null) {
+            task.dependsOn nativeImagePluginBuild.task(includedTaskPath)
+        }
+    }
+}
+
 tasks.register('run') {
     dependsOn ':jme3-examples:run'
     description = 'Run the jME3 examples'
@@ -280,10 +303,8 @@ if (skipPrebuildLibraries != "true" && buildNativeProjects != "true") {
             }) {
                 eachFile { details ->
                     def segments = details.relativePath.segments
-                    if (segments.length <= 1) {
-                        details.exclude()
-                    } else {
-                        details.relativePath = new RelativePath(details.isDirectory(), segments[1..-1] as String[])
+                    if (segments.length > 1) {
+                        details.path = segments[1..-1].join('/')
                     }
                 }
                 includeEmptyDirs = false

common.gradle

@@ -24,6 +24,8 @@ java {
     }
 }
 
+apply plugin: 'org.jmonkeyengine.nativeimage'
+
 tasks.withType(JavaCompile) { // compile-time options:
     //options.compilerArgs << '-Xlint:deprecation' // to show deprecation warnings
     options.compilerArgs << '-Xlint:unchecked'

gradle/libs.versions.toml

@@ -5,6 +5,8 @@
 checkstyle = "13.3.0"
 jacoco = "0.8.12"
 lwjgl3 = "3.4.1"
+angle = "2026-05-09"
+saferalloc = "0.0.8"
 nifty = "1.4.3"
 spotbugs = "4.9.8"
 
@@ -16,7 +18,6 @@ androidx-lifecycle-common = "androidx.lifecycle:lifecycle-common:2.7.0"
 android-build-gradle = "com.android.tools.build:gradle:9.1.0"
 android-support-appcompat = "com.android.support:appcompat-v7:28.0.0"
 androidx-test-runner = "androidx.test:runner:1.7.0"
-gradle-git = "org.ajoberstar:gradle-git:1.2.0"
 groovy-test = "org.apache.groovy:groovy-test:4.0.31"
 gson = "com.google.code.gson:gson:2.13.2"
 j-ogg-vorbis = "com.github.stephengold:j-ogg-vorbis:1.0.6"
@@ -36,9 +37,10 @@ lwjgl3-glfw     = { module = "org.lwjgl:lwjgl-glfw",     version.ref = "lwjgl3"
 lwjgl3-jawt     = { module = "org.lwjgl:lwjgl-jawt",     version.ref = "lwjgl3" }
 lwjgl3-jemalloc = { module = "org.lwjgl:lwjgl-jemalloc", version.ref = "lwjgl3" }
 lwjgl3-openal   = { module = "org.lwjgl:lwjgl-openal",   version.ref = "lwjgl3" }
-lwjgl3-opencl   = { module = "org.lwjgl:lwjgl-opencl",   version.ref = "lwjgl3" }
 lwjgl3-opengl   = { module = "org.lwjgl:lwjgl-opengl",   version.ref = "lwjgl3" }
 lwjgl3-sdl      = { module = "org.lwjgl:lwjgl-sdl",      version.ref = "lwjgl3" }
+lwjgl3-opengles = { module = "org.lwjgl:lwjgl-opengles", version.ref = "lwjgl3" }
+lwjgl3-egl   = { module = "org.lwjgl:lwjgl-egl", version.ref = "lwjgl3" }
 
 mokito-core = "org.mockito:mockito-core:5.23.0"
 mokito-junit-jupiter = "org.mockito:mockito-junit-jupiter:5.23.0"
@@ -53,8 +55,18 @@ vecmath = "javax.vecmath:vecmath:1.5.2"
 
 stb-image = "org.ngengine:stb-image:2.30.4"
 imagewebp = "org.ngengine:image-webp-decoder:1.3.0"
+angle = { module = "org.ngengine:angle-natives", version.ref = "angle" }
+saferalloc = { module = "org.ngengine:saferalloc", version.ref = "saferalloc" }
+saferalloc-natives-linux-x8664 = { module = "org.ngengine:saferalloc-natives-linux-x86_64", version.ref = "saferalloc" }
+saferalloc-natives-linux-aarch64 = { module = "org.ngengine:saferalloc-natives-linux-aarch64", version.ref = "saferalloc" }
+saferalloc-natives-windows-x8664 = { module = "org.ngengine:saferalloc-natives-windows-x86_64", version.ref = "saferalloc" }
+saferalloc-natives-windows-aarch64 = { module = "org.ngengine:saferalloc-natives-windows-aarch64", version.ref = "saferalloc" }
+saferalloc-natives-macos-x8664 = { module = "org.ngengine:saferalloc-natives-macos-x86_64", version.ref = "saferalloc" }
+saferalloc-natives-macos-aarch64 = { module = "org.ngengine:saferalloc-natives-macos-aarch64", version.ref = "saferalloc" }
+saferalloc-natives-android = { module = "org.ngengine:saferalloc-natives-android", version.ref = "saferalloc" }
 
 [bundles]
+saferalloc = ["saferalloc", "saferalloc-natives-linux-x8664", "saferalloc-natives-linux-aarch64", "saferalloc-natives-windows-x8664", "saferalloc-natives-windows-aarch64", "saferalloc-natives-macos-x8664", "saferalloc-natives-macos-aarch64", "saferalloc-natives-android"]
 
 [plugins]
 jacoco = { id = "jacoco", version.ref = "jacoco" }

jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java

@@ -51,6 +51,11 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo {
     public void resetStats() {
     }
 
+    @Override
+    public boolean supportsGpuTimerQuery() {
+        return false;
+    }
+
     private static int getLimitBytes(ByteBuffer buffer) {
         checkLimit(buffer);
         return buffer.limit();
@@ -100,6 +105,9 @@ public void glAttachShader(int program, int shader) {
 
     @Override
     public void glBeginQuery(int target, int query) {
+        if (target == GL.GL_TIME_ELAPSED) {
+            throw new UnsupportedOperationException("64-bit GPU timer queries are not exposed by the Android GLES bindings");
+        }
         GLES30.glBeginQuery(target, query);
     }
 
@@ -287,6 +295,9 @@ public void glEnableVertexAttribArray(int index) {
 
     @Override
     public void glEndQuery(int target) {
+        if (target == GL.GL_TIME_ELAPSED) {
+            throw new UnsupportedOperationException("64-bit GPU timer queries are not exposed by the Android GLES bindings");
+        }
         GLES30.glEndQuery(target);
     }
 
@@ -348,16 +359,13 @@ public String glGetProgramInfoLog(int program, int maxLength) {
 
     @Override
     public long glGetQueryObjectui64(int query, int pname) {
-        IntBuffer buff = IntBuffer.allocate(1);
-        //FIXME This is wrong IMO should be glGetQueryObjectui64v with a LongBuffer but it seems the API doesn't provide it.
-        GLES30.glGetQueryObjectuiv(query, pname, buff);
-        return buff.get(0);
+        throw new UnsupportedOperationException("64-bit query results are not exposed by the Android GLES bindings");
     }
 
     @Override
     public int glGetQueryObjectiv(int query, int pname) {
-        IntBuffer buff = IntBuffer.allocate(1);
-        GLES30.glGetQueryiv(query, pname, buff);
+        IntBuffer buff = (IntBuffer)tmpBuff.clear();
+        GLES30.glGetQueryObjectuiv(query, pname, buff);
         return buff.get(0);
     }
 
@@ -786,4 +794,9 @@ public void glGenVertexArrays(IntBuffer arrays) {
 
     }
 
+    @Override
+    public String glGetString(int name, int index) {
+        return GLES30.glGetStringi(name, index);
+    }
+
 }

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

@@ -669,21 +669,37 @@ private boolean renderFrameWithBlitSrgbConversion() {
             return false;
         }
 
+        FrameBuffer previousMainFramebuffer = renderer.getCurrentFrameBuffer();
+        if (previousMainFramebuffer != null) {
+            return false;
+        }
+
         rebuildLinearFrameBufferIfNeeded();
         if (linearFrameBuffer == null || !ensureBlitResources()) {
             return false;
         }
 
+        FrameBuffer restoreMainFramebuffer = previousMainFramebuffer;
+
         renderer.setMainFrameBufferOverride(linearFrameBuffer);
         try {
             listener.update();
+            FrameBuffer currentMainFramebuffer = renderer.getCurrentFrameBuffer();
+            if (currentMainFramebuffer != linearFrameBuffer) {
+                restoreMainFramebuffer = currentMainFramebuffer;
+            }
         } finally {
-            renderer.setMainFrameBufferOverride(null);
+            renderer.setMainFrameBufferOverride(restoreMainFramebuffer);
         }
 
-        renderer.setFrameBuffer(null);
-        blitGeometry.updateGeometricState();
-        application.getRenderManager().renderGeometry(blitGeometry);
+        renderer.setMainFrameBufferOverride(null);
+        try {
+            renderer.setFrameBuffer(null);
+            blitGeometry.updateGeometricState();
+            application.getRenderManager().renderGeometry(blitGeometry);
+        } finally {
+            renderer.setMainFrameBufferOverride(restoreMainFramebuffer);
+        }
         return true;
     }
 
@@ -778,12 +794,6 @@ public void onClick(DialogInterface dialog, int whichButton) {
             );
     }
 
-    @Override
-    public com.jme3.opencl.Context getOpenCLContext() {
-        logger.warning("OpenCL is not yet supported on android");
-        return null;
-    }
-
     /**
      * Returns the height of the input surface.
      *

jme3-awt-dialogs/src/main/java/com/jme3/awt/AWTSettingsDialog.java

@@ -129,6 +129,7 @@ public interface SelectionListener {
     private JComboBox<String> colorDepthCombo = null;
     private JComboBox<String> displayFreqCombo = null;
     private JComboBox<String> antialiasCombo = null;
+    private JComboBox<String> rendererCombo = null;
     private JLabel icon = null;
     private int selection = 0;
     private SelectionListener selectionListener = null;
@@ -463,6 +464,8 @@ public void keyPressed(KeyEvent e) {
         displayFreqCombo.addKeyListener(aListener);
         antialiasCombo = new JComboBox<>();
         antialiasCombo.addKeyListener(aListener);
+        rendererCombo = setUpRendererChooser();
+        rendererCombo.addKeyListener(aListener);
         fullscreenBox = new JCheckBox(resourceBundle.getString("checkbox.fullscreen"));
         fullscreenBox.setSelected(source.isFullscreen());
         fullscreenBox.addActionListener(new ActionListener() {
@@ -549,6 +552,20 @@ public void actionPerformed(ActionEvent e) {
         gbc.anchor = GridBagConstraints.WEST;
         mainPanel.add(antialiasCombo, gbc);
 
+        gbc = new GridBagConstraints();
+        gbc.insets = new Insets(4, 4, 4, 4);
+        gbc.gridx = 0;
+        gbc.gridy = 4;
+        gbc.anchor = GridBagConstraints.EAST;
+        gbc.weightx = 0.5;
+        mainPanel.add(new JLabel(resourceBundle.getString("label.renderer")), gbc);
+        gbc = new GridBagConstraints();
+        gbc.gridx = 1;
+        gbc.gridy = 4;
+        gbc.gridwidth = 3;
+        gbc.anchor = GridBagConstraints.WEST;
+        mainPanel.add(rendererCombo, gbc);
+
         // Set the button action listeners. Cancel disposes without saving, OK
         // saves.
         ok.addActionListener(new ActionListener() {
@@ -583,14 +600,14 @@ public void actionPerformed(ActionEvent e) {
         gbc = new GridBagConstraints();
         gbc.gridx = 0;
         gbc.gridwidth = 2;
-        gbc.gridy = 4;
+        gbc.gridy = 5;
         gbc.anchor = GridBagConstraints.EAST;
         mainPanel.add(ok, gbc);
         gbc = new GridBagConstraints();
         gbc.insets = new Insets(4, 16, 4, 4);
         gbc.gridx = 2;
         gbc.gridwidth = 2;
-        gbc.gridy = 4;
+        gbc.gridy = 5;
         gbc.anchor = GridBagConstraints.WEST;
         mainPanel.add(cancel, gbc);
 
@@ -662,6 +679,7 @@ private boolean verifyAndSaveCurrentSelection() {
         boolean fullscreen = fullscreenBox.isSelected();
         boolean vsync = vsyncBox.isSelected();
         boolean gamma = gammaBox.isSelected();
+        String renderer = (String) rendererCombo.getSelectedItem();
 
         String[] parts = display.split(" x ");
         int width = Integer.parseInt(parts[0]);
@@ -721,7 +739,7 @@ private boolean verifyAndSaveCurrentSelection() {
             source.setFullscreen(fullscreen);
             source.setVSync(vsync);
             source.setGammaCorrection(gamma);
-            // source.setRenderer(renderer);
+            source.setRenderer(renderer);
             source.setSamples(multisample);
 
             String appTitle = source.getTitle();
@@ -762,6 +780,30 @@ public void actionPerformed(ActionEvent e) {
         return resolutionBox;
     }
 
+    private JComboBox<String> setUpRendererChooser() {
+        JComboBox<String> rendererBox = new JComboBox<>();
+        Set<String> renderers = new LinkedHashSet<>(Arrays.asList(
+                AppSettings.ANGLE_GLES3,
+                AppSettings.LWJGL_OPENGL32,
+                AppSettings.LWJGL_OPENGL33,
+                AppSettings.LWJGL_OPENGL40,
+                AppSettings.LWJGL_OPENGL41,
+                AppSettings.LWJGL_OPENGL42,
+                AppSettings.LWJGL_OPENGL43,
+                AppSettings.LWJGL_OPENGL44,
+                AppSettings.LWJGL_OPENGL45
+        ));
+        String currentRenderer = source.getRenderer();
+        if (currentRenderer != null) {
+            renderers.add(currentRenderer);
+        }
+        for (String renderer : renderers) {
+            rendererBox.addItem(renderer);
+        }
+        rendererBox.setSelectedItem(currentRenderer);
+        return rendererBox;
+    }
+
     /**
      * <code>updateDisplayChoices</code> updates the available color depth and
      * display frequency options to match the currently selected resolution.