обновление генерации тангентов

Author: JavaSaBr

resources/messages/messages.properties

@@ -84,7 +84,6 @@ ModelFileEditorNodeTree=Structure
 ModelFileEditorProperties=Properties
 ModelFileEditorNodeMesh=Mesh
 
-ModelNodeTreeActionMikktspaceTangentGenerator=Generate tangents using Mikktspace algorithm
 ModelNodeTreeActionRemove=Remove
 ModelNodeTreeActionRename=Rename
 ModelNodeTreeActionOptimizeGeometry=Optimize geometry
@@ -97,7 +96,7 @@ ModelNodeTreeActionCreatePrimitiveBox=Box
 ModelNodeTreeActionCreatePrimitiveSphere=Sphere
 ModelNodeTreeActionCreatePrimitiveQuad=Quad
 ModelNodeTreeActionLoadModel=Load model
-ModelNodeTreeActionTangentGenerator=Generate tangents using normal algorithm
+ModelNodeTreeActionTangentGenerator=Generate tangents
 
 ModelPropertyCullHint=Cull Hint
 ModelPropertyShadowMode=Shadow mode
@@ -144,4 +143,10 @@ CreateSkyDialogBottomLabel=Bottom texture
 EmptyModelCreatorDescription=New model
 EmptyModelCreatorTitle=Create new model
 
-GLSLFileEditorName=GLSL редактор
+GLSLFileEditorName=GLSL редактор
+
+GenerateTangentsDialogTitle=Generate tangents
+GenerateTangentsDialogAlgorithmLabel=Type algorithm
+GenerateTangentsDialogSplitMirrored=Split vertices with mirrored UVs
+GenerateTangentsDialogButtonOk=Generate
+GenerateTangentsDialogButtonCancel=Cancel

resources/messages/messages_ru.properties

@@ -84,7 +84,6 @@ ModelFileEditorNodeTree=Структура
 ModelFileEditorProperties=Свойства
 ModelFileEditorNodeMesh=Сетка
 
-ModelNodeTreeActionMikktspaceTangentGenerator=Сгенерировать тангенты используя алгоритм Mikktspace
 ModelNodeTreeActionRemove=Удалить
 ModelNodeTreeActionRename=Переименовать
 ModelNodeTreeActionOptimizeGeometry=Оптимизировать геометрию
@@ -97,7 +96,7 @@ ModelNodeTreeActionCreatePrimitiveBox=Куб
 ModelNodeTreeActionCreatePrimitiveSphere=Сфера
 ModelNodeTreeActionCreatePrimitiveQuad=Плоскость
 ModelNodeTreeActionLoadModel=Загрузить модель
-ModelNodeTreeActionTangentGenerator=Сгенерировать тангенты используя обычный алгоритм
+ModelNodeTreeActionTangentGenerator=Сгенерировать тангенты
 
 ModelPropertyCullHint=Cull Hint
 ModelPropertyShadowMode=Режим теней
@@ -144,4 +143,10 @@ CreateSkyDialogBottomLabel=Нижняя текстура
 EmptyModelCreatorDescription=Новая модель
 EmptyModelCreatorTitle=Создание новой модели
 
-GLSLFileEditorName=GLSL editor
+GLSLFileEditorName=GLSL editor
+
+GenerateTangentsDialogTitle=Генерация тангентов
+GenerateTangentsDialogAlgorithmLabel=Тип алгоритма
+GenerateTangentsDialogSplitMirrored=Разделять вершины с зеркальным UVs
+GenerateTangentsDialogButtonOk=Сгенерировать
+GenerateTangentsDialogButtonCancel=Отмена

resources/ui/css/custom_ids.css

@@ -484,4 +484,23 @@
     -fx-min-width: 24;
     -fx-pref-width: -fx-min-width;
     -fx-max-width: -fx-min-width;
+}
+
+#GenerateTangentsDialogLabel {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 200;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
+    -fx-alignment: center-right;
+}
+
+#GenerateTangentsDialogComboBox {
+    -fx-min-height: 24;
+    -fx-pref-height: -fx-min-height;
+    -fx-max-height: -fx-min-height;
+    -fx-min-width: 350;
+    -fx-pref-width: -fx-min-width;
+    -fx-max-width: -fx-min-width;
 }

src/com/ss/editor/Messages.java

@@ -96,7 +96,6 @@ 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;
@@ -157,7 +156,12 @@ public class Messages {
     public static final String EMPTY_MODEL_CREATOR_TITLE;
 
     public static final String GLSL_FILE_EDITOR_NAME;
-    ;
+
+    public static final String GENERATE_TANGENTS_DIALOG_SPLIT_MIRRORED;
+    public static final String GENERATE_TANGENTS_DIALOG_ALGORITHM_LABEL;
+    public static final String GENERATE_TANGENTS_DIALOG_TITLE;
+    public static final String GENERATE_TANGENTS_DIALOG_BUTTON_OK;
+    public static final String GENERATE_TANGENTS_DIALOG_BUTTON_CANCEL;
 
     static {
 
@@ -248,7 +252,6 @@ public class Messages {
         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");
@@ -309,5 +312,11 @@ public class Messages {
         EMPTY_MODEL_CREATOR_TITLE = bundle.getString("EmptyModelCreatorTitle");
 
         GLSL_FILE_EDITOR_NAME = bundle.getString("GLSLFileEditorName");
+
+        GENERATE_TANGENTS_DIALOG_TITLE = bundle.getString("GenerateTangentsDialogTitle");
+        GENERATE_TANGENTS_DIALOG_ALGORITHM_LABEL = bundle.getString("GenerateTangentsDialogAlgorithmLabel");
+        GENERATE_TANGENTS_DIALOG_SPLIT_MIRRORED = bundle.getString("GenerateTangentsDialogSplitMirrored");
+        GENERATE_TANGENTS_DIALOG_BUTTON_OK = bundle.getString("GenerateTangentsDialogButtonOk");
+        GENERATE_TANGENTS_DIALOG_BUTTON_CANCEL = bundle.getString("GenerateTangentsDialogButtonCancel");
     }
 }

src/com/ss/editor/state/editor/impl/model/ModelEditorState.java

@@ -203,8 +203,8 @@ public ModelEditorState(final ModelFileEditor fileEditor) {
         stateNode.attachChild(getCameraNode());
         stateNode.attachChild(getCustomSkyNode());
 
-        createToolElements();
         createCollisionPlane();
+        createToolElements();
         createManipulators();
 
         final EditorCamera editorCamera = getEditorCamera();

src/com/ss/editor/ui/component/editor/impl/model/ModelFileEditor.java

@@ -682,8 +682,11 @@ public void notifyTransformed(final Spatial spatial) {
     }
 
     private void notifyTransformedImpl(final Spatial spatial) {
+
         final ModelPropertyEditor modelPropertyEditor = getModelPropertyEditor();
         modelPropertyEditor.buildFor(null);
         modelPropertyEditor.buildFor(spatial);
+
+        changeHandler.run();
     }
 }

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

@@ -1,10 +1,10 @@
 package com.ss.editor.ui.control.model.tree.action;
 
-import com.jme3.scene.Geometry;
 import com.ss.editor.Messages;
-import com.ss.editor.model.tool.TangentGenerator;
 import com.ss.editor.ui.control.model.tree.ModelNodeTree;
 import com.ss.editor.ui.control.model.tree.node.ModelNode;
+import com.ss.editor.ui.dialog.model.GenerateTangentsDialog;
+import com.ss.editor.ui.scene.EditorFXScene;
 
 /**
  * Реализация действия по генерации тангетов используя старый алгоритм.
@@ -25,12 +25,9 @@ protected String getName() {
     @Override
     protected void process() {
 
-        final ModelNode<?> node = getNode();
-        final Geometry element = (Geometry) node.getElement();
+        final EditorFXScene scene = EDITOR.getScene();
 
-        TangentGenerator.useStandardGenerator(element, false);
-
-        final ModelNodeTree nodeTree = getNodeTree();
-        nodeTree.notifyChanged(node);
+        final GenerateTangentsDialog dialog = new GenerateTangentsDialog(getNodeTree(), getNode());
+        dialog.show(scene.getWindow());
     }
 }

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

@@ -5,7 +5,6 @@
 import com.ss.editor.Messages;
 import com.ss.editor.ui.Icons;
 import com.ss.editor.ui.control.model.tree.ModelNodeTree;
-import com.ss.editor.ui.control.model.tree.action.MikktspaceTangetGeneratorAction;
 import com.ss.editor.ui.control.model.tree.action.RenameNodeAction;
 import com.ss.editor.ui.control.model.tree.action.TangentGeneratorAction;
 
@@ -58,7 +57,7 @@ public Array<ModelNode<?>> getChildren() {
     public void fillContextMenu(final ModelNodeTree nodeTree, final ObservableList<MenuItem> items) {
 
         final Menu toolActions = new Menu(Messages.MODEL_NODE_TREE_ACTION_TOOLS);
-        toolActions.getItems().addAll(new TangentGeneratorAction(nodeTree, this), new MikktspaceTangetGeneratorAction(nodeTree, this));
+        toolActions.getItems().addAll(new TangentGeneratorAction(nodeTree, this));
 
         items.add(toolActions);
         items.add(new RenameNodeAction(nodeTree, this));

src/com/ss/editor/ui/control/model/tree/node/GeometryModelNode.java

@@ -86,4 +86,7 @@ public interface CSSIds {
     public static final String CREATE_SKY_DIALOG_COMBO_BOX = "CreateSkyDialogComboBox";
     public static final String CREATE_SKY_DIALOG_SPINNER = "CreateSkyDialogSpinner";
     public static final String CREATE_SKY_DIALOG_BUTTON = "CreateSkyDialogButton";
+
+    public static final String GENERATE_TANGENTS_DIALOG_LABEL = "GenerateTangentsDialogLabel";
+    public static final String GENERATE_TANGENTS_DIALOG_COMBO_BOX = "GenerateTangentsDialogComboBox";
 }