From 5760a48eea497c387711e6fccad53d2021770f67 Mon Sep 17 00:00:00 2001 From: shadowislord Date: Sun, 22 Feb 2015 15:41:10 -0500 Subject: [PATCH] Skeletal Animation: remove deprecated SkeletonControl ctor - it is not useful, because targets / materials are gathered on every update() call --- .../main/java/com/jme3/animation/AnimControl.java | 5 ++--- .../java/com/jme3/animation/SkeletonControl.java | 13 ------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/animation/AnimControl.java b/jme3-core/src/main/java/com/jme3/animation/AnimControl.java index 6c25da7ec..615fe2fd8 100644 --- a/jme3-core/src/main/java/com/jme3/animation/AnimControl.java +++ b/jme3-core/src/main/java/com/jme3/animation/AnimControl.java @@ -372,9 +372,8 @@ public final class AnimControl extends AbstractControl implements Cloneable { // When backward compatibility won't be needed anymore this can deleted Savable[] sav = in.readSavableArray("targets", null); if (sav != null) { - Mesh[] targets = new Mesh[sav.length]; - System.arraycopy(sav, 0, targets, 0, sav.length); - skeletonControl = new SkeletonControl(targets, skeleton); + // NOTE: allow the targets to be gathered automatically + skeletonControl = new SkeletonControl(skeleton); spatial.addControl(skeletonControl); } } diff --git a/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java b/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java index 269a9b989..abde5dfe9 100644 --- a/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java +++ b/jme3-core/src/main/java/com/jme3/animation/SkeletonControl.java @@ -205,19 +205,6 @@ public class SkeletonControl extends AbstractControl implements Cloneable { this.skeleton = skeleton; } - /** - * Creates a skeleton control. - * - * @param targets the meshes controlled by the skeleton - * @param skeleton the skeleton - */ - @Deprecated - SkeletonControl(Mesh[] targets, Skeleton skeleton) { - this.skeleton = skeleton; - this.targets = new SafeArrayList(Mesh.class, Arrays.asList(targets)); - } - - private void findTargets(Node node) { Mesh sharedMesh = null;