From a59b9e6a94bc8dea244a9276894360447c9ca9c6 Mon Sep 17 00:00:00 2001 From: Nehon Date: Sun, 10 Dec 2017 10:42:24 +0100 Subject: [PATCH] glTF: Skip tracks that belong to a different skin --- .../java/jme3test/model/TestGltfLoading2.java | 319 ++++++++++++++++++ .../model/shape/TestGltfLoading2.java | 7 - .../jme3/scene/plugins/gltf/GltfLoader.java | 29 +- 3 files changed, 330 insertions(+), 25 deletions(-) create mode 100644 jme3-examples/src/main/java/jme3test/model/TestGltfLoading2.java delete mode 100644 jme3-examples/src/main/java/jme3test/model/shape/TestGltfLoading2.java diff --git a/jme3-examples/src/main/java/jme3test/model/TestGltfLoading2.java b/jme3-examples/src/main/java/jme3test/model/TestGltfLoading2.java new file mode 100644 index 000000000..7988da4fa --- /dev/null +++ b/jme3-examples/src/main/java/jme3test/model/TestGltfLoading2.java @@ -0,0 +1,319 @@ +/* + * Copyright (c) 2009-2012 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.model; + +import com.jme3.animation.*; +import com.jme3.app.ChaseCameraAppState; +import com.jme3.app.SimpleApplication; +import com.jme3.input.KeyInput; +import com.jme3.input.controls.ActionListener; +import com.jme3.input.controls.KeyTrigger; +import com.jme3.math.*; +import com.jme3.renderer.Limits; +import com.jme3.scene.Node; +import com.jme3.scene.Spatial; +import com.jme3.scene.control.Control; +import com.jme3.scene.debug.custom.SkeletonDebugAppState; +import com.jme3.scene.plugins.gltf.GltfModelKey; + +import java.util.*; + +public class TestGltfLoading2 extends SimpleApplication { + + Node autoRotate = new Node("autoRotate"); + List assets = new ArrayList<>(); + Node probeNode; + float time = 0; + int assetIndex = 0; + boolean useAutoRotate = false; + private final static String indentString = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; + int duration = 2; + boolean playAnim = true; + + public static void main(String[] args) { + TestGltfLoading2 app = new TestGltfLoading2(); + app.start(); + } + + /* + WARNING this test case can't wok without the assets, and considering their size, they are not pushed into the repo + you can find them here : + https://github.com/KhronosGroup/glTF-Sample-Models/tree/master/2.0 + https://sketchfab.com/features/gltf + You have to copy them in Model/gltf folder in the test-data project. + */ + public void simpleInitApp() { + + SkeletonDebugAppState skeletonDebugAppState = new SkeletonDebugAppState(); + getStateManager().attach(skeletonDebugAppState); + + // cam.setLocation(new Vector3f(4.0339394f, 2.645184f, 6.4627485f)); + // cam.setRotation(new Quaternion(-0.013950467f, 0.98604023f, -0.119502485f, -0.11510504f)); + cam.setFrustumPerspective(45f, (float) cam.getWidth() / cam.getHeight(), 0.1f, 100f); + renderer.setDefaultAnisotropicFilter(Math.min(renderer.getLimits().get(Limits.TextureAnisotropy), 8)); + setPauseOnLostFocus(false); + + flyCam.setMoveSpeed(5); + flyCam.setDragToRotate(true); + flyCam.setEnabled(false); + viewPort.setBackgroundColor(new ColorRGBA().setAsSrgb(0.2f, 0.2f, 0.2f, 1.0f)); + rootNode.attachChild(autoRotate); + probeNode = (Node) assetManager.loadModel("Scenes/defaultProbe.j3o"); + autoRotate.attachChild(probeNode); + +// DirectionalLight dl = new DirectionalLight(); +// dl.setDirection(new Vector3f(-1f, -1.0f, -1f).normalizeLocal()); +// dl.setColor(new ColorRGBA(1f, 1f, 1f, 1.0f)); +// rootNode.addLight(dl); + +// DirectionalLight dl2 = new DirectionalLight(); +// dl2.setDirection(new Vector3f(1f, 1.0f, 1f).normalizeLocal()); +// dl2.setColor(new ColorRGBA(0.5f, 0.5f, 0.5f, 1.0f)); +// rootNode.addLight(dl2); + +// PointLight pl = new PointLight(new Vector3f(5.0f, 5.0f, 5.0f), ColorRGBA.White, 30); +// rootNode.addLight(pl); +// PointLight pl1 = new PointLight(new Vector3f(-5.0f, -5.0f, -5.0f), ColorRGBA.White.mult(0.5f), 50); +// rootNode.addLight(pl1); + //loadModel("Models/gltf/buffalo/scene.gltf", new Vector3f(0, -1, 0), 0.1f); + //loadModel("Models/gltf/war/scene.gltf", new Vector3f(0, -1, 0), 0.1f); + loadModel("Models/gltf/ganjaarl/scene.gltf", new Vector3f(0, -1, 0), 0.01f); + //loadModel("Models/gltf/hero/scene.gltf", new Vector3f(0, -1, 0), 0.1f); + //loadModel("Models/gltf/mercy/scene.gltf", new Vector3f(0, -1, 0), 0.01f); + //loadModel("Models/gltf/crab/scene.gltf", Vector3f.ZERO, 1); + //loadModel("Models/gltf/manta/scene.gltf", Vector3f.ZERO, 0.2f); +// loadModel("Models/gltf/bone/scene.gltf", Vector3f.ZERO, 0.1f); +// loadModel("Models/gltf/box/box.gltf", Vector3f.ZERO, 1); +// loadModel("Models/gltf/duck/Duck.gltf", new Vector3f(0, -1, 0), 1); +// loadModel("Models/gltf/damagedHelmet/damagedHelmet.gltf", Vector3f.ZERO, 1); +// loadModel("Models/gltf/hornet/scene.gltf", new Vector3f(0, -0.5f, 0), 0.4f); +//// loadModel("Models/gltf/adamHead/adamHead.gltf", Vector3f.ZERO, 0.6f); + //loadModel("Models/gltf/busterDrone/busterDrone.gltf", new Vector3f(0, 0f, 0), 0.8f); +// loadModel("Models/gltf/animatedCube/AnimatedCube.gltf", Vector3f.ZERO, 0.5f); +// +// //loadModel("Models/gltf/BoxAnimated/BoxAnimated.gltf", new Vector3f(0, 0f, 0), 0.8f); +// + //loadModel("Models/gltf/RiggedFigure/RiggedSimple.gltf", new Vector3f(0, -0.3f, 0), 0.2f); + //loadModel("Models/gltf/RiggedFigure/RiggedFigure.gltf", new Vector3f(0, -1f, 0), 1f); + //loadModel("Models/gltf/CesiumMan/CesiumMan.gltf", new Vector3f(0, -1, 0), 1f); + //loadModel("Models/gltf/BrainStem/BrainStem.gltf", new Vector3f(0, -1, 0), 1f); + //loadModel("Models/gltf/Jaime/Jaime.gltf", new Vector3f(0, -1, 0), 1f); + //loadModel("Models/gltf/GiantWorm/GiantWorm.gltf", new Vector3f(0, -1, 0), 1f); + //loadModel("Models/gltf/RiggedFigure/WalkingLady.gltf", new Vector3f(0, -0.f, 0), 1f); + //loadModel("Models/gltf/Monster/Monster.gltf", Vector3f.ZERO, 0.03f); + +// loadModel("Models/gltf/corset/Corset.gltf", new Vector3f(0, -1, 0), 20f); + // loadModel("Models/gltf/boxInter/BoxInterleaved.gltf", new Vector3f(0, 0, 0), 1f); + + + probeNode.attachChild(assets.get(0)); + + ChaseCameraAppState chaseCam = new ChaseCameraAppState(); + chaseCam.setTarget(probeNode); + getStateManager().attach(chaseCam); + chaseCam.setInvertHorizontalAxis(true); + chaseCam.setInvertVerticalAxis(true); + chaseCam.setZoomSpeed(0.5f); + chaseCam.setMinVerticalRotation(-FastMath.HALF_PI); + chaseCam.setRotationSpeed(3); + chaseCam.setDefaultDistance(3); + chaseCam.setDefaultVerticalRotation(0.3f); + + inputManager.addMapping("autorotate", new KeyTrigger(KeyInput.KEY_SPACE)); + inputManager.addListener(new ActionListener() { + @Override + public void onAction(String name, boolean isPressed, float tpf) { + if (isPressed) { + useAutoRotate = !useAutoRotate; + } + } + }, "autorotate"); + + inputManager.addMapping("toggleAnim", new KeyTrigger(KeyInput.KEY_RETURN)); + + inputManager.addListener(new ActionListener() { + @Override + public void onAction(String name, boolean isPressed, float tpf) { + if (isPressed) { + playAnim = !playAnim; + if (playAnim) { + playFirstAnim(rootNode); + } else { + stopAnim(rootNode); + } + } + } + }, "toggleAnim"); + inputManager.addMapping("nextAnim", new KeyTrigger(KeyInput.KEY_RIGHT)); + inputManager.addListener(new ActionListener() { + @Override + public void onAction(String name, boolean isPressed, float tpf) { + if (isPressed && animControl != null) { + AnimChannel c = animControl.getChannel(0); + if (c == null) { + c = animControl.createChannel(); + } + String anim = anims.poll(); + anims.add(anim); + c.setAnim(anim); + } + } + }, "nextAnim"); + + dumpScene(rootNode, 0); + } + + private T findControl(Spatial s, Class controlClass) { + T ctrl = s.getControl(controlClass); + if (ctrl != null) { + return ctrl; + } + if (s instanceof Node) { + Node n = (Node) s; + for (Spatial spatial : n.getChildren()) { + ctrl = findControl(spatial, controlClass); + if (ctrl != null) { + return ctrl; + } + } + } + return null; + } + + private void loadModel(String path, Vector3f offset, float scale) { + GltfModelKey k = new GltfModelKey(path); + //k.setKeepSkeletonPose(true); + Spatial s = assetManager.loadModel(k); + s.scale(scale); + s.move(offset); + assets.add(s); + if (playAnim) { + playFirstAnim(s); + } + + SkeletonControl ctrl = findControl(s, SkeletonControl.class); + + // ctrl.getSpatial().removeControl(ctrl); + if (ctrl == null) { + return; + } + //System.err.println(ctrl.getSkeleton().toString()); + //ctrl.setHardwareSkinningPreferred(false); + // getStateManager().getState(SkeletonDebugAppState.class).addSkeleton(ctrl, true); +// AnimControl aCtrl = findControl(s, AnimControl.class); +// //ctrl.getSpatial().removeControl(ctrl); +// if (aCtrl == null) { +// return; +// } +// if (aCtrl.getSkeleton() != null) { +// getStateManager().getState(SkeletonDebugAppState.class).addSkeleton(aCtrl.getSkeleton(), aCtrl.getSpatial(), true); +// } + + } + + Queue anims = new LinkedList<>(); + AnimControl animControl; + + private void playFirstAnim(Spatial s) { + + AnimControl control = s.getControl(AnimControl.class); + if (control != null) { + anims.clear(); + for (String name : control.getAnimationNames()) { + anims.add(name); + } + if (anims.isEmpty()) { + return; + } + String anim = anims.poll(); + anims.add(anim); + control.createChannel().setAnim(anim); + animControl = control; + } + if (s instanceof Node) { + Node n = (Node) s; + for (Spatial spatial : n.getChildren()) { + playFirstAnim(spatial); + } + } + } + + private void stopAnim(Spatial s) { + + AnimControl control = s.getControl(AnimControl.class); + if (control != null) { + for (int i = 0; i < control.getNumChannels(); i++) { + AnimChannel ch = control.getChannel(i); + ch.reset(true); + } + control.clearChannels(); + } + if (s instanceof Node) { + Node n = (Node) s; + for (Spatial spatial : n.getChildren()) { + stopAnim(spatial); + } + } + } + + @Override + public void simpleUpdate(float tpf) { + + if (!useAutoRotate) { + return; + } + time += tpf; + autoRotate.rotate(0, tpf * 0.5f, 0); + if (time > duration) { + assets.get(assetIndex).removeFromParent(); + assetIndex = (assetIndex + 1) % assets.size(); + if (assetIndex == 0) { + duration = 10; + } + probeNode.attachChild(assets.get(assetIndex)); + time = 0; + } + } + + private void dumpScene(Spatial s, int indent) { + System.err.println(indentString.substring(0, indent) + s.getName() + " (" + s.getClass().getSimpleName() + ") / " + + s.getLocalTransform().getTranslation().toString() + ", " + + s.getLocalTransform().getRotation().toString() + ", " + + s.getLocalTransform().getScale().toString()); + if (s instanceof Node) { + Node n = (Node) s; + for (Spatial spatial : n.getChildren()) { + dumpScene(spatial, indent + 1); + } + } + } +} diff --git a/jme3-examples/src/main/java/jme3test/model/shape/TestGltfLoading2.java b/jme3-examples/src/main/java/jme3test/model/shape/TestGltfLoading2.java deleted file mode 100644 index 561d6005d..000000000 --- a/jme3-examples/src/main/java/jme3test/model/shape/TestGltfLoading2.java +++ /dev/null @@ -1,7 +0,0 @@ -package jme3test.model.shape; - -/** - * Created by Nehon on 09/12/2017. - */ -public class TestGltfLoading2 { -} diff --git a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java index 350c08d6b..e0df8fa0d 100644 --- a/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java +++ b/jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfLoader.java @@ -734,16 +734,6 @@ public class GltfLoader implements AssetLoader { continue; } - //if targetNode is a bone, check if it's in a used skin. - BoneWrapper bw = fetchFromCache("nodes", targetNode, BoneWrapper.class); - if (bw != null) { - SkinData skin = fetchFromCache("skins", bw.skinIndex, SkinData.class); - if (skin == null || !skin.used) { - //this skin is not referenced by any mesh, let's not load animation for it. - continue; - } - } - TrackData trackData = tracks[targetNode]; if (trackData == null) { trackData = new TrackData(); @@ -824,17 +814,20 @@ public class GltfLoader implements AssetLoader { //apply the inverseBindMatrix to animation data. b.update(trackData); usedBones.add(b.bone); - BoneTrack track = new BoneTrack(b.boneIndex, trackData.times, trackData.translations, trackData.rotations, trackData.scales); - anim.addTrack(track); + if (skinIndex == -1) { skinIndex = b.skinIndex; } else { - //Check if all bones affected by this animation are from the same skin, otherwise raise an error. + //Check if all bones affected by this animation are from the same skin, the track will be skipped. if (skinIndex != b.skinIndex) { - throw new AssetLoadException("Animation " + animationIndex + " (" + name + ") applies to bones that are not from the same skin: skin " + skinIndex + ", bone " + b.bone.getName() + " from skin " + b.skinIndex); + logger.log(Level.WARNING, "Animation " + animationIndex + " (" + name + ") applies to bones that are not from the same skin: skin " + skinIndex + ", bone " + b.bone.getName() + " from skin " + b.skinIndex); + continue; } - //else everything is fine. } + + BoneTrack track = new BoneTrack(b.boneIndex, trackData.times, trackData.translations, trackData.rotations, trackData.scales); + anim.addTrack(track); + } } @@ -1232,13 +1225,13 @@ public class GltfLoader implements AssetLoader { reverseBlendAnimTransforms(t, bindTransforms); - if(data.translations != null) { + if (data.translations != null) { data.translations[i] = t.getTranslation(); } - if(data.rotations != null) { + if (data.rotations != null) { data.rotations[i] = t.getRotation(); } - if(data.scales != null) { + if (data.scales != null) { data.scales[i] = t.getScale(); } }