Реализация редактирования свойств и действий над структурой дерева.

Author: JavaSaBr

resources/messages/messages.properties

@@ -76,4 +76,20 @@ ModelFileEditorNoSky=No sky
 ModelFileEditorFastSky=Fast sky
 ModelFileEditorNodeTree=Structure
 ModelFileEditorProperties=Properties
-ModelFileEditorNodeMesh=Mesh
+ModelFileEditorNodeMesh=Mesh
+
+ModelNodeTreeActionMikktspaceTangentGenerator=Generate tangents
+ModelNodeTreeActionRemove=Remove
+ModelNodeTreeActionRename=Rename
+ModelNodeTreeActionOptimizeGeometry=Optimize geometry
+ModelNodeTreeActionTools=Tools
+
+ModelPropertyCullHint=Cull Hint
+ModelPropertyShadowMode=Shadow mode
+ModelPropertyQueueBucket=Queue bucket
+ModelPropertyLocation=Location
+ModelPropertyScale=Scale
+ModelPropertyRotation=Rotation
+ModelPropertyMaterial=Material
+
+MaterialModelPropertyControlNoMaterial=No material

resources/messages/messages_ru.properties

@@ -77,3 +77,19 @@ ModelFileEditorFastSky=Быстрый фон
 ModelFileEditorNodeTree=Структура
 ModelFileEditorProperties=Свойства
 ModelFileEditorNodeMesh=Сетка
+
+ModelNodeTreeActionMikktspaceTangentGenerator=Сгенерировать тангенты
+ModelNodeTreeActionRemove=Удалить
+ModelNodeTreeActionRename=Переименовать
+ModelNodeTreeActionOptimizeGeometry=Оптимизировать геометрию
+ModelNodeTreeActionTools=Инструменты
+
+ModelPropertyCullHint=Cull Hint
+ModelPropertyShadowMode=Режим теней
+ModelPropertyQueueBucket=Порядок рендера
+ModelPropertyLocation=Положение
+ModelPropertyScale=Маштаб
+ModelPropertyRotation=Вращение
+ModelPropertyMaterial=Материал
+
+MaterialModelPropertyControlNoMaterial=Материал отсутствует

resources/ui/css/custom_classes.css

@@ -49,15 +49,15 @@
     -fx-background-color: transparent;
     -fx-background-insets: 0;
     -fx-border-color: transparent;
-    -fx-padding: 0;
+    -fx-padding: -5;
     -fx-effect: null;
 }
 
 .transparent-tree-view:focused {
     -fx-background-color: transparent;
     -fx-background-insets: 0;
     -fx-border-color: transparent;
-    -fx-padding: 0;
+    -fx-padding: -5;
     -fx-effect: null;
 }
 
@@ -114,8 +114,6 @@
     -fx-border-width: 0;
 }
 
-
-
 /* Transparent TreeCell */
 
 .transparent-tree-cell {
@@ -230,4 +228,8 @@
 
 .material-param-control {
     -fx-alignment: center-left;
+}
+
+.model-param-control {
+    -fx-alignment: center-left;
 }

resources/ui/css/custom_ids.css

@@ -310,4 +310,68 @@
     -fx-pref-height: -fx-min-height;
     -fx-max-height: -fx-min-height;
     -fx-background: -fx-color-A200;
+}
+
+#ModelParamControlSplitLine {
+    -fx-stroke: -fx-color-500;
+    -fx-stroke-width: 2;
+}
+
+#ModelParamControlParamName {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-alignment: center;
+    -fx-text-alignment: center;
+}
+
+#ModelParamControlParamNameSingleRow {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 140;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+    -fx-alignment: center-right;
+}
+
+#ModelParamControlNumberLabel {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+}
+
+#ModelParamControlNumberField {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 50;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+}
+
+#ModelParamControlComboBox {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+}
+
+#ModelParamControlMaterialLabel {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 225;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+    -fx-alignment: center-left;
+    -fx-text-alignment: left;
+}
+
+#ModelParamControlMaterialButton {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 24;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
 }

resources/ui/icons/actions/16/edit.png

@@ -268,9 +268,11 @@ public void simpleInitApp() {
         InitializeManager.register(FileIconManager.class);
         InitializeManager.initialize();
 
-        environmentCamera = new EnvironmentCamera(64, new Vector3f(0, 0, 0));
+        if(Config.ENABLE_PBR) {
+            environmentCamera = new EnvironmentCamera(64, new Vector3f(0, 0, 0));
+            stateManager.attach(environmentCamera);
+        }
 
-        stateManager.attach(environmentCamera);
         fxContainer = JmeFxContainer.install(this, guiNode, true, cursorDisplayProvider);
         scene = EditorFXSceneBuilder.build(fxContainer);
 
@@ -337,6 +339,7 @@ public void update() {
             System.exit(1);
         } catch (final IllegalStateException e) {
             LOGGER.warning(e);
+            System.exit(0);
         } finally {
             syncUnlock(stamp);
         }
@@ -359,6 +362,10 @@ private void createProbe() {
 
         final EnvironmentCamera environmentCamera = getEnvironmentCamera();
 
+        if(environmentCamera == null) {
+            return;
+        }
+
         if (environmentCamera.getApplication() == null) {
             final EditorThreadExecutor gameThreadExecutor = EditorThreadExecutor.getInstance();
             gameThreadExecutor.addToExecute(this::createProbe);
@@ -373,7 +380,15 @@ private void createProbe() {
      * Обновить пробу окружения.
      */
     public void updateProbe(final JobProgressAdapter<LightProbe> progressAdapter) {
-        LightProbeFactory.updateProbe(getLightProbe(), getEnvironmentCamera(), rootNode, progressAdapter);
+
+        final LightProbe lightProbe = getLightProbe();
+
+        if(lightProbe == null) {
+            progressAdapter.done(null);
+            return;
+        }
+
+        LightProbeFactory.updateProbe(lightProbe, getEnvironmentCamera(), rootNode, progressAdapter);
     }
 
     /**

resources/ui/icons/actions/24/edit.png

@@ -90,6 +90,22 @@ public class Messages {
     public static final String MODEL_FILE_EDITOR_PROPERTIES;
     public static final String MODEL_FILE_EDITOR_NODE_MESH;
 
+    public static final String MODEL_NODE_TREE_ACTION_MIKKTSPACE_TANGENT_GENERATOR;
+    public static final String MODEL_NODE_TREE_ACTION_REMOVE;
+    public static final String MODEL_NODE_TREE_ACTION_RENAME;
+    public static final String MODEL_NODE_TREE_ACTION_OPTIMIZE_GEOMETRY;
+    public static final String MODEL_NODE_TREE_ACTION_TOOLS;
+
+    public static final String MODEL_PROPERTY_CULL_HINT;
+    public static final String MODEL_PROPERTY_SHADOW_MODE;
+    public static final String MODEL_PROPERTY_QUEUE_BUCKET;
+    public static final String MODEL_PROPERTY_LOCATION;
+    public static final String MODEL_PROPERTY_SCALE;
+    public static final String MODEL_PROPERTY_ROTATION;
+    public static final String MODEL_PROPERTY_MATERIAL;
+
+    public static final String MATERIAL_MODEL_PROPERTY_CONTROL_NO_MATERIAL;
+
     static {
 
         final ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME, ResourceControl.getInstance());
@@ -173,5 +189,21 @@ public class Messages {
         MODEL_FILE_EDITOR_NODE_TREE = bundle.getString("ModelFileEditorNodeTree");
         MODEL_FILE_EDITOR_PROPERTIES = bundle.getString("ModelFileEditorProperties");
         MODEL_FILE_EDITOR_NODE_MESH = bundle.getString("ModelFileEditorNodeMesh");
+
+        MODEL_NODE_TREE_ACTION_MIKKTSPACE_TANGENT_GENERATOR = bundle.getString("ModelNodeTreeActionMikktspaceTangentGenerator");
+        MODEL_NODE_TREE_ACTION_REMOVE = bundle.getString("ModelNodeTreeActionRemove");
+        MODEL_NODE_TREE_ACTION_RENAME = bundle.getString("ModelNodeTreeActionRename");
+        MODEL_NODE_TREE_ACTION_OPTIMIZE_GEOMETRY = bundle.getString("ModelNodeTreeActionOptimizeGeometry");
+        MODEL_NODE_TREE_ACTION_TOOLS = bundle.getString("ModelNodeTreeActionTools");
+
+        MODEL_PROPERTY_CULL_HINT = bundle.getString("ModelPropertyCullHint");
+        MODEL_PROPERTY_SHADOW_MODE = bundle.getString("ModelPropertyShadowMode");
+        MODEL_PROPERTY_QUEUE_BUCKET = bundle.getString("ModelPropertyQueueBucket");
+        MODEL_PROPERTY_LOCATION = bundle.getString("ModelPropertyLocation");
+        MODEL_PROPERTY_SCALE = bundle.getString("ModelPropertyScale");
+        MODEL_PROPERTY_ROTATION = bundle.getString("ModelPropertyRotation");
+        MODEL_PROPERTY_MATERIAL = bundle.getString("ModelPropertyMaterial");
+
+        MATERIAL_MODEL_PROPERTY_CONTROL_NO_MATERIAL = bundle.getString("MaterialModelPropertyControlNoMaterial");
     }
 }

src/com/ss/editor/Editor.java

@@ -29,11 +29,17 @@ public abstract class Config {
      */
     public static final boolean DEV_DEBUG;
 
+    /**
+     * Активация PBR.
+     */
+    public static final boolean ENABLE_PBR;
+
     static {
 
         final VarTable vars = new DocumentConfig(EditorUtil.getInputStream(CONFIG_RESOURCE_PATH)).parse();
 
         DEV_DEBUG = vars.getBoolean("Dev.debug", false);
+        ENABLE_PBR = vars.getBoolean("Graphics.enablePBR", false);
 
         PROJECT_PATH = Util.getRootFolderFromClass(Editor.class).toString();
     }

src/com/ss/editor/Messages.java

@@ -19,6 +19,7 @@ public interface Icons {
     public static final Image NODE_16 = ICON_MANAGER.getImage("/ui/icons/actions/16/node.png");
     public static final Image GEOMETRY_16 = ICON_MANAGER.getImage("/ui/icons/actions/16/geometry.png");
     public static final Image MESH_16 = ICON_MANAGER.getImage("/ui/icons/actions/16/mesh.png");
+    public static final Image EDIT_16 = ICON_MANAGER.getImage("/ui/icons/actions/16/edit.png");
 
     public static final Image REFRESH_18 = ICON_MANAGER.getImage("/ui/icons/actions/18/refresh.png");
     public static final Image REMOVE_18 = ICON_MANAGER.getImage("/ui/icons/actions/18/remove.png");
@@ -33,6 +34,7 @@ public interface Icons {
     public static final Image PLANE_24 = ICON_MANAGER.getImage("/ui/icons/actions/24/plane.png");
     public static final Image ADD_CIRCLE_24 = ICON_MANAGER.getImage("/ui/icons/actions/24/add_circle.png");
     public static final Image IMAGE_24 = ICON_MANAGER.getImage("/ui/icons/actions/24/image.png");
+    public static final Image EDIT_24 = ICON_MANAGER.getImage("/ui/icons/actions/24/edit.png");
 
     public static final Image IMAGE_512 = ICON_MANAGER.getImage("/ui/icons/512/image.png");
 }