sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* AnimControl now forces the animation map to be non-null in all cases - when creating a new AnimControl, cloning it or loading from J3O.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9725 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..rd 2012-09-14 05:22:31 +00:00
parent 1ddb7903db
commit 8c2bdebbae
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engine/src/core/com/jme3/animation/AnimControl.java
View File

@ -77,7 +77,7 @@ public final class AnimControl extends AbstractControl implements Cloneable {
/** /**
* List of animations * List of animations
*/ */
HashMap<String, Animation> animationMap; HashMap<String, Animation> animationMap = new HashMap<String, Animation>();
/** /**
* Animation channels * Animation channels
*/ */
@ -120,7 +120,6 @@ public final class AnimControl extends AbstractControl implements Cloneable {
} }
// animationMap is cloned, but only ClonableTracks will be cloned as they need a reference to a cloned spatial // animationMap is cloned, but only ClonableTracks will be cloned as they need a reference to a cloned spatial
clone.animationMap = new HashMap<String, Animation>();
for (Entry<String, Animation> animEntry : animationMap.entrySet()) { for (Entry<String, Animation> animEntry : animationMap.entrySet()) {
clone.animationMap.put(animEntry.getKey(), animEntry.getValue().cloneForSpatial(spatial)); clone.animationMap.put(animEntry.getKey(), animEntry.getValue().cloneForSpatial(spatial));
} }
@ -147,9 +146,6 @@ public final class AnimControl extends AbstractControl implements Cloneable {
* such named animation exists. * such named animation exists.
*/ */
public Animation getAnim(String name) { public Animation getAnim(String name) {
if (animationMap == null) {
animationMap = new HashMap<String, Animation>();
}
return animationMap.get(name); return animationMap.get(name);
} }
@ -159,9 +155,6 @@ public final class AnimControl extends AbstractControl implements Cloneable {
* @param anim The animation to add. * @param anim The animation to add.
*/ */
public void addAnim(Animation anim) { public void addAnim(Animation anim) {
if (animationMap == null) {
animationMap = new HashMap<String, Animation>();
}
animationMap.put(anim.getName(), anim); animationMap.put(anim.getName(), anim);
} }
@ -360,7 +353,10 @@ public final class AnimControl extends AbstractControl implements Cloneable {
super.read(im); super.read(im);
InputCapsule in = im.getCapsule(this); InputCapsule in = im.getCapsule(this);
skeleton = (Skeleton) in.readSavable("skeleton", null); skeleton = (Skeleton) in.readSavable("skeleton", null);
animationMap = (HashMap<String, Animation>) in.readStringSavableMap("animations", null); HashMap<String, Animation> loadedAnimationMap = (HashMap<String, Animation>) in.readStringSavableMap("animations", null);
if (loadedAnimationMap != null) {
animationMap = loadedAnimationMap;
}
if (im.getFormatVersion() == 0) { if (im.getFormatVersion() == 0) {
// Changed for backward compatibility with j3o files generated // Changed for backward compatibility with j3o files generated