Skip to content

Commit 6ca9910

Browse files
authored
Set dataobject on JmeJoint (#703)
* Set dataobject on JmeJoint * Delete old animation classes
1 parent b0100f2 commit 6ca9910

6 files changed

Lines changed: 9 additions & 414 deletions

File tree

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBone.java

Lines changed: 0 additions & 149 deletions
This file was deleted.

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBoneChildren.java

Lines changed: 0 additions & 138 deletions
This file was deleted.

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJoint.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2020 jMonkeyEngine
2+
* Copyright (c) 2009-2026 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -66,8 +66,8 @@ public class JmeJoint extends AbstractSceneExplorerNode {
6666
public JmeJoint() {
6767
}
6868

69-
public JmeJoint(JmeSkinningControl jmeSkinningControl, Joint joint, JmeJointChildren children) {
70-
super(children);
69+
public JmeJoint(JmeSkinningControl jmeSkinningControl, Joint joint, JmeJointChildren children, DataObject dataObject) {
70+
super(children, dataObject);
7171
this.jmeSkinningControl = jmeSkinningControl;
7272
getLookupContents().add(joint);
7373
getLookupContents().add(this);
@@ -102,7 +102,7 @@ protected Sheet createSheet() {
102102
@Override
103103
public Action[] getActions(boolean context) {
104104
return new Action[]{
105-
Actions.alwaysEnabled(new AttachementNodeActionListener(), "Get attachement Node", "", false),
105+
Actions.alwaysEnabled(new AttachementNodeActionListener(), "Get attachment Node", "", false),
106106
Actions.alwaysEnabled(new ArmatureMaskActionListener(), "Create armature mask", "", false)
107107
};
108108
}
@@ -122,7 +122,7 @@ public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean
122122
JmeJointChildren children = new JmeJointChildren(jmeSkinningControl, (Joint)key);
123123
children.setReadOnly(cookie);
124124
children.setDataObject(key2);
125-
return new org.openide.nodes.Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children).setReadOnly(cookie)};
125+
return new org.openide.nodes.Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children, key2).setReadOnly(cookie)};
126126
}
127127

128128

jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJointChildren.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009-2020 jMonkeyEngine
2+
* Copyright (c) 2009-2026 jMonkeyEngine
33
* All rights reserved.
44
*
55
* Redistribution and use in source and binary forms, with or without
@@ -101,7 +101,7 @@ protected Node[] createNodes(Object key) {
101101
JmeJointChildren children = new JmeJointChildren(jmeSkinningControl, (Joint)key);
102102
children.setReadOnly(readOnly);
103103
children.setDataObject(dataObject);
104-
return new Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children).setReadOnly(readOnly)};
104+
return new Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children, dataObject).setReadOnly(readOnly)};
105105
} else {
106106
return new Node[]{Node.EMPTY};
107107
}

0 commit comments

Comments
 (0)