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

SDK: fix "Add Control" to JmeAssetLinkNode (no more NPE, and correct display and edition)

Browse Source
This commit is contained in:
David Bernard 2014-06-04 15:28:33 +02:00
parent f26b53fcb7
commit 932245d10b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeAssetLinkNode.java
View File

@ -37,6 +37,7 @@ import com.jme3.gde.core.scene.SceneApplication;
import com.jme3.gde.core.sceneexplorer.nodes.actions.AddUserDataAction; import com.jme3.gde.core.sceneexplorer.nodes.actions.AddUserDataAction;
import com.jme3.gde.core.sceneexplorer.nodes.actions.NewControlPopup; import com.jme3.gde.core.sceneexplorer.nodes.actions.NewControlPopup;
import com.jme3.scene.AssetLinkNode; import com.jme3.scene.AssetLinkNode;
import com.jme3.scene.control.Control;
import java.awt.Image; import java.awt.Image;
import java.io.IOException; import java.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;
@ -73,8 +74,7 @@ public class JmeAssetLinkNode extends JmeNode {
} }
public JmeAssetLinkNode(AssetLinkNode spatial, JmeSpatialChildren children) { public JmeAssetLinkNode(AssetLinkNode spatial, JmeSpatialChildren children) {
super(spatial, new AssetLinkChildren(spatial)); super(spatial, new AssetLinkChildren(spatial, children.getDataObject()));
getLookupContents().add(spatial);
linkChildren = (AssetLinkChildren)getChildren(); linkChildren = (AssetLinkChildren)getChildren();
linkChildren.setReadOnly(children.readOnly); linkChildren.setReadOnly(children.readOnly);
this.geom = spatial; this.geom = spatial;
@ -145,8 +145,9 @@ public class JmeAssetLinkNode extends JmeNode {
public static class AssetLinkChildren extends JmeSpatialChildren { public static class AssetLinkChildren extends JmeSpatialChildren {
public AssetLinkChildren(AssetLinkNode spatial) { public AssetLinkChildren(AssetLinkNode spatial, DataObject dataObject) {
super(spatial); super(spatial);
setDataObject(dataObject);
} }
@Override @Override
@ -164,7 +165,10 @@ public class JmeAssetLinkNode extends JmeNode {
List<Object> keys = new LinkedList<Object>(); List<Object> keys = new LinkedList<Object>();
if (spatial instanceof AssetLinkNode) { if (spatial instanceof AssetLinkNode) {
keys.addAll(((AssetLinkNode) spatial).getAssetLoaderKeys()); keys.addAll(((AssetLinkNode) spatial).getAssetLoaderKeys());
return keys; }
for (int i = 0; i < spatial.getNumControls(); i++) {
Control control = spatial.getControl(i);
keys.add(control);
} }
return keys; return keys;
} }
@ -194,7 +198,7 @@ public class JmeAssetLinkNode extends JmeNode {
ModelKey assetKey = (ModelKey) key; ModelKey assetKey = (ModelKey) key;
return new Node[]{new JmeAssetLinkChild(assetKey, (AssetLinkNode) spatial)}; return new Node[]{new JmeAssetLinkChild(assetKey, (AssetLinkNode) spatial)};
} }
return null; return super.createNodes(key);
} }
} }

1
sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/JmeNode.java
View File

@ -75,7 +75,6 @@ public class JmeNode extends JmeSpatial {
public JmeNode(Node spatial, JmeSpatialChildren children) { public JmeNode(Node spatial, JmeSpatialChildren children) {
super(spatial, children); super(spatial, children);
getLookupContents().add(spatial);
this.node = spatial; this.node = spatial;
} }