Implemented a dialog to creatre a custom control,

JavaSaBr · JavaSaBr · commit d27570cb24ee · 2017-01-27T07:22:34.000+03:00
added an example of an editable control.
diff --git a/jme3-spaceshift-extension/src/com/ss/extension/scene/control/EditableControl.java b/jme3-spaceshift-extension/src/com/ss/extension/scene/control/EditableControl.java
@@ -17,6 +17,13 @@ public interface EditableControl extends Control {
 
     Array<EditableProperty<?, ?>> EMPTY_PROPERTIES = ArrayFactory.newArray(EditableProperty.class);
 
+    /**
+     * @return the control's name.
+     */
+    default String getName() {
+        return getClass().getSimpleName();
+    }
+
     /**
      * Get list of editable properties.
      *
diff --git a/jme3-spaceshift-extension/src/com/ss/extension/scene/control/impl/EditableBillboardControl.java b/jme3-spaceshift-extension/src/com/ss/extension/scene/control/impl/EditableBillboardControl.java
@@ -0,0 +1,37 @@
+package com.ss.extension.scene.control.impl;
+
+import com.jme3.scene.control.BillboardControl;
+import com.ss.extension.property.EditableProperty;
+import com.ss.extension.property.EditablePropertyType;
+import com.ss.extension.property.SimpleProperty;
+import com.ss.extension.scene.control.EditableControl;
+
+import org.jetbrains.annotations.NotNull;
+
+import rlib.util.array.Array;
+import rlib.util.array.ArrayFactory;
+
+/**
+ * The editable implementation of the {@link BillboardControl}.
+ *
+ * @author JavaSaBr
+ */
+public class EditableBillboardControl extends BillboardControl implements EditableControl {
+
+    @Override
+    public String getName() {
+        return "Billboard";
+    }
+
+    @NotNull
+    @Override
+    public Array<EditableProperty<?, ?>> getEditableProperties() {
+
+        final Array<EditableProperty<?, ?>> result = ArrayFactory.newArray(EditableProperty.class);
+
+        result.add(new SimpleProperty<>(EditablePropertyType.ENUM, "Alignment", this,
+                BillboardControl::getAlignment, BillboardControl::setAlignment));
+
+        return result;
+    }
+}
diff --git a/libs/extensions/jme3-spaceshift-extension-sources.jar b/libs/extensions/jme3-spaceshift-extension-sources.jar
diff --git a/libs/extensions/jme3-spaceshift-extension.jar b/libs/extensions/jme3-spaceshift-extension.jar
diff --git a/resources/messages/messages.properties b/resources/messages/messages.properties
@@ -184,6 +184,7 @@ ModelNodeTreeActionAddControl=Control
 ModelNodeTreeActionAddControlRigidBody=Rigid body
 ModelNodeTreeActionAddControlMotion=Motion
 ModelNodeTreeActionAddControlCharacter=Character
+ModelNodeTreeActionAddControlCustom=Custom
 
 ModelPropertyCullHint=Cull Hint
 ModelPropertyShadowMode=Shadow mode
@@ -409,4 +410,9 @@ AddUserDataDialogName=Name
 AddUserDataDialogDataType=Data type
 AddUserDataDialogButtonOk=Add
 
+CreateCustomControlDialogTitle=Add new custom control
+CreateCustomControlDialogBuiltIn=Built in
+CreateCustomControlDialogCustomBox=Custom
+CreateCustomControlDialogCustomField=Class full name
+
 AnalyticsConfirmDialogMessage=Do you allow to activate Google Analytics for this editor? It helps us to improve a quality of this editor.
diff --git a/resources/messages/messages_ru.properties b/resources/messages/messages_ru.properties
@@ -184,6 +184,7 @@ ModelNodeTreeActionAddControl=Контрол
 ModelNodeTreeActionAddControlRigidBody=Твердое тело
 ModelNodeTreeActionAddControlMotion=Движение
 ModelNodeTreeActionAddControlCharacter=Персонаж
+ModelNodeTreeActionAddControlCustom=Пользовательский
 
 ModelPropertyCullHint=Cull Hint
 ModelPropertyShadowMode=Режим теней
@@ -409,4 +410,9 @@ AddUserDataDialogName=Название
 AddUserDataDialogDataType=Тип данных
 AddUserDataDialogButtonOk=Добавить
 
+CreateCustomControlDialogTitle=Добавление нового польз. контрола
+CreateCustomControlDialogBuiltIn=Встроенные
+CreateCustomControlDialogCustomBox=Свой
+CreateCustomControlDialogCustomField=Полное название класса
+
 AnalyticsConfirmDialogMessage=Разрешите ли вы активировать Google аналитику для этого редактора? Это поможет нам улучшить качество редактора.
diff --git a/src/com/ss/editor/Messages.java b/src/com/ss/editor/Messages.java
@@ -201,6 +201,7 @@ public class Messages {
     public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_RIGID_BODY;
     public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_NOTION;
     public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_CHARACTER;
+    public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_CUSTOM;
 
     public static final String MODEL_PROPERTY_CULL_HINT;
     public static final String MODEL_PROPERTY_SHADOW_MODE;
@@ -426,6 +427,11 @@ public class Messages {
     public static final String ADD_USER_DATA_DIALOG_DATA_TYPE;
     public static final String ADD_USER_DATA_DIALOG_BUTTON_OK;
 
+    public static final String CREATE_CUSTOM_CONTROL_DIALOG_TITLE;
+    public static final String CREATE_CUSTOM_CONTROL_DIALOG_BUILT_IN;
+    public static final String CREATE_CUSTOM_CONTROL_DIALOG_CUSTOM_BOX;
+    public static final String CREATE_CUSTOM_CONTROL_DIALOG_CUSTOM_FIELD;
+
     public static final String ANALYTICS_CONFIRM_DIALOG_MESSAGE;
 
     static {
@@ -631,6 +637,7 @@ public class Messages {
         MODEL_NODE_TREE_ACTION_ADD_CONTROL_RIGID_BODY = bundle.getString("ModelNodeTreeActionAddControlRigidBody");
         MODEL_NODE_TREE_ACTION_ADD_CONTROL_NOTION = bundle.getString("ModelNodeTreeActionAddControlMotion");
         MODEL_NODE_TREE_ACTION_ADD_CONTROL_CHARACTER = bundle.getString("ModelNodeTreeActionAddControlCharacter");
+        MODEL_NODE_TREE_ACTION_ADD_CONTROL_CUSTOM = bundle.getString("ModelNodeTreeActionAddControlCustom");
 
         MODEL_PROPERTY_CULL_HINT = bundle.getString("ModelPropertyCullHint");
         MODEL_PROPERTY_SHADOW_MODE = bundle.getString("ModelPropertyShadowMode");
@@ -856,6 +863,11 @@ public class Messages {
         ADD_USER_DATA_DIALOG_DATA_TYPE = bundle.getString("AddUserDataDialogDataType");
         ADD_USER_DATA_DIALOG_BUTTON_OK = bundle.getString("AddUserDataDialogButtonOk");
 
+        CREATE_CUSTOM_CONTROL_DIALOG_TITLE = bundle.getString("CreateCustomControlDialogTitle");
+        CREATE_CUSTOM_CONTROL_DIALOG_BUILT_IN = bundle.getString("CreateCustomControlDialogBuiltIn");
+        CREATE_CUSTOM_CONTROL_DIALOG_CUSTOM_BOX = bundle.getString("CreateCustomControlDialogCustomBox");
+        CREATE_CUSTOM_CONTROL_DIALOG_CUSTOM_FIELD = bundle.getString("CreateCustomControlDialogCustomField");
+
         ANALYTICS_CONFIRM_DIALOG_MESSAGE = bundle.getString("AnalyticsConfirmDialogMessage");
     }
 }
diff --git a/src/com/ss/editor/ui/control/model/node/control/ControlModelNode.java b/src/com/ss/editor/ui/control/model/node/control/ControlModelNode.java
@@ -5,6 +5,7 @@
 import com.ss.editor.ui.control.model.tree.action.RemoveControlAction;
 import com.ss.editor.ui.control.tree.AbstractNodeTree;
 import com.ss.editor.ui.control.tree.node.ModelNode;
+import com.ss.extension.scene.control.EditableControl;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -39,6 +40,13 @@ public Image getIcon() {
     @NotNull
     @Override
     public String getName() {
-        return getElement().getClass().getSimpleName();
+
+        final T element = getElement();
+
+        if (element instanceof EditableControl) {
+            return ((EditableControl) element).getName();
+        }
+
+        return element.getClass().getSimpleName();
     }
 }
diff --git a/src/com/ss/editor/ui/control/model/node/spatial/SpatialModelNode.java b/src/com/ss/editor/ui/control/model/node/spatial/SpatialModelNode.java
@@ -18,6 +18,7 @@
 import com.ss.editor.ui.control.model.tree.action.RemoveNodeAction;
 import com.ss.editor.ui.control.model.tree.action.RenameNodeAction;
 import com.ss.editor.ui.control.model.tree.action.control.CreateCharacterAction;
+import com.ss.editor.ui.control.model.tree.action.control.CreateCustomControlAction;
 import com.ss.editor.ui.control.model.tree.action.control.CreateMotionControlAction;
 import com.ss.editor.ui.control.model.tree.action.control.CreateRigidBodyControlAction;
 import com.ss.editor.ui.control.model.tree.action.operation.RenameNodeOperation;
@@ -66,7 +67,8 @@ protected Menu createCreationMenu(@NotNull final AbstractNodeTree<?> nodeTree) {
         final Menu menu = new Menu(Messages.MODEL_NODE_TREE_ACTION_CREATE, new ImageView(Icons.ADD_18));
 
         final Menu createControlsMenu = new Menu(Messages.MODEL_NODE_TREE_ACTION_ADD_CONTROL, new ImageView(Icons.ADD_18));
-        createControlsMenu.getItems().addAll(new CreateRigidBodyControlAction(nodeTree, this),
+        createControlsMenu.getItems().addAll(new CreateCustomControlAction(nodeTree, this),
+                new CreateRigidBodyControlAction(nodeTree, this),
                 new CreateMotionControlAction(nodeTree, this),
                 new CreateCharacterAction(nodeTree, this));
 
diff --git a/src/com/ss/editor/ui/control/model/property/builder/impl/EditableControlPropertyBuilder.java b/src/com/ss/editor/ui/control/model/property/builder/impl/EditableControlPropertyBuilder.java
@@ -4,7 +4,6 @@
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
-import com.ss.editor.model.undo.editor.SceneChangeConsumer;
 import com.ss.editor.ui.control.model.property.control.BooleanModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.ColorModelPropertyControl;
 import com.ss.editor.ui.control.model.property.control.EnumControlPropertyControl;
@@ -34,7 +33,7 @@
  *
  * @author JavaSaBr
  */
-public class EditableControlPropertyBuilder extends AbstractPropertyBuilder<SceneChangeConsumer> {
+public class EditableControlPropertyBuilder extends AbstractPropertyBuilder<ModelChangeConsumer> {
 
     private static final EditableControlPropertyBuilder INSTANCE = new EditableControlPropertyBuilder();
 
@@ -43,12 +42,12 @@ public static EditableControlPropertyBuilder getInstance() {
     }
 
     protected EditableControlPropertyBuilder() {
-        super(SceneChangeConsumer.class);
+        super(ModelChangeConsumer.class);
     }
 
     @Override
     protected void buildForImpl(@NotNull final Object object, @Nullable final Object parent, @NotNull final VBox container,
-                                @NotNull final SceneChangeConsumer changeConsumer) {
+                                @NotNull final ModelChangeConsumer changeConsumer) {
 
         if (!(object instanceof EditableControl)) return;
 
diff --git a/src/com/ss/editor/ui/control/model/tree/action/control/AbstractCreateControlAction.java b/src/com/ss/editor/ui/control/model/tree/action/control/AbstractCreateControlAction.java
@@ -2,8 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 
-import com.jme3.asset.AssetManager;
-import com.jme3.scene.Node;
+import com.jme3.scene.Spatial;
 import com.jme3.scene.control.Control;
 import com.ss.editor.model.undo.editor.ModelChangeConsumer;
 import com.ss.editor.ui.control.model.tree.action.AbstractNodeAction;
@@ -28,14 +27,12 @@ public AbstractCreateControlAction(@NotNull final AbstractNodeTree<?> nodeTree,
     protected void process() {
 
         final AbstractNodeTree<ModelChangeConsumer> nodeTree = getNodeTree();
-        final ModelChangeConsumer consumer = requireNonNull(nodeTree.getChangeConsumer());
-        final AssetManager assetManager = EDITOR.getAssetManager();
-
         final Control control = createControl();
 
         final ModelNode<?> modelNode = getNode();
-        final Node parent = (Node) modelNode.getElement();
+        final Spatial parent = (Spatial) modelNode.getElement();
 
+        final ModelChangeConsumer consumer = requireNonNull(nodeTree.getChangeConsumer());
         consumer.execute(new AddControlOperation(control, parent));
     }
 
diff --git a/src/com/ss/editor/ui/control/model/tree/action/control/CreateCustomControlAction.java b/src/com/ss/editor/ui/control/model/tree/action/control/CreateCustomControlAction.java
@@ -0,0 +1,57 @@
+package com.ss.editor.ui.control.model.tree.action.control;
+
+import static java.util.Objects.requireNonNull;
+
+import com.jme3.scene.Spatial;
+import com.jme3.scene.control.Control;
+import com.ss.editor.Messages;
+import com.ss.editor.model.undo.editor.ModelChangeConsumer;
+import com.ss.editor.ui.Icons;
+import com.ss.editor.ui.control.model.tree.action.AbstractNodeAction;
+import com.ss.editor.ui.control.model.tree.dialog.CreateCustomControlDialog;
+import com.ss.editor.ui.control.tree.AbstractNodeTree;
+import com.ss.editor.ui.control.tree.node.ModelNode;
+import com.ss.editor.ui.scene.EditorFXScene;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javafx.scene.image.Image;
+
+/**
+ * The action to create a {@link Control}.
+ *
+ * @author JavaSaBr
+ */
+public class CreateCustomControlAction extends AbstractNodeAction<ModelChangeConsumer> {
+
+    public CreateCustomControlAction(@NotNull final AbstractNodeTree<?> nodeTree, @NotNull final ModelNode<?> node) {
+        super(nodeTree, node);
+    }
+
+    @Nullable
+    @Override
+    protected Image getIcon() {
+        return Icons.GEAR_16;
+    }
+
+    @NotNull
+    @Override
+    protected String getName() {
+        return Messages.MODEL_NODE_TREE_ACTION_ADD_CONTROL_CUSTOM;
+    }
+
+    @Override
+    protected void process() {
+
+        final AbstractNodeTree<ModelChangeConsumer> nodeTree = getNodeTree();
+        final ModelChangeConsumer consumer = requireNonNull(nodeTree.getChangeConsumer());
+
+        final ModelNode<?> modelNode = getNode();
+        final Spatial parent = (Spatial) modelNode.getElement();
+
+        final EditorFXScene scene = JFX_APPLICATION.getScene();
+        final CreateCustomControlDialog dialog = new CreateCustomControlDialog(consumer, parent);
+        dialog.show(scene.getWindow());
+    }
+}
diff --git a/src/com/ss/editor/ui/control/model/tree/dialog/CreateCustomControlDialog.java b/src/com/ss/editor/ui/control/model/tree/dialog/CreateCustomControlDialog.java
diff --git a/src/com/ss/editor/ui/control/property/builder/PropertyBuilderFactory.java b/src/com/ss/editor/ui/control/property/builder/PropertyBuilderFactory.java
diff --git a/src/com/ss/editor/ui/dialog/EditorDialog.java b/src/com/ss/editor/ui/dialog/EditorDialog.java
