Skip to content

TransformTrack: protect the no-arg constructor #1531

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
stephengold merged 2 commits into from
May 5, 2021
Merged

TransformTrack: protect the no-arg constructor #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
623401a
TransformTrack: protect the no-arg constructor
stephengold Apr 26, 2021
4a5f7f2
TransformTrack: avoid NPE when "times" is null in setKeyframes()
stephengold May 2, 2021
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
6 changes: 4 additions & 2 deletions jme3-core/src/main/java/com/jme3/anim/TransformTrack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class TransformTrack implements AnimTrack<Transform> {
/**
* Serialization-only. Do not use.
*/
public TransformTrack() {
protected TransformTrack() {
}

/**
Expand Down Expand Up @@ -197,7 +197,9 @@ public void setKeyframesRotation(Quaternion[] rotations) {
* @param scales the scale of the bone for each frame
*/
public void setKeyframes(float[] times, Vector3f[] translations, Quaternion[] rotations, Vector3f[] scales) {
setTimes(times);
if (times != null) {
setTimes(times);
}
if (translations != null) {
setKeyframesTranslation(translations);
}
Expand Down
3 changes: 1 addition & 2 deletions jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SkeletonLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ public void startElement(String uri, String localName, String qName, Attributes
assert elementStack.peek().equals("tracks");
String jointName = SAXUtil.parseString(attribs.getValue("bone"));
joint = nameToJoint.get(jointName);
track = new TransformTrack();
track.setTarget(joint);
track = new TransformTrack(joint, null, null, null, null);
} else if (qName.equals("boneparent")) {
assert elementStack.peek().equals("bonehierarchy");
String jointName = attribs.getValue("bone");
Expand Down