Merge branch 'jMonkeyEngine:master' into master

Author: bob0bob

.github/workflows/format.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   format:
     runs-on: ubuntu-latest
-    if: github.repository != 'jMonkeyEngine/jmonkeyengine'
+    if: ${{ false }} 
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -48,4 +48,5 @@ appveyor.yml
 javadoc_deploy
 javadoc_deploy.pub
 !.vscode/settings.json
-!.vscode/JME_style.xml
+!.vscode/JME_style.xml
+!.vscode/extensions.json

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+	"recommendations": [
+                "vscjava.vscode-java-pack",
+                "slevesque.shader"
+	]
+}

.vscode/settings.json

@@ -1,7 +1,15 @@
 {
     "java.configuration.updateBuildConfiguration": "automatic",
+    "java.compile.nullAnalysis.mode": "automatic",
     "java.refactor.renameFromFileExplorer": "prompt",
     "java.format.settings.url": "./.vscode/JME_style.xml",
     "editor.formatOnPaste": true,
-    "editor.formatOnType": true
+    "editor.formatOnType": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnSaveMode": "modifications" ,
+
+    "prettier.tabWidth": 4,
+    "prettier.printWidth": 110,
+    "prettier.enable": true,
+    "prettier.resolveGlobalModules": true
 }

common.gradle

@@ -28,7 +28,7 @@ tasks.withType(JavaCompile) { // compile-time options:
 }
 
 ext {
-    lwjgl3Version = '3.3.2' // used in both the jme3-lwjgl3 and jme3-vr build scripts
+    lwjgl3Version = '3.3.3' // used in both the jme3-lwjgl3 and jme3-vr build scripts
     niftyVersion = '1.4.3' // used in both the jme3-niftygui and jme3-examples build scripts
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -39,9 +39,16 @@
 public final class FormatVersion {
 
     /**
-     * Version number of the format
+     * Version number of the format.
+     * <p>
+     * Changes for each version:
+     * <ol>
+     *   <li>Undocumented
+     *   <li>Undocumented
+     *   <li>XML prefixes "jme-" to all key names
+     * </ol>
      */
-    public static final int VERSION = 2;
+    public static final int VERSION = 3;
 
     /**
      * Signature of the format: currently, "JME3" as ASCII.

jme3-core/src/main/java/com/jme3/export/FormatVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021 jMonkeyEngine
+ * Copyright (c) 2009-2023 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -383,9 +383,24 @@ protected void rotateCamera(float value, Vector3f axis) {
      * @param value zoom amount
      */
     protected void zoomCamera(float value) {
-        float newFov = cam.getFov() + value * 0.1F * zoomSpeed;
-        if (newFov > 0) {
-            cam.setFov(newFov);
+        if (cam.isParallelProjection()) {
+            float zoomFactor = 1.0F + value * 0.01F * zoomSpeed;
+            if (zoomFactor > 0F) {
+                float left = zoomFactor * cam.getFrustumLeft();
+                float right = zoomFactor * cam.getFrustumRight();
+                float top = zoomFactor * cam.getFrustumTop();
+                float bottom = zoomFactor * cam.getFrustumBottom();
+
+                float near = cam.getFrustumNear();
+                float far = cam.getFrustumFar();
+                cam.setFrustum(near, far, left, right, top, bottom);
+            }
+
+        } else { // perspective projection
+            float newFov = cam.getFov() + value * 0.1F * zoomSpeed;
+            if (newFov > 0) {
+                cam.setFov(newFov);
+            }
         }
     }
 

jme3-core/src/main/java/com/jme3/input/FlyByCamera.java

@@ -890,16 +890,37 @@ private boolean isBO(final VarType type) {
         return type == VarType.BufferObject;
     }
 
-    private void updateRenderState(RenderManager renderManager, Renderer renderer, TechniqueDef techniqueDef) {
+    private void updateRenderState(Geometry geometry, RenderManager renderManager, Renderer renderer, TechniqueDef techniqueDef) {
         if (renderManager.getForcedRenderState() != null) {
-            renderer.applyRenderState(renderManager.getForcedRenderState());
+            mergedRenderState.copyFrom(renderManager.getForcedRenderState());
+        } else if (techniqueDef.getRenderState() != null) {
+            mergedRenderState.copyFrom(RenderState.DEFAULT);
+            techniqueDef.getRenderState().copyMergedTo(additionalState, mergedRenderState);
         } else {
-            if (techniqueDef.getRenderState() != null) {
-                renderer.applyRenderState(techniqueDef.getRenderState().copyMergedTo(additionalState, mergedRenderState));
-            } else {
-                renderer.applyRenderState(RenderState.DEFAULT.copyMergedTo(additionalState, mergedRenderState));
-            }
+            mergedRenderState.copyFrom(RenderState.DEFAULT);
+            RenderState.DEFAULT.copyMergedTo(additionalState, mergedRenderState);
         }
+        // test if the face cull mode should be flipped before render
+        if (mergedRenderState.isFaceCullFlippable() && isNormalsBackward(geometry.getWorldScale())) {
+            mergedRenderState.flipFaceCull();
+        }
+        renderer.applyRenderState(mergedRenderState);
+    }
+    
+    /**
+     * Returns true if the geometry world scale indicates that normals will be backward.
+     * @param scalar geometry world scale
+     * @return 
+     */
+    private boolean isNormalsBackward(Vector3f scalar) {
+        // count number of negative scalar vector components
+        int n = 0;
+        if (scalar.x < 0) n++;
+        if (scalar.y < 0) n++;
+        if (scalar.z < 0) n++;
+        // An odd number of negative components means the normal vectors
+        // are backward to what they should be.
+        return n == 1 || n == 3;
     }
 
     /**
@@ -1028,7 +1049,7 @@ public void render(Geometry geometry, LightList lights, RenderManager renderMana
         }
 
         // Apply render state
-        updateRenderState(renderManager, renderer, techniqueDef);
+        updateRenderState(geometry, renderManager, renderer, techniqueDef);
 
         // Get world overrides
         SafeArrayList<MatParamOverride> overrides = geometry.getWorldMatParamOverrides();

jme3-core/src/main/java/com/jme3/material/Material.java

@@ -1685,6 +1685,56 @@ public void set(RenderState state) {
         sfactorAlpha = state.sfactorAlpha;
         dfactorAlpha = state.dfactorAlpha;
     }
+    
+    /**
+     * Copy all values from the given state to this state.
+     * <p>
+     * This method is more precise than {@link #set(com.jme3.material.RenderState)}.
+     * @param state state to copy from
+     */
+    public void copyFrom(RenderState state) {
+        this.applyBlendMode = state.applyBlendMode;
+        this.applyColorWrite = state.applyColorWrite;
+        this.applyCullMode = state.applyCullMode;
+        this.applyDepthFunc = state.applyDepthFunc;
+        this.applyDepthTest = state.applyDepthTest;
+        this.applyDepthWrite = state.applyDepthWrite;
+        this.applyLineWidth = state.applyLineWidth;
+        this.applyPolyOffset = state.applyPolyOffset;
+        this.applyStencilTest = state.applyStencilTest;
+        this.applyWireFrame = state.applyWireFrame;
+        this.backStencilDepthFailOperation = state.backStencilDepthFailOperation;
+        this.backStencilDepthPassOperation = state.backStencilDepthPassOperation;
+        this.backStencilFunction = state.backStencilFunction;
+        this.backStencilMask = state.backStencilMask;
+        this.backStencilReference = state.backStencilReference;
+        this.backStencilStencilFailOperation = state.backStencilStencilFailOperation;
+        this.blendEquation = state.blendEquation;
+        this.blendEquationAlpha = state.blendEquationAlpha;
+        this.blendMode = state.blendMode;
+        this.cachedHashCode = state.cachedHashCode;
+        this.colorWrite = state.colorWrite;
+        this.cullMode = state.cullMode;
+        this.depthFunc = state.depthFunc;
+        this.depthTest = state.depthTest;
+        this.depthWrite = state.depthWrite;
+        this.dfactorAlpha = state.dfactorAlpha;
+        this.dfactorRGB = state.dfactorRGB;
+        this.frontStencilDepthFailOperation = state.frontStencilDepthFailOperation;
+        this.frontStencilDepthPassOperation = state.frontStencilDepthPassOperation;
+        this.frontStencilFunction = state.frontStencilFunction;
+        this.frontStencilMask = state.frontStencilMask;
+        this.frontStencilReference = state.frontStencilReference;
+        this.frontStencilStencilFailOperation = state.frontStencilStencilFailOperation;
+        this.lineWidth = state.lineWidth;
+        this.offsetEnabled = state.offsetEnabled;
+        this.offsetFactor = state.offsetFactor;
+        this.offsetUnits = state.offsetUnits;
+        this.sfactorAlpha = state.sfactorAlpha;
+        this.sfactorRGB = state.sfactorRGB;
+        this.stencilTest = state.stencilTest;
+        this.wireframe = state.wireframe;
+    }
 
     @Override
     public String toString() {
@@ -1711,4 +1761,29 @@ public String toString() {
                 + (blendMode.equals(BlendMode.Custom)? "\ncustomBlendFactors=("+sfactorRGB+", "+dfactorRGB+", "+sfactorAlpha+", "+dfactorAlpha+")":"")
                 +"\n]";
     }
+    
+    /**
+     * Flips the given face cull mode so that {@code Back} becomes
+     * {@code Front} and {@code Front} becomes {@code Back}.
+     * <p>{@code FrontAndBack} and {@code Off} are unaffected. This is important
+     * for flipping the cull mode when normal vectors are found to be backward.
+     * @param cull
+     * @return flipped cull mode
+     */
+    public void flipFaceCull() {
+        switch (cullMode) {
+            case Back:  cullMode = FaceCullMode.Front; break;
+            case Front: cullMode = FaceCullMode.Back;  break;
+        }
+    }
+    
+    /**
+     * Checks if the face cull mode is "flippable".
+     * <p>The cull mode is flippable when it is either {@code Front} or {@code Back}.
+     * @return 
+     */
+    public boolean isFaceCullFlippable() {
+        return cullMode == FaceCullMode.Front || cullMode == FaceCullMode.Back;
+    }
+    
 }

jme3-core/src/main/java/com/jme3/material/RenderState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2021 jMonkeyEngine
+ * Copyright (c) 2009-2023 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -422,11 +422,6 @@ public VarType getDefineIdType(int defineId) {
     public void addShaderParamDefine(String paramName, VarType paramType, String defineName) {
         int defineId = defineNames.size();
 
-        if (defineId >= DefineList.MAX_DEFINES) {
-            throw new IllegalStateException("Cannot have more than " +
-                    DefineList.MAX_DEFINES + " defines on a technique.");
-        }
-
         paramToDefineId.put(paramName, defineId);
         defineNames.add(defineName);
         defineTypes.add(paramType);
@@ -445,11 +440,6 @@ public void addShaderParamDefine(String paramName, VarType paramType, String def
     public int addShaderUnmappedDefine(String defineName, VarType defineType) {
         int defineId = defineNames.size();
 
-        if (defineId >= DefineList.MAX_DEFINES) {
-            throw new IllegalStateException("Cannot have more than " +
-                    DefineList.MAX_DEFINES + " defines on a technique.");
-        }
-
         defineNames.add(defineName);
         defineTypes.add(defineType);
         return defineId;

jme3-core/src/main/java/com/jme3/material/TechniqueDef.java

@@ -108,7 +108,7 @@ public Pass() {
         public void init(Renderer renderer, int width, int height, Format textureFormat, Format depthBufferFormat, int numSamples, boolean renderDepth) {
             Collection<Caps> caps = renderer.getCaps();
             if (numSamples > 1 && caps.contains(Caps.FrameBufferMultisample) && caps.contains(Caps.OpenGL31)) {
-                renderFrameBuffer = new FrameBuffer(width, height, numSamples);                
+                renderFrameBuffer = new FrameBuffer(width, height, numSamples);
                 renderedTexture = new Texture2D(width, height, numSamples, textureFormat);
                 renderFrameBuffer.setDepthTarget(FrameBufferTarget.newTarget(depthBufferFormat));
                 if (renderDepth) {
@@ -126,7 +126,7 @@ public void init(Renderer renderer, int width, int height, Format textureFormat,
             }
 
             renderFrameBuffer.addColorTarget(FrameBufferTarget.newTarget(renderedTexture));
-
+            renderFrameBuffer.setName(getClass().getSimpleName());      
 
         }
 

jme3-core/src/main/java/com/jme3/post/Filter.java

@@ -295,7 +295,7 @@ private void renderFilterChain(Renderer r, FrameBuffer sceneFb) {
                 if (msDepth && filter.isRequiresDepthTexture()) {
                     mat.setInt("NumSamplesDepth", depthTexture.getImage().getMultiSamples());
                 }
-
+                
                 if (filter.isRequiresSceneTexture()) {
                     mat.setTexture("Texture", tex);
                     if (tex.getImage().getMultiSamples() > 1) {
@@ -508,6 +508,14 @@ public void reshape(ViewPort vp, int w, int h) {
             renderFrameBuffer.addColorTarget(FrameBufferTarget.newTarget(filterTexture));
         }
 
+        if (renderFrameBufferMS != null) {
+            renderFrameBufferMS.setName("FilterPostProcessor MS");
+        }
+
+        if (renderFrameBuffer != null) {
+            renderFrameBuffer.setName("FilterPostProcessor");
+        }
+
         for (Filter filter : filters.getArray()) {
             initFilter(filter, vp);
         }

jme3-core/src/main/java/com/jme3/post/FilterPostProcessor.java

@@ -967,19 +967,15 @@ public void renderViewPortQueues(ViewPort vp, boolean flush) {
         if (prof != null) {
             prof.vpStep(VpStep.RenderBucket, vp, Bucket.Opaque);
         }
-        this.renderer.pushDebugGroup(Bucket.Opaque.name());
         rq.renderQueue(Bucket.Opaque, this, cam, flush);
-        this.renderer.popDebugGroup();
 
         // render the sky, with depth range set to the farthest
         if (!rq.isQueueEmpty(Bucket.Sky)) {
             if (prof != null) {
                 prof.vpStep(VpStep.RenderBucket, vp, Bucket.Sky);
             }
             renderer.setDepthRange(1, 1);
-            this.renderer.pushDebugGroup(Bucket.Sky.name());
             rq.renderQueue(Bucket.Sky, this, cam, flush);
-            this.renderer.popDebugGroup();
             depthRangeChanged = true;
         }
 
@@ -995,9 +991,7 @@ public void renderViewPortQueues(ViewPort vp, boolean flush) {
                 renderer.setDepthRange(0, 1);
                 depthRangeChanged = false;
             }
-            this.renderer.pushDebugGroup(Bucket.Transparent.name());
             rq.renderQueue(Bucket.Transparent, this, cam, flush);
-            this.renderer.popDebugGroup();
         }
 
         if (!rq.isQueueEmpty(Bucket.Gui)) {
@@ -1006,9 +1000,7 @@ public void renderViewPortQueues(ViewPort vp, boolean flush) {
             }
             renderer.setDepthRange(0, 0);
             setCamera(cam, true);
-            this.renderer.pushDebugGroup(Bucket.Gui.name());
             rq.renderQueue(Bucket.Gui, this, cam, flush);
-            this.renderer.popDebugGroup();
             setCamera(cam, false);
             depthRangeChanged = true;
         }