Merge branch 'jMonkeyEngine:master' into master

Author: bob0bob

.vscode/settings.json

@@ -1,5 +1,7 @@
 {
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.refactor.renameFromFileExplorer": "prompt",
-    "java.format.settings.url": "./.vscode/JME_style.xml"
-}
+    "java.format.settings.url": "./.vscode/JME_style.xml",
+    "editor.formatOnPaste": true,
+    "editor.formatOnType": true
+}

README.md

@@ -4,7 +4,7 @@ jMonkeyEngine
 [![Build Status](https://github.com/jMonkeyEngine/jmonkeyengine/workflows/Build%20jMonkeyEngine/badge.svg)](https://github.com/jMonkeyEngine/jmonkeyengine/actions)
 
 jMonkeyEngine is a 3-D game engine for adventurous Java developers. It’s open-source, cross-platform, and cutting-edge.
-v3.4.1 is the latest stable version of the Engine.
+v3.5.1 is the latest stable version of the Engine.
 v3.3.2 is the latest stable version of the jMonkeyEngine SDK.
 
 The engine is used by several commercial game studios and computer-science courses. Here's a taste:
@@ -53,5 +53,5 @@ Read our [contribution guide](https://github.com/jMonkeyEngine/jmonkeyengine/blo
 
 ### License
 
-New BSD (3-clause) License. In other words, you do whatever makes you happy!
+[New BSD (3-clause) License](https://github.com/jMonkeyEngine/jmonkeyengine/blob/master/LICENSE)
 

common.gradle

@@ -23,7 +23,7 @@ tasks.withType(JavaCompile) { // compile-time options:
 }
 
 ext {
-    lwjgl3Version = '3.3.0' // used in both the jme3-lwjgl3 and jme3-vr build scripts
+    lwjgl3Version = '3.3.1' // used in both the jme3-lwjgl3 and jme3-vr build scripts
 }
 
 repositories {
@@ -37,7 +37,7 @@ dependencies {
     // Adding dependencies here will add the dependencies to each subproject.
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.12.4'
-    testImplementation 'org.codehaus.groovy:groovy-test:3.0.9'
+    testImplementation 'org.codehaus.groovy:groovy-test:3.0.10'
 }
 
 

jme3-android/src/main/java/com/jme3/app/AndroidHarness.java

@@ -190,6 +190,7 @@ public Object onRetainNonConfigurationInstance() {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public void onCreate(Bundle savedInstanceState) {
         initializeLogHandler();
 
@@ -240,7 +241,7 @@ public void onCreate(Bundle savedInstanceState) {
             try {
                 if (app == null) {
                     Class clazz = Class.forName(appClass);
-                    app = (LegacyApplication)clazz.newInstance();
+                    app = (LegacyApplication) clazz.getDeclaredConstructor().newInstance();
                 }
 
                 app.setSettings(settings);
@@ -494,6 +495,11 @@ public void reshape(int width, int height) {
         app.reshape(width, height);
     }
 
+    @Override
+    public void rescale(float x, float y) {
+        app.rescale(x, y);
+    }
+
     @Override
     public void update() {
         app.update();

jme3-android/src/main/java/com/jme3/app/AndroidHarnessFragment.java

@@ -232,6 +232,7 @@ public void onAttach(Activity activity) {
      * @param savedInstanceState the saved instance state
      */
     @Override
+    @SuppressWarnings("unchecked")
     public void onCreate(Bundle savedInstanceState) {
         initializeLogHandler();
         logger.fine("onCreate");
@@ -258,7 +259,7 @@ public void onCreate(Bundle savedInstanceState) {
         try {
             if (app == null) {
                 Class clazz = Class.forName(appClass);
-                app = (LegacyApplication)clazz.newInstance();
+                app = (LegacyApplication) clazz.getDeclaredConstructor().newInstance();
             }
 
             app.setSettings(settings);
@@ -571,6 +572,11 @@ public void reshape(int width, int height) {
         app.reshape(width, height);
     }
 
+    @Override
+    public void rescale(float x, float y) {
+        app.rescale(x, y);
+    }
+
     @Override
     public void update() {
         app.update();

jme3-android/src/main/java/com/jme3/app/jmeSurfaceView/JmeSurfaceView.java

@@ -395,6 +395,17 @@ public void reshape(int width, int height) {
         jmeSurfaceViewLogger.log(Level.INFO, "Requested reshaping from the system listener");
     }
 
+
+    @Override
+    public void rescale(float x, float y) {
+        if (legacyApplication == null) {
+            return;
+        }
+        legacyApplication.rescale(x, y);
+        jmeSurfaceViewLogger.log(Level.INFO, "Requested rescaling from the system listener");
+    }
+
+
     @Override
     public void update() {
         /*Invoking can be delayed by delaying the draw of GlSurfaceView component on the screen*/

jme3-android/src/main/java/com/jme3/input/android/AndroidSensorJoyInput.java

@@ -282,7 +282,7 @@ private boolean remapCoordinates(float[] inR, float[] outR) {
      * Surface.ROTATION_270 = device in rotated 270deg counterclockwise
      *
      * When the Manifest locks the orientation, this value will not change during
-     * gametime, but if the orientation of the screen is based off the sensor,
+     * game time, but if the orientation of the screen is based off the sensor,
      * this value will change as the device is rotated.
      * @return Current device rotation amount
      */

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

@@ -580,8 +580,8 @@ public void glRenderbufferStorageMultisampleEXT(int target, int samples, int int
     }
 
     @Override
-    public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedsamplelocations) {
-        GLES31.glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    public void glTexImage2DMultisample(int target, int samples, int internalformat, int width, int height, boolean fixedSampleLocations) {
+        GLES31.glTexStorage2DMultisample(target, samples, internalformat, width, height, fixedSampleLocations);
     }
 
     @Override

jme3-bullet/src/common/java/com/jme3/bullet/control/KinematicRagdollControl.java

@@ -673,10 +673,10 @@ protected void scanSpatial(Spatial model) {
      * @param model the spatial with the model's SkeletonControl (not null)
      * @param bone the bone to be linked (not null)
      * @param parent the body linked to the parent bone (not null)
-     * @param reccount depth of the recursion (≥1)
+     * @param recursionCount depth of the recursion (≥1)
      * @param pointsMap (not null)
      */
-    protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent, int reccount, Map<Integer, List<Float>> pointsMap) {
+    protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent, int recursionCount, Map<Integer, List<Float>> pointsMap) {
         PhysicsRigidBody parentShape = parent;
         if (boneList.contains(bone.getName())) {
 
@@ -693,10 +693,10 @@ protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent,
                 shape = RagdollUtils.makeShapeFromVerticeWeights(model, RagdollUtils.getBoneIndices(link.bone, skeleton, boneList), initScale, link.bone.getModelSpacePosition(), weightThreshold);
             }
 
-            PhysicsRigidBody shapeNode = new PhysicsRigidBody(shape, rootMass / reccount);
+            PhysicsRigidBody shapeNode = new PhysicsRigidBody(shape, rootMass / recursionCount);
 
             shapeNode.setKinematic(mode == Mode.Kinematic);
-            totalMass += rootMass / reccount;
+            totalMass += rootMass / recursionCount;
 
             link.rigidBody = shapeNode;
             link.initalWorldRotation = bone.getModelSpaceRotation().clone();
@@ -721,7 +721,7 @@ protected void boneRecursion(Spatial model, Bone bone, PhysicsRigidBody parent,
 
         for (Iterator<Bone> it = bone.getChildren().iterator(); it.hasNext();) {
             Bone childBone = it.next();
-            boneRecursion(model, childBone, parentShape, reccount + 1, pointsMap);
+            boneRecursion(model, childBone, parentShape, recursionCount + 1, pointsMap);
         }
     }
 

jme3-core/src/main/java/com/jme3/anim/AnimComposer.java

@@ -48,11 +48,10 @@
 /**
  * AnimComposer is a Spatial control that allows manipulation of
  * {@link Armature armature} (skeletal) animation.
- * 
+ *
  * @author Nehon
  */
 public class AnimComposer extends AbstractControl {
-
     /**
      * The name of the default layer.
      */
@@ -72,7 +71,7 @@ public AnimComposer() {
 
     /**
      * Tells if an animation is contained in the list of animations.
-     * 
+     *
      * @param name The name of the animation.
      * @return true, if the named animation is in the list of animations.
      */
@@ -117,17 +116,17 @@ public void removeAnimClip(AnimClip anim) {
 
     /**
      * Run an action on the default layer.
-     * 
+     *
      * @param name The name of the action to run.
      * @return The action corresponding to the given name.
      */
     public Action setCurrentAction(String name) {
         return setCurrentAction(name, DEFAULT_LAYER);
     }
-    
+
     /**
      * Run an action on specified layer.
-     * 
+     *
      * @param actionName The name of the action to run.
      * @param layerName The layer on which action should run.
      * @return The action corresponding to the given name.
@@ -139,19 +138,19 @@ public Action setCurrentAction(String actionName, String layerName) {
 
         return currentAction;
     }
-    
+
     /**
      * Return the current action on the default layer.
-     * 
-     * @return  The action corresponding to the given name.
+     *
+     * @return The action corresponding to the given name.
      */
     public Action getCurrentAction() {
         return getCurrentAction(DEFAULT_LAYER);
     }
-    
+
     /**
      * Return current action on specified layer.
-     * 
+     *
      * @param layerName The layer on which action should run.
      * @return The action corresponding to the given name.
      */
@@ -161,14 +160,14 @@ public Action getCurrentAction(String layerName) {
 
         return result;
     }
-    
+
     /**
      * Remove current action on default layer.
      */
     public void removeCurrentAction() {
         removeCurrentAction(DEFAULT_LAYER);
     }
-    
+
     /**
      * Remove current action on specified layer.
      *
@@ -178,19 +177,19 @@ public void removeCurrentAction(String layerName) {
         AnimLayer l = getLayer(layerName);
         l.setCurrentAction(null);
     }
-    
+
     /**
      * Returns current time of the default layer.
-     * 
+     *
      * @return The current time.
      */
     public double getTime() {
         return getTime(DEFAULT_LAYER);
     }
-    
+
     /**
      * Returns current time of the specified layer.
-     * 
+     *
      * @param layerName The layer from which to get the time.
      * @return the time (in seconds)
      */
@@ -200,7 +199,7 @@ public double getTime(String layerName) {
 
         return result;
     }
-    
+
     /**
      * Sets current time on the default layer.
      *
@@ -226,7 +225,7 @@ public void setTime(String layerName, double time) {
     }
 
     /**
-     * 
+     *
      * @param name The name of the action to return.
      * @return The action registered with specified name. It will make a new action if there isn't any.
      * @see #makeAction(java.lang.String)
@@ -239,29 +238,29 @@ public Action action(String name) {
         }
         return action;
     }
-    
+
     /**
-     * 
+     *
      * @param name The name of the action to return.
      * @return The action registered with specified name or null if nothing is registered.
      */
-    public Action getAction(String name){
+    public Action getAction(String name) {
         return actions.get(name);
     }
-    
+
     /**
      * Register given action with specified name.
-     * 
+     *
      * @param name The name of the action.
      * @param action The action to add.
      */
-    public void addAction(String name, Action action){
+    public void addAction(String name, Action action) {
         actions.put(name, action);
     }
 
     /**
      * Create a new ClipAction with specified clip name.
-     * 
+     *
      * @param name The name of the clip.
      * @return a new action
      * @throws IllegalArgumentException if clip with specified name not found.
@@ -275,17 +274,17 @@ public Action makeAction(String name) {
         action = new ClipAction(clip);
         return action;
     }
-    
+
     /**
      * Tells if an action is contained in the list of actions.
-     * 
+     *
      * @param name The name of the action.
      * @return true, if the named action is in the list of actions.
      */
     public boolean hasAction(String name) {
         return actions.containsKey(name);
     }
-    
+
     /**
      * Remove specified action.
      *

jme3-core/src/main/java/com/jme3/anim/Armature.java

@@ -37,8 +37,8 @@
 import com.jme3.math.Matrix4f;
 import com.jme3.util.clone.Cloner;
 import com.jme3.util.clone.JmeCloneable;
-
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 /**
@@ -130,8 +130,10 @@ public void setModelTransformClass(Class<? extends JointModelTransform> modelTra
 
     private void instantiateJointModelTransform(Joint joint) {
         try {
-            joint.setJointModelTransform(modelTransformClass.newInstance());
-        } catch (InstantiationException | IllegalAccessException e) {
+            joint.setJointModelTransform(modelTransformClass.getDeclaredConstructor().newInstance());
+        } catch (InstantiationException | IllegalAccessException
+                | IllegalArgumentException | InvocationTargetException
+                | NoSuchMethodException | SecurityException e) {
             throw new IllegalArgumentException(e);
         }
     }