Skip to content

Commit 9030d71

Browse files
vladimirpetrenkovladimirpetrenko
committed
Issue #107 Supports for AssetLinkNode Update
1 parent f961460 commit 9030d71

File tree

4 files changed

+13
-51
lines changed

4 files changed

+13
-51
lines changed

‎src/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package com.ss.editor.ui.component.editor.impl.scene;
22

3-
import static com.ss.editor.control.transform.SceneEditorControl.LOADED_MODEL_KEY;
4-
import static com.ss.editor.util.EditorUtil.*;
5-
import static com.ss.editor.util.MaterialUtils.saveIfNeedTextures;
6-
import static com.ss.editor.util.MaterialUtils.updateMaterialIdNeed;
7-
import static java.util.Objects.requireNonNull;
8-
import static rlib.util.ClassUtils.unsafeCast;
93
import com.jme3.asset.AssetManager;
104
import com.jme3.asset.MaterialKey;
115
import com.jme3.asset.ModelKey;
@@ -86,6 +80,13 @@
8680
import java.util.function.Consumer;
8781
import java.util.function.Supplier;
8882

83+
import static com.ss.editor.control.transform.SceneEditorControl.LOADED_MODEL_KEY;
84+
import static com.ss.editor.util.EditorUtil.*;
85+
import static com.ss.editor.util.MaterialUtils.saveIfNeedTextures;
86+
import static com.ss.editor.util.MaterialUtils.updateMaterialIdNeed;
87+
import static java.util.Objects.requireNonNull;
88+
import static rlib.util.ClassUtils.unsafeCast;
89+
8990
/**
9091
* The base implementation of a model file editor.
9192
*
@@ -1034,7 +1035,7 @@ protected void processChangeTool(@Nullable final Number oldValue, @NotNull final
10341035
FXUtils.removeFromParent(modelNodeTree, modelNodeTreeParent);
10351036
}
10361037

1037-
final int oldIndex = oldValue == null? -1 : oldValue.intValue();
1038+
final int oldIndex = oldValue == null ? -1 : oldValue.intValue();
10381039
final int newIndex = newValue.intValue();
10391040

10401041
if (newIndex == OBJECTS_TOOL) {
@@ -1132,7 +1133,7 @@ private void addNewModel(final @NotNull DragEvent dragEvent, @NotNull final Path
11321133
final AssetManager assetManager = EDITOR.getAssetManager();
11331134
final Spatial loadedModel = assetManager.loadModel(modelKey);
11341135

1135-
AssetLinkNode assetLinkNode = new AssetLinkNode(modelKey);
1136+
final AssetLinkNode assetLinkNode = new AssetLinkNode(modelKey);
11361137
assetLinkNode.attachLinkedChild(loadedModel, modelKey);
11371138
assetLinkNode.setUserData(LOADED_MODEL_KEY, true);
11381139

‎src/com/ss/editor/ui/control/model/node/spatial/AssetLinkNodeModelNode.java‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,11 @@
11
package com.ss.editor.ui.control.model.node.spatial;
22

3-
import com.jme3.asset.AssetManager;
43
import com.jme3.scene.AssetLinkNode;
54
import com.jme3.scene.Node;
6-
import com.jme3.scene.Spatial;
7-
import com.ss.editor.FileExtensions;
8-
import com.ss.editor.Messages;
9-
import com.ss.editor.model.undo.editor.ChangeConsumer;
105
import com.ss.editor.ui.Icons;
11-
import com.ss.editor.ui.control.model.tree.ModelNodeTree;
12-
import com.ss.editor.ui.control.model.tree.action.CreateNodeAction;
13-
import com.ss.editor.ui.control.model.tree.action.CreateSkyAction;
14-
import com.ss.editor.ui.control.model.tree.action.LoadModelAction;
15-
import com.ss.editor.ui.control.model.tree.action.OptimizeGeometryAction;
16-
import com.ss.editor.ui.control.model.tree.action.audio.CreateAudioNodeAction;
17-
import com.ss.editor.ui.control.model.tree.action.emitter.CreateTonegodEmitterAction;
18-
import com.ss.editor.ui.control.model.tree.action.emitter.CreateTonegodSoftEmitterAction;
19-
import com.ss.editor.ui.control.model.tree.action.geometry.CreateBoxAction;
20-
import com.ss.editor.ui.control.model.tree.action.geometry.CreateQuadAction;
21-
import com.ss.editor.ui.control.model.tree.action.geometry.CreateSphereAction;
22-
import com.ss.editor.ui.control.model.tree.action.light.CreateAmbientLightAction;
23-
import com.ss.editor.ui.control.model.tree.action.light.CreateDirectionLightAction;
24-
import com.ss.editor.ui.control.model.tree.action.light.CreatePointLightAction;
25-
import com.ss.editor.ui.control.model.tree.action.light.CreateSpotLightAction;
26-
import com.ss.editor.ui.control.model.tree.action.operation.AddChildOperation;
27-
import com.ss.editor.ui.control.model.tree.action.terrain.CreateTerrainAction;
28-
import com.ss.editor.ui.control.tree.AbstractNodeTree;
29-
import com.ss.editor.ui.control.tree.node.ModelNode;
30-
import com.ss.editor.ui.util.UIUtils;
31-
import com.ss.editor.util.GeomUtils;
32-
import com.ss.extension.scene.SceneLayer;
33-
import javafx.scene.control.Menu;
346
import javafx.scene.image.Image;
35-
import javafx.scene.image.ImageView;
36-
import javafx.scene.input.Dragboard;
377
import org.jetbrains.annotations.NotNull;
388
import org.jetbrains.annotations.Nullable;
39-
import rlib.util.array.Array;
40-
import rlib.util.array.ArrayFactory;
41-
42-
import java.nio.file.Path;
43-
import java.util.List;
44-
45-
import static com.ss.editor.control.transform.SceneEditorControl.LOADED_MODEL_KEY;
46-
import static com.ss.editor.ui.control.tree.node.ModelNodeFactory.createFor;
47-
import static com.ss.editor.util.EditorUtil.*;
48-
import static java.util.Objects.requireNonNull;
499

5010
/**
5111
* The implementation of the {@link SpatialModelNode} for representing the {@link Node} in the editor.

‎src/com/ss/editor/ui/control/model/tree/action/LinkModelAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected void processOpen(@NotNull final Path file) {
9393
final AssetManager assetManager = EDITOR.getAssetManager();
9494
final Spatial loadedModel = assetManager.loadModel(modelKey);
9595

96-
AssetLinkNode assetLinkNode = new AssetLinkNode(modelKey);
96+
final AssetLinkNode assetLinkNode = new AssetLinkNode(modelKey);
9797
assetLinkNode.attachLinkedChild(loadedModel, modelKey);
9898
assetLinkNode.setUserData(LOADED_MODEL_KEY, true);
9999

‎src/com/ss/editor/ui/control/tree/node/ModelNodeFactory.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.ss.editor.ui.control.tree.node;
22

3-
import static rlib.util.ClassUtils.unsafeCast;
43
import com.jme3.animation.*;
54
import com.jme3.audio.AudioNode;
65
import com.jme3.bullet.collision.shapes.*;
@@ -53,6 +52,8 @@
5352
import java.nio.Buffer;
5453
import java.util.concurrent.atomic.AtomicLong;
5554

55+
import static rlib.util.ClassUtils.unsafeCast;
56+
5657
/**
5758
* The factory to create the {@link ModelNode} of the element of {@link com.jme3.scene.Spatial}.
5859
*
@@ -171,7 +172,7 @@ public static <T, V extends ModelNode<T>> V createFor(@Nullable final T element)
171172
return unsafeCast(new AudioModelNode((AudioNode) element, objectId));
172173
} else if (element instanceof AssetLinkNode) {
173174
return unsafeCast(new AssetLinkNodeModelNode((AssetLinkNode) element, objectId));
174-
}else if (element instanceof Node) {
175+
} else if (element instanceof Node) {
175176
return unsafeCast(new NodeModelNode<>((Node) element, objectId));
176177
}
177178

0 commit comments

Comments
 (0)