Skip to content

AnimComposer: updated to save globalSpeed on export and fixed issue with Layer cloning #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ali-RS merged 3 commits into from
Apr 30, 2019
Merged

AnimComposer: updated to save globalSpeed on export and fixed issue with Layer cloning #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78a6e02
AnimComposer: save globalSpeed on export
Apr 29, 2019
6d7923e
Updated TestModelExportingCloning to test AnimComposer.globalSpeed
Apr 29, 2019
7fd1f9e
Fixed issue with AnimComposer.Layer cloning
Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions jme3-core/src/main/java/com/jme3/anim/AnimComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class AnimComposer extends AbstractControl {
private Map<String, Layer> layers = new LinkedHashMap<>();

public AnimComposer() {
layers.put(DEFAULT_LAYER, new Layer());
layers.put(DEFAULT_LAYER, new Layer(this));
}

/**
Expand Down Expand Up @@ -171,7 +171,7 @@ public Action removeAction(String name) {
}

public void makeLayer(String name, AnimationMask mask) {
Layer l = new Layer();
Layer l = new Layer(this);
l.mask = mask;
layers.put(name, l);
}
Expand Down Expand Up @@ -300,23 +300,30 @@ public void read(JmeImporter im) throws IOException {
super.read(im);
InputCapsule ic = im.getCapsule(this);
animClipMap = (Map<String, AnimClip>) ic.readStringSavableMap("animClipMap", new HashMap<String, AnimClip>());
globalSpeed = ic.readFloat("globalSpeed", 1f);
}

@Override
public void write(JmeExporter ex) throws IOException {
super.write(ex);
OutputCapsule oc = ex.getCapsule(this);
oc.writeStringSavableMap(animClipMap, "animClipMap", new HashMap<String, AnimClip>());
oc.write(globalSpeed, "globalSpeed", 1f);
}

private class Layer implements JmeCloneable {
private static class Layer implements JmeCloneable {
private AnimComposer ac;
private Action currentAction;
private AnimationMask mask;
private float weight;
private double time;

public Layer(AnimComposer ac) {
this.ac = ac;
}

public void advance(float tpf) {
time += tpf * currentAction.getSpeed() * globalSpeed;
time += tpf * currentAction.getSpeed() * ac.globalSpeed;
// make sure negative time is in [0, length] range
if (time < 0) {
double length = currentAction.getLength();
Expand All @@ -337,6 +344,7 @@ public Object jmeClone() {

@Override
public void cloneFields(Cloner cloner, Object original) {
ac = cloner.clone(ac);
currentAction = null;
}
}
Expand Down
3 changes: 3 additions & 0 deletions jme3-examples/src/main/java/jme3test/model/anim/TestModelExportingCloning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,21 @@ public void simpleInitApp() {
Spatial originalModel = assetManager.loadModel("Models/Oto/Oto.mesh.xml");
composer = originalModel.getControl(AnimComposer.class);
composer.setCurrentAction("Walk");
composer.setGlobalSpeed(1.5f);
rootNode.attachChild(originalModel);

Spatial clonedModel = originalModel.clone();
clonedModel.move(10, 0, 0);
composer = clonedModel.getControl(AnimComposer.class);
composer.setCurrentAction("push");
System.out.println("clonedModel: globalSpeed=" + composer.getGlobalSpeed());
rootNode.attachChild(clonedModel);

Spatial exportedModel = BinaryExporter.saveAndLoad(assetManager, originalModel);
exportedModel.move(20, 0, 0);
composer = exportedModel.getControl(AnimComposer.class);
composer.setCurrentAction("pull");
System.out.println("exportedModel: globalSpeed=" + composer.getGlobalSpeed());
rootNode.attachChild(exportedModel);
}
}