diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBone.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBone.java deleted file mode 100644 index 541823e1b..000000000 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBone.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.jme3.gde.core.sceneexplorer.nodes.animation; - -import com.jme3.animation.Bone; -import com.jme3.gde.core.icons.IconList; -import com.jme3.gde.core.scene.SceneApplication; -import com.jme3.gde.core.sceneexplorer.nodes.AbstractSceneExplorerNode; -import com.jme3.gde.core.sceneexplorer.nodes.ClipboardSpatial; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; -import java.awt.Image; -import java.awt.datatransfer.DataFlavor; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import javax.swing.Action; -import org.openide.awt.Actions; -import org.openide.loaders.DataObject; -import org.openide.nodes.Sheet; -import org.openide.util.Exceptions; - -/** - * - * @author normenhansen - */ -@org.openide.util.lookup.ServiceProvider(service = SceneExplorerNode.class) -@SuppressWarnings({"unchecked", "rawtypes"}) -@Deprecated -public class JmeBone extends AbstractSceneExplorerNode { - - private static Image smallImage = IconList.bone.getImage(); - private Bone bone; - private JmeSkeletonControl jmeSkeletonControl; - protected final DataFlavor BONE_FLAVOR = new DataFlavor(ClipboardSpatial.class, "Bone"); - - public JmeBone() { - } - - public JmeBone(JmeSkeletonControl jmeSkeletonControl, Bone bone, JmeBoneChildren children) { - super(children); - this.jmeSkeletonControl = jmeSkeletonControl; - getLookupContents().add(bone); - getLookupContents().add(this); - super.setName(bone.getName()); - this.bone = bone; - } - - @Override - public Image getIcon(int type) { - return smallImage; - } - - @Override - public Image getOpenedIcon(int type) { - return smallImage; - } - - @Override - protected Sheet createSheet() { - //TODO: multithreading.. - Sheet sheet = super.createSheet(); - Sheet.Set set = Sheet.createPropertiesSet(); - set.setDisplayName("Bone"); - set.setName(Bone.class.getName()); - Bone obj = bone;//getLookup().lookup(Spatial.class); - if (obj == null) { - return sheet; - } - sheet.put(set); - return sheet; - - } - - @Override - public Action[] getActions(boolean context) { - - return new Action[]{ - Actions.alwaysEnabled(new AttachementNodeActionListener(), "Get attachement Node", "", false),}; - } - - private class AttachementNodeActionListener implements ActionListener { - - public void actionPerformed(ActionEvent e) { - fireSave(true); - try { - SceneApplication.getApplication().enqueue(new Callable() { - - public Void call() throws Exception { - jmeSkeletonControl.getSkeletonControl().getAttachmentsNode(bone.getName()); - return null; - } - }).get(); - ((AbstractSceneExplorerNode) jmeSkeletonControl.getParentNode()).refresh(false); - } catch (InterruptedException ex) { - Exceptions.printStackTrace(ex); - } catch (ExecutionException ex) { - Exceptions.printStackTrace(ex); - } - - } - } - - public Class getExplorerObjectClass() { - return Bone.class; - } - - @Override - public Class getExplorerNodeClass() { - return JmeBone.class; - } - - @Override - public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean cookie) { - JmeBoneChildren children = new JmeBoneChildren(jmeSkeletonControl, (Bone) key); - children.setReadOnly(cookie); - children.setDataObject(key2); - return new org.openide.nodes.Node[]{new JmeBone(jmeSkeletonControl, (Bone) key, children).setReadOnly(cookie)}; - } -} diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBoneChildren.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBoneChildren.java deleted file mode 100644 index eaad277bd..000000000 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeBoneChildren.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2009-2010 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.jme3.gde.core.sceneexplorer.nodes.animation; - -import com.jme3.animation.Bone; -import com.jme3.gde.core.scene.SceneApplication; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import org.openide.loaders.DataObject; -import org.openide.nodes.Children; -import org.openide.nodes.Node; -import org.openide.util.Exceptions; - -/** - * - * @author normenhansen - */ -@Deprecated -public class JmeBoneChildren extends Children.Keys { - - protected Bone rootBone; - protected JmeSkeletonControl jmeSkeletonControl; - protected boolean readOnly = true; - protected HashMap map = new HashMap(); - private DataObject dataObject; - - public JmeBoneChildren() { - } - - public JmeBoneChildren(JmeSkeletonControl jmeSkeletonControl, Bone rootBone) { - this.rootBone = rootBone; - this.jmeSkeletonControl = jmeSkeletonControl; - } - - public void refreshChildren(boolean immediate) { - setKeys(createKeys()); - refresh(); - } - - public void setReadOnly(boolean cookie) { - this.readOnly = cookie; - } - - @Override - protected void addNotify() { - super.addNotify(); - setKeys(createKeys()); - } - - protected List createKeys() { - try { - return SceneApplication.getApplication().enqueue(new Callable>() { - - public List call() throws Exception { - List keys = new LinkedList(); - if (rootBone != null) { - keys.addAll(rootBone.getChildren()); - } else { - keys.addAll(Arrays.asList(jmeSkeletonControl.getSkeletonControl().getSkeleton().getRoots())); - } - - return keys; - } - }).get(); - } catch (InterruptedException ex) { - Exceptions.printStackTrace(ex); - } catch (ExecutionException ex) { - Exceptions.printStackTrace(ex); - } - return null; - } - - @Override - protected Node[] createNodes(Object key) { -// for (SceneExplorerNode di : Lookup.getDefault().lookupAll(SceneExplorerNode.class)) { -// if (di.getExplorerObjectClass().getName().equals(key.getClass().getName())) { -// Logger.getLogger(this.getClass().getName()).log(Level.FINE, "Found {0}", di.getExplorerNodeClass()); -// Node[] ret = di.createNodes(key, dataObject, readOnly); -// if (ret != null) { -// return ret; -// } -// } -// } - - if (key instanceof Bone) { - JmeBoneChildren children = new JmeBoneChildren(jmeSkeletonControl, (Bone) key); - children.setReadOnly(readOnly); - children.setDataObject(dataObject); - return new Node[]{new JmeBone(jmeSkeletonControl, (Bone) key, children).setReadOnly(readOnly)}; - } - return new Node[]{Node.EMPTY}; - } - - public void setSkeltonControl(JmeSkeletonControl jmeSkeletonControl) { - this.jmeSkeletonControl = jmeSkeletonControl; - } - - public DataObject getDataObject() { - return dataObject; - } - - public void setDataObject(DataObject dataObject) { - this.dataObject = dataObject; - } -} diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJoint.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJoint.java index 0efad42a3..eb7db27ae 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJoint.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2020 jMonkeyEngine + * Copyright (c) 2009-2026 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,8 +66,8 @@ public class JmeJoint extends AbstractSceneExplorerNode { public JmeJoint() { } - public JmeJoint(JmeSkinningControl jmeSkinningControl, Joint joint, JmeJointChildren children) { - super(children); + public JmeJoint(JmeSkinningControl jmeSkinningControl, Joint joint, JmeJointChildren children, DataObject dataObject) { + super(children, dataObject); this.jmeSkinningControl = jmeSkinningControl; getLookupContents().add(joint); getLookupContents().add(this); @@ -102,7 +102,7 @@ protected Sheet createSheet() { @Override public Action[] getActions(boolean context) { return new Action[]{ - Actions.alwaysEnabled(new AttachementNodeActionListener(), "Get attachement Node", "", false), + Actions.alwaysEnabled(new AttachementNodeActionListener(), "Get attachment Node", "", false), Actions.alwaysEnabled(new ArmatureMaskActionListener(), "Create armature mask", "", false) }; } @@ -122,7 +122,7 @@ public org.openide.nodes.Node[] createNodes(Object key, DataObject key2, boolean JmeJointChildren children = new JmeJointChildren(jmeSkinningControl, (Joint)key); children.setReadOnly(cookie); children.setDataObject(key2); - return new org.openide.nodes.Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children).setReadOnly(cookie)}; + return new org.openide.nodes.Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children, key2).setReadOnly(cookie)}; } diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJointChildren.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJointChildren.java index 4938ca635..c693bed29 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJointChildren.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeJointChildren.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2020 jMonkeyEngine + * Copyright (c) 2009-2026 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -101,7 +101,7 @@ protected Node[] createNodes(Object key) { JmeJointChildren children = new JmeJointChildren(jmeSkinningControl, (Joint)key); children.setReadOnly(readOnly); children.setDataObject(dataObject); - return new Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children).setReadOnly(readOnly)}; + return new Node[]{new JmeJoint(jmeSkinningControl, (Joint)key, children, dataObject).setReadOnly(readOnly)}; } else { return new Node[]{Node.EMPTY}; } diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkeletonControl.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkeletonControl.java deleted file mode 100644 index fad8fb57f..000000000 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkeletonControl.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (c) 2009-2016 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.jme3.gde.core.sceneexplorer.nodes.animation; - -import com.jme3.animation.SkeletonControl; -import com.jme3.gde.core.icons.IconList; -import com.jme3.gde.core.sceneexplorer.nodes.JmeControl; -import com.jme3.gde.core.sceneexplorer.nodes.SceneExplorerNode; -import java.awt.Image; -import org.openide.loaders.DataObject; -import org.openide.nodes.Node; -import org.openide.nodes.Sheet; - -/** - * - * @author normenhansen - */ -@org.openide.util.lookup.ServiceProvider(service = SceneExplorerNode.class) -@SuppressWarnings({"unchecked", "rawtypes"}) -@Deprecated -public class JmeSkeletonControl extends JmeControl { - - private SkeletonControl skeletonControl; - private static Image smallImage = IconList.skeletonControl.getImage(); - - public JmeSkeletonControl() { - } - - public JmeSkeletonControl(SkeletonControl skeletonControl, JmeBoneChildren children) { - super(children); - this.skeletonControl = skeletonControl; - control = skeletonControl; - lookupContents.add(this); - lookupContents.add(skeletonControl); - setName("SkeletonControl"); - children.setSkeltonControl(this); - } - - @Override - public Image getIcon(int type) { - return smallImage; - } - - @Override - public Image getOpenedIcon(int type) { - return smallImage; - } - - @Override - protected Sheet createSheet() { - //TODO: multithreading.. - Sheet sheet = Sheet.createDefault(); - Sheet.Set set = Sheet.createPropertiesSet(); - set.setDisplayName("SkeletonControl"); - set.setName(SkeletonControl.class.getName()); - if (skeletonControl == null) { - return sheet; - } - Property prop = makeProperty(skeletonControl, boolean.class, "isHardwareSkinningPreferred", "setHardwareSkinningPreferred", "Hardware Skinning"); - prop.setShortDescription("This Preference enables/disables the usage of HW Skinning for this Skeleton. This will improve your performance and is the default, however you might want to turn it off to debug some failure. Also Note that setting it to true doesn't guarantee that HW Skinning is used, it has to be supported by the Platform."); - set.put(prop); - - // set.put(new AnimationProperty(animControl)); - - sheet.put(set); - return sheet; - - } - - @Override - public Class getExplorerObjectClass() { - return SkeletonControl.class; - } - - @Override - public Class getExplorerNodeClass() { - return JmeSkeletonControl.class; - } - - public SkeletonControl getSkeletonControl() { - return skeletonControl; - } - - @Override - public Node[] createNodes(Object key, DataObject key2, boolean cookie) { - JmeBoneChildren children = new JmeBoneChildren(null, null); - JmeSkeletonControl jsc = new JmeSkeletonControl((SkeletonControl) key, children); - return new Node[]{jsc}; - } -} diff --git a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkinningControl.java b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkinningControl.java index cd49d9a93..cc0d20721 100644 --- a/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkinningControl.java +++ b/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/animation/JmeSkinningControl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2024 jMonkeyEngine + * Copyright (c) 2009-2026 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -102,6 +102,7 @@ public SkinningControl getSkinningControl() { @Override public Node[] createNodes(Object key, DataObject key2, boolean cookie) { JmeJointChildren children = new JmeJointChildren(null, null); + children.setDataObject(key2); return new Node[]{new JmeSkinningControl((SkinningControl)key, children)}; } }