мелкие доработки

JavaSaBr · JavaSaBr · commit 4c18896efad6 · 2016-03-16T22:12:03.000+03:00
diff --git a/resources/com/sun/javafx/scene/control/skin/resources/controls_ru.properties b/resources/com/sun/javafx/scene/control/skin/resources/controls_ru.properties
@@ -0,0 +1,28 @@
+# ProgressIndicator, the string that's displayed at 100%
+ProgressIndicator.doneString=Готово
+
+# ListView
+ListView.noContent=Нет содержимого
+
+# TableView
+TableView.noContent=Нет содержимого в таблице
+TableView.noColumns=Нет колонок в таблице
+# Note there is a space after the comma:
+TableView.nestedColumnControlMenuSeparator=,
+
+# TextField, PasswordField, TextArea
+# The keys must match the action strings in TextInputControlBehavior
+TextInputControl.menu.Undo=Отменить
+TextInputControl.menu.Redo=Повторить
+TextInputControl.menu.Cut=Вырезать
+TextInputControl.menu.Copy=Копировать
+TextInputControl.menu.Paste=Вставить
+TextInputControl.menu.DeleteSelection=Удалить
+TextInputControl.menu.SelectAll=Выделить все
+TextInputControl.menu.SelectWord=Выделить
+
+# DatePicker
+#
+# DatePicker context menu
+DatePicker.contextMenu.showToday=Показать сегодня
+DatePicker.contextMenu.showWeekNumbers=Показать номер недели
diff --git a/resources/messages/messages.properties b/resources/messages/messages.properties
@@ -149,4 +149,9 @@ GenerateTangentsDialogTitle=Generate tangents
 GenerateTangentsDialogAlgorithmLabel=Type algorithm
 GenerateTangentsDialogSplitMirrored=Split vertices with mirrored UVs
 GenerateTangentsDialogButtonOk=Generate
-GenerateTangentsDialogButtonCancel=Cancel
+GenerateTangentsDialogButtonCancel=Cancel
+
+BoundingVolumeModelPropertyControlName=Model size
+BoundingVolumeModelPropertyControlSphere=Sphere
+BoundingVolumeModelPropertyControlSphereRadius=radius
+BoundingVolumeModelPropertyControlBox=Box
diff --git a/resources/messages/messages_ru.properties b/resources/messages/messages_ru.properties
@@ -149,4 +149,9 @@ GenerateTangentsDialogTitle=Генерация тангентов
 GenerateTangentsDialogAlgorithmLabel=Тип алгоритма
 GenerateTangentsDialogSplitMirrored=Разделять вершины с зеркальным UVs
 GenerateTangentsDialogButtonOk=Сгенерировать
-GenerateTangentsDialogButtonCancel=Отмена
+GenerateTangentsDialogButtonCancel=Отмена
+
+BoundingVolumeModelPropertyControlName=Размер модели
+BoundingVolumeModelPropertyControlSphere=Сфера
+BoundingVolumeModelPropertyControlSphereRadius=радиус
+BoundingVolumeModelPropertyControlBox=Бокс
diff --git a/src/com/jme3/input/lwjgl/GlfwKeyInput.java b/src/com/jme3/input/lwjgl/GlfwKeyInput.java
@@ -78,6 +78,10 @@ public void initialize() {
             @Override
             public void invoke(long window, int key, int scancode, int action, int mods) {
 
+                if (key < 0 || key > GLFW_KEY_LAST) {
+                    return;
+                }
+
                 int jmeKey = GlfwKeyMap.toJmeKeyCode(key);
                 final KeyInputEvent evt = new KeyInputEvent(jmeKey, '\0', GLFW_PRESS == action, GLFW_REPEAT == action);
 
diff --git a/src/com/ss/editor/Messages.java b/src/com/ss/editor/Messages.java
@@ -1,7 +1,11 @@
 package com.ss.editor;
 
+import java.util.Locale;
+import java.util.Map;
 import java.util.ResourceBundle;
 
+import rlib.util.ReflectionUtils;
+
 /**
  * Набор констант с локализованными сообщениями.
  *
@@ -163,8 +167,23 @@ public class Messages {
     public static final String GENERATE_TANGENTS_DIALOG_BUTTON_OK;
     public static final String GENERATE_TANGENTS_DIALOG_BUTTON_CANCEL;
 
+    public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_NAME;
+    public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE;
+    public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE_RADIUS;
+    public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_BOX;
+
     static {
 
+        final Locale locale = Locale.getDefault();
+        final ClassLoader classLoader = com.sun.javafx.scene.control.skin.resources.ControlResources.class.getClassLoader();
+
+        final ResourceBundle controlBundle = ResourceBundle.getBundle("com/sun/javafx/scene/control/skin/resources/controls", locale, classLoader, ResourceControl.getInstance());
+        final ResourceBundle overrideBundle = ResourceBundle.getBundle("com/sun/javafx/scene/control/skin/resources/controls", ResourceControl.getInstance());
+
+        final Map override = ReflectionUtils.getFieldValue(overrideBundle, "lookup");
+        final Map original = ReflectionUtils.getFieldValue(controlBundle, "lookup");
+        original.putAll(override);
+
         final ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME, ResourceControl.getInstance());
 
         EDITOR_BAR_ASSET = bundle.getString("EditorBarComponent.asset");
@@ -318,5 +337,10 @@ public class Messages {
         GENERATE_TANGENTS_DIALOG_SPLIT_MIRRORED = bundle.getString("GenerateTangentsDialogSplitMirrored");
         GENERATE_TANGENTS_DIALOG_BUTTON_OK = bundle.getString("GenerateTangentsDialogButtonOk");
         GENERATE_TANGENTS_DIALOG_BUTTON_CANCEL = bundle.getString("GenerateTangentsDialogButtonCancel");
+
+        BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_NAME = bundle.getString("BoundingVolumeModelPropertyControlName");
+        BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE = bundle.getString("BoundingVolumeModelPropertyControlSphere");
+        BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE_RADIUS = bundle.getString("BoundingVolumeModelPropertyControlSphereRadius");
+        BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_BOX = bundle.getString("BoundingVolumeModelPropertyControlBox");
     }
 }
diff --git a/src/com/ss/editor/state/editor/impl/model/ModelEditorState.java b/src/com/ss/editor/state/editor/impl/model/ModelEditorState.java
@@ -428,6 +428,11 @@ public PickedAxis getPickedAxis() {
 
     @Override
     public Node getCollisionPlane() {
+
+        if (collisionPlane == null) {
+            throw new RuntimeException("collisionPlane is null");
+        }
+
         return collisionPlane;
     }
 
@@ -703,7 +708,7 @@ protected void updateTransformNode(final Transform transform) {
         final Camera camera = EDITOR.getCamera();
 
         final Vector3f location = transform.getTranslation();
-        final Vector3f resultPosition = location.subtract(camera.getLocation()).normalize().multLocal(camera.getFrustumNear() + 0.1f);
+        final Vector3f resultPosition = location.subtract(camera.getLocation()).normalize().multLocal(camera.getFrustumNear() + 0.4f);
 
         final Node transformToolNode = getTransformToolNode();
         transformToolNode.setLocalTranslation(camera.getLocation().add(resultPosition));
diff --git a/src/com/ss/editor/ui/component/editor/impl/material/MaterialColorsComponent.java b/src/com/ss/editor/ui/component/editor/impl/material/MaterialColorsComponent.java
@@ -7,14 +7,17 @@
 import com.ss.editor.Messages;
 import com.ss.editor.ui.control.material.ColorMaterialParamControl;
 
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.TitledPane;
 import javafx.scene.layout.VBox;
 import rlib.ui.util.FXUtils;
+import rlib.util.StringUtils;
 
 /**
  * Реализация компонента конфигурирования цветов материала.
@@ -68,7 +71,10 @@ public void buildFor(final Material material) {
 
         final MaterialDef materialDef = material.getMaterialDef();
 
-        final Collection<MatParam> materialParams = materialDef.getMaterialParams();
+        final List<MatParam> materialParams = new ArrayList<>(materialDef.getMaterialParams());
+
+        Collections.sort(materialParams, (first, second) -> StringUtils.compareIgnoreCase(first.getName(), second.getName()));
+
         materialParams.forEach(matParam -> buildFor(matParam, material));
     }
 
diff --git a/src/com/ss/editor/ui/component/editor/impl/material/MaterialOtherParamsComponent.java b/src/com/ss/editor/ui/component/editor/impl/material/MaterialOtherParamsComponent.java
@@ -10,14 +10,18 @@
 import com.ss.editor.ui.control.material.IntegerMaterialParamControl;
 import com.ss.editor.ui.control.material.MaterialParamControl;
 
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TitledPane;
 import javafx.scene.layout.VBox;
 import rlib.ui.util.FXUtils;
+import rlib.util.StringUtils;
 
 /**
  * Реализация компонента конфигурирования других параметров материала.
@@ -26,7 +30,7 @@
  */
 public class MaterialOtherParamsComponent extends TitledPane {
 
-    public static final Insets CONTROL_OFFSET = new Insets(3, 0, 0, 0);
+    public static final Insets CONTROL_OFFSET = new Insets(3, 0, 0, 4);
 
     /**
      * Обрбаотчик внесения изменений.
@@ -42,8 +46,10 @@ public MaterialOtherParamsComponent(final Runnable changeHandler) {
         this.changeHandler = changeHandler;
         this.container = new VBox();
         setText(Messages.MATERIAL_FILE_EDITOR_OTHER_COMPONENT_TITLE);
-        setContent(container);
+        setContent(new ScrollPane(container));
         setAnimated(false);
+
+        FXUtils.bindFixedWidth(container, widthProperty().subtract(10));
     }
 
     /**
@@ -71,7 +77,10 @@ public void buildFor(final Material material) {
 
         final MaterialDef materialDef = material.getMaterialDef();
 
-        final Collection<MatParam> materialParams = materialDef.getMaterialParams();
+        final List<MatParam> materialParams = new ArrayList<>(materialDef.getMaterialParams());
+
+        Collections.sort(materialParams, (first, second) -> StringUtils.compareIgnoreCase(first.getName(), second.getName()));
+
         materialParams.forEach(matParam -> buildFor(matParam, material));
     }
 
diff --git a/src/com/ss/editor/ui/component/editor/impl/material/MaterialTexturesComponent.java b/src/com/ss/editor/ui/component/editor/impl/material/MaterialTexturesComponent.java
@@ -7,14 +7,17 @@
 import com.ss.editor.Messages;
 import com.ss.editor.ui.control.material.Texture2DMaterialParamControl;
 
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.TitledPane;
 import javafx.scene.layout.VBox;
 import rlib.ui.util.FXUtils;
+import rlib.util.StringUtils;
 
 /**
  * Реализация компонента конфигурирования текстур материала.
@@ -68,7 +71,10 @@ public void buildFor(final Material material) {
 
         final MaterialDef materialDef = material.getMaterialDef();
 
-        final Collection<MatParam> materialParams = materialDef.getMaterialParams();
+        final List<MatParam> materialParams = new ArrayList<>(materialDef.getMaterialParams());
+
+        Collections.sort(materialParams, (first, second) -> StringUtils.compareIgnoreCase(first.getName(), second.getName()));
+
         materialParams.forEach(matParam -> buildFor(matParam, material));
     }
 
diff --git a/src/com/ss/editor/ui/component/editor/impl/model/ModelFileEditor.java b/src/com/ss/editor/ui/component/editor/impl/model/ModelFileEditor.java
@@ -684,8 +684,7 @@ public void notifyTransformed(final Spatial spatial) {
     private void notifyTransformedImpl(final Spatial spatial) {
 
         final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();
-        modelPropertyEditor.buildFor(null);
-        modelPropertyEditor.buildFor(spatial);
+        modelPropertyEditor.syncFor(spatial);
 
         changeHandler.run();
     }
diff --git a/src/com/ss/editor/ui/control/model/property/DefaultModelPropertyControl.java b/src/com/ss/editor/ui/control/model/property/DefaultModelPropertyControl.java
@@ -0,0 +1,73 @@
+package com.ss.editor.ui.control.model.property;
+
+import com.ss.editor.ui.css.CSSClasses;
+
+import java.util.function.Function;
+
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import rlib.ui.util.FXUtils;
+
+/**
+ * Реализация свойства отображения свойства объекта.
+ *
+ * @author Ronn
+ */
+public class DefaultModelPropertyControl<T> extends ModelPropertyControl<T> {
+
+    /**
+     * Надпись со значением свойства.
+     */
+    private Label propertyValueLabel;
+
+    /**
+     * Функция конвертации объекта в строку.
+     */
+    private Function<T, String> toStringFunction;
+
+    public DefaultModelPropertyControl(final Runnable changeHandler, final T element, final String paramName) {
+        super(changeHandler, element, paramName);
+    }
+
+    /**
+     * @param toStringFunction функция конвертации объекта в строку.
+     */
+    public void setToStringFunction(final Function<T, String> toStringFunction) {
+        this.toStringFunction = toStringFunction;
+    }
+
+    /**
+     * @return функция конвертации объекта в строку.
+     */
+    private Function<T, String> getToStringFunction() {
+        return toStringFunction;
+    }
+
+    /**
+     * @return надпись со значением свойства.
+     */
+    private Label getPropertyValueLabel() {
+        return propertyValueLabel;
+    }
+
+    @Override
+    protected void createComponents(final HBox container) {
+        super.createComponents(container);
+
+        propertyValueLabel = new Label();
+
+        FXUtils.addClassTo(propertyValueLabel, CSSClasses.MAIN_FONT_13);
+        FXUtils.addToPane(propertyValueLabel, container);
+        FXUtils.bindFixedWidth(propertyValueLabel, container.widthProperty());
+    }
+
+    @Override
+    protected void reload() {
+        super.reload();
+
+        final Function<T, String> func = getToStringFunction();
+
+        final Label propertyValueLabel = getPropertyValueLabel();
+        propertyValueLabel.setText(func == null ? String.valueOf(getElement()) : func.apply(getElement()));
+    }
+}
diff --git a/src/com/ss/editor/ui/control/model/property/ModelPropertyControl.java b/src/com/ss/editor/ui/control/model/property/ModelPropertyControl.java
@@ -41,6 +41,11 @@ public class ModelPropertyControl<T> extends VBox {
      */
     private Consumer<T> applyHandler;
 
+    /**
+     * Обработчик синхронизации данных.
+     */
+    private Consumer<T> syncHandler;
+
     /**
      * Надпись с названием параметра.
      */
@@ -75,11 +80,35 @@ public void setApplyHandler(final Consumer<T> applyHandler) {
         this.applyHandler = applyHandler;
     }
 
+    /**
+     * @param syncHandler обработчик синхронизации данных.
+     */
+    public void setSyncHandler(final Consumer<T> syncHandler) {
+        this.syncHandler = syncHandler;
+    }
+
     /**
      * Инициализация данных.
      */
     protected void reload() {
+    }
 
+    /**
+     * Синхронизирование данных.
+     */
+    public void sync() {
+        setIgnoreListener(true);
+        try {
+
+            if (syncHandler != null) {
+                syncHandler.accept(getElement());
+            }
+
+            reload();
+
+        } finally {
+            setIgnoreListener(false);
+        }
     }
 
     /**
diff --git a/src/com/ss/editor/ui/control/model/property/ModelPropertyEditor.java b/src/com/ss/editor/ui/control/model/property/ModelPropertyEditor.java
diff --git a/src/com/ss/editor/ui/control/model/property/PropertyBuilder.java b/src/com/ss/editor/ui/control/model/property/PropertyBuilder.java
diff --git a/src/com/ss/editor/ui/control/model/property/QuaternionModelPropertyControl.java b/src/com/ss/editor/ui/control/model/property/QuaternionModelPropertyControl.java
diff --git a/src/com/ss/editor/ui/dialog/model/GenerateTangentsDialog.java b/src/com/ss/editor/ui/dialog/model/GenerateTangentsDialog.java
diff --git a/src/com/ss/editor/util/EditorUtil.java b/src/com/ss/editor/util/EditorUtil.java

Original file line number	Diff line number	Diff line change
`@@ -684,8 +684,7 @@ public void notifyTransformed(final Spatial spatial) {`
`684`	`684`	`private void notifyTransformedImpl(final Spatial spatial) {`
`685`	`685`
`686`	`686`	`final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();`
`687`		`- modelPropertyEditor.buildFor(null);`
`688`		`- modelPropertyEditor.buildFor(spatial);`
	`687`	`+ modelPropertyEditor.syncFor(spatial);`
`689`	`688`
`690`	`689`	`changeHandler.run();`
`691`	`690`	`}`