From 57e78ec9334fc27c3e650ed2403108dd576b2054 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Mon, 16 Sep 2019 07:46:02 -0700 Subject: [PATCH 1/2] test and fix for issue #1138 --- .../java/com/jme3/anim/TransformTrack.java | 8 +- .../jme3test/animation/TestIssue1138.java | 85 +++++++++++++++++++ 2 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 jme3-examples/src/main/java/jme3test/animation/TestIssue1138.java diff --git a/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java b/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java index 2e53f12e0d..63eba06cfc 100644 --- a/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java +++ b/jme3-core/src/main/java/com/jme3/anim/TransformTrack.java @@ -233,11 +233,13 @@ public void getDataAtTime(double t, Transform transform) { int endFrame = 1; float blend = 0; if (time >= times[lastFrame]) { + // extrapolate beyond the final frame of the animation startFrame = lastFrame; - time = time - times[startFrame] + times[startFrame - 1]; - blend = (time - times[startFrame - 1]) - / (times[startFrame] - times[startFrame - 1]); + float inferredInterval = times[lastFrame] - times[lastFrame - 1]; + if (inferredInterval > 0f) { + blend = (time - times[startFrame]) / inferredInterval; + } } else { // use lastFrame so we never overflow the array diff --git a/jme3-examples/src/main/java/jme3test/animation/TestIssue1138.java b/jme3-examples/src/main/java/jme3test/animation/TestIssue1138.java new file mode 100644 index 0000000000..ac390aaf51 --- /dev/null +++ b/jme3-examples/src/main/java/jme3test/animation/TestIssue1138.java @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2019 jMonkeyEngine + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of 'jMonkeyEngine' nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package jme3test.animation; + +import com.jme3.anim.AnimComposer; +import com.jme3.anim.Joint; +import com.jme3.anim.SkinningControl; +import com.jme3.app.SimpleApplication; +import com.jme3.light.AmbientLight; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; + +/** + * Test case for JME issue #1138: Elephant's legUp animation sets Joint + * translation to NaN. + *

+ * If successful, the animation cycle will complete without throwing an + * IllegalStateException. + * + * @author Stephen Gold + */ +public class TestIssue1138 extends SimpleApplication { + + SkinningControl sControl; + + public static void main(String... argv) { + new TestIssue1138().start(); + } + + @Override + public void simpleInitApp() { + Node cgModel = (Node) assetManager.loadModel( + "Models/Elephant/Elephant.mesh.xml"); + rootNode.attachChild(cgModel); + cgModel.rotate(0f, -1f, 0f); + cgModel.scale(0.04f); + + AnimComposer composer = cgModel.getControl(AnimComposer.class); + composer.setCurrentAction("legUp"); + sControl = cgModel.getControl(SkinningControl.class); + + AmbientLight light = new AmbientLight(); + rootNode.addLight(light); + } + + @Override + public void simpleUpdate(float tpf) { + for (Joint joint : sControl.getArmature().getJointList()) { + Vector3f translation = joint.getLocalTranslation(); + if (!Vector3f.isValidVector(translation)) { + String msg = "Invalid translation for joint " + joint.getName(); + throw new IllegalStateException(msg); + } + } + } +} From 64eb264c6c95e287fc5b12824cf141c4f88aeba6 Mon Sep 17 00:00:00 2001 From: Stephen Gold Date: Tue, 17 Sep 2019 09:14:46 -0700 Subject: [PATCH 2/2] address issue #1119 (serialization with protected constructors) --- .../com/jme3/export/SavableClassUtil.java | 53 ++++++++++++++++--- .../jme3/export/binary/BinaryImporter.java | 11 +--- .../com/jme3/export/xml/DOMInputCapsule.java | 4 +- 3 files changed, 50 insertions(+), 18 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/export/SavableClassUtil.java b/jme3-core/src/main/java/com/jme3/export/SavableClassUtil.java index d41e6bb925..cfc13c4d37 100644 --- a/jme3-core/src/main/java/com/jme3/export/SavableClassUtil.java +++ b/jme3-core/src/main/java/com/jme3/export/SavableClassUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,7 +36,10 @@ import com.jme3.material.MatParamTexture; import java.io.IOException; +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -161,16 +164,27 @@ public static int getSavedSavableVersion(Object savable, Class loaders) throws InstantiationException, + InvocationTargetException, NoSuchMethodException, IllegalAccessException, ClassNotFoundException, IOException { if (loaders == null) { return fromName(className); @@ -208,4 +223,28 @@ public static Savable fromName(String className, List loaders) thro return fromName(className); } + + /** + * Use reflection to gain access to the no-arg constructor of the named + * class. + * + * @return the pre-existing constructor, or null if the class lacks a no-arg + * constructor + */ + private static Constructor findNoArgConstructor(String className) + throws ClassNotFoundException { + Class clazz = Class.forName(className); + Constructor[] allConstructors = clazz.getDeclaredConstructors(); + AccessibleObject.setAccessible(allConstructors, true); + + Constructor result = null; + for (Constructor constructor : allConstructors) { + if (constructor.getParameterTypes().length == 0) { + result = constructor; + break; + } + } + + return result; + } } diff --git a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java index d4c24054dc..93f082337b 100644 --- a/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java +++ b/jme3-core/src/plugins/java/com/jme3/export/binary/BinaryImporter.java @@ -345,16 +345,7 @@ public Savable readObject(int id) { return out; - } catch (IOException e) { - logger.logp(Level.SEVERE, this.getClass().toString(), "readObject(int id)", "Exception", e); - return null; - } catch (ClassNotFoundException e) { - logger.logp(Level.SEVERE, this.getClass().toString(), "readObject(int id)", "Exception", e); - return null; - } catch (InstantiationException e) { - logger.logp(Level.SEVERE, this.getClass().toString(), "readObject(int id)", "Exception", e); - return null; - } catch (IllegalAccessException e) { + } catch (Exception e) { logger.logp(Level.SEVERE, this.getClass().toString(), "readObject(int id)", "Exception", e); return null; } diff --git a/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java b/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java index 6b0eb39b75..22779cf254 100644 --- a/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java +++ b/jme3-plugins/src/xml/java/com/jme3/export/xml/DOMInputCapsule.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2019 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,6 +38,7 @@ import com.jme3.util.BufferUtils; import com.jme3.util.IntMap; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; @@ -962,6 +963,7 @@ public Savable readSavable(String name, Savable defVal) throws IOException { private Savable readSavableFromCurrentElem(Savable defVal) throws InstantiationException, ClassNotFoundException, + NoSuchMethodException, InvocationTargetException, IOException, IllegalAccessException { Savable ret = defVal; Savable tmp = null;