добавлен акшен для генерации тангентов старым способом

Author: JavaSaBr

resources/messages/messages.properties

@@ -81,7 +81,7 @@ ModelFileEditorNodeTree=Structure
 ModelFileEditorProperties=Properties
 ModelFileEditorNodeMesh=Mesh
 
-ModelNodeTreeActionMikktspaceTangentGenerator=Generate tangents
+ModelNodeTreeActionMikktspaceTangentGenerator=Generate tangents using Mikktspace algorithm
 ModelNodeTreeActionRemove=Remove
 ModelNodeTreeActionRename=Rename
 ModelNodeTreeActionOptimizeGeometry=Optimize geometry
@@ -94,6 +94,7 @@ ModelNodeTreeActionCreatePrimitiveBox=Box
 ModelNodeTreeActionCreatePrimitiveSphere=Sphere
 ModelNodeTreeActionCreatePrimitiveQuad=Quad
 ModelNodeTreeActionLoadModel=Load model
+ModelNodeTreeActionTangentGenerator=Generate tangents using normal algorithm
 
 ModelPropertyCullHint=Cull Hint
 ModelPropertyShadowMode=Shadow mode

resources/messages/messages_ru.properties

@@ -81,7 +81,7 @@ ModelFileEditorNodeTree=Структура
 ModelFileEditorProperties=Свойства
 ModelFileEditorNodeMesh=Сетка
 
-ModelNodeTreeActionMikktspaceTangentGenerator=Сгенерировать тангенты
+ModelNodeTreeActionMikktspaceTangentGenerator=Сгенерировать тангенты используя алгоритм Mikktspace
 ModelNodeTreeActionRemove=Удалить
 ModelNodeTreeActionRename=Переименовать
 ModelNodeTreeActionOptimizeGeometry=Оптимизировать геометрию
@@ -94,6 +94,7 @@ ModelNodeTreeActionCreatePrimitiveBox=Куб
 ModelNodeTreeActionCreatePrimitiveSphere=Сфера
 ModelNodeTreeActionCreatePrimitiveQuad=Плоскость
 ModelNodeTreeActionLoadModel=Загрузить модель
+ModelNodeTreeActionTangentGenerator=Сгенерировать тангенты используя обычный алгоритм
 
 ModelPropertyCullHint=Cull Hint
 ModelPropertyShadowMode=Режим теней

src/com/ss/editor/Editor.java

@@ -241,7 +241,7 @@ public void simpleInitApp() {
 
         ExecutorManager.getInstance();
 
-        final UbuntuCursorProvider cursorDisplayProvider = new UbuntuCursorProvider(this, this.assetManager, inputManager);
+        final UbuntuCursorProvider cursorDisplayProvider = new UbuntuCursorProvider(this, assetManager, inputManager);
 
         for (final CursorType type : CursorType.values()) {
             cursorDisplayProvider.setup(type);
@@ -250,7 +250,7 @@ public void simpleInitApp() {
         flyCam.setDragToRotate(true);
         flyCam.setEnabled(false);
 
-        postProcessor = new FilterPostProcessor(this.assetManager);
+        postProcessor = new FilterPostProcessor(assetManager);
         postProcessor.initialize(renderManager, viewPort);
 
         if (editorConfig.isFXAA()) {
@@ -265,6 +265,8 @@ public void simpleInitApp() {
             postProcessor.addFilter(filter);
         }
 
+        // postProcessor.addFilter(new ToneMapFilter());
+
         viewPort.addProcessor(postProcessor);
 
         InitializeManager.register(ResourceManager.class);

src/com/ss/editor/Messages.java

@@ -106,6 +106,7 @@ public class Messages {
     public static final String MODEL_NODE_TREE_ACTION_CREATE_PRIMITIVE_SPHERE;
     public static final String MODEL_NODE_TREE_ACTION_CREATE_PRIMITIVE_QUAD;
     public static final String MODEL_NODE_TREE_ACTION_LOAD_MODEL;
+    public static final String MODEL_NODE_TREE_ACTION_TANGENT_GENERATOR;
 
     public static final String MODEL_PROPERTY_CULL_HINT;
     public static final String MODEL_PROPERTY_SHADOW_MODE;
@@ -152,7 +153,6 @@ public class Messages {
     public static final String EMPTY_MODEL_CREATOR_DESCRIPTION;
     public static final String EMPTY_MODEL_CREATOR_TITLE;
 
-
     static {
 
         final ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME, ResourceControl.getInstance());
@@ -253,6 +253,7 @@ public class Messages {
         MODEL_NODE_TREE_ACTION_CREATE_PRIMITIVE_SPHERE = bundle.getString("ModelNodeTreeActionCreatePrimitiveSphere");
         MODEL_NODE_TREE_ACTION_CREATE_PRIMITIVE_QUAD = bundle.getString("ModelNodeTreeActionCreatePrimitiveQuad");
         MODEL_NODE_TREE_ACTION_LOAD_MODEL = bundle.getString("ModelNodeTreeActionLoadModel");
+        MODEL_NODE_TREE_ACTION_TANGENT_GENERATOR = bundle.getString("ModelNodeTreeActionTangentGenerator");
 
         MODEL_PROPERTY_CULL_HINT = bundle.getString("ModelPropertyCullHint");
         MODEL_PROPERTY_SHADOW_MODE = bundle.getString("ModelPropertyShadowMode");

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

@@ -152,9 +152,15 @@ private void processChangedFile(final FileChangedEvent event) {
         final Path file = event.getFile();
         final String extension = FileUtils.getExtension(file);
 
-        if (!extension.endsWith(FileExtensions.JME_MATERIAL)) {
-            return;
+        if (extension.endsWith(FileExtensions.JME_MATERIAL)) {
+            updateMaterial(file);
         }
+    }
+
+    /**
+     * Процесс обновления материала.
+     */
+    private void updateMaterial(final Path file) {
 
         final Path assetFile = EditorUtil.getAssetFile(file);
         final String assetPath = EditorUtil.toAssetPath(assetFile);

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

@@ -0,0 +1,36 @@
+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;
+
+/**
+ * Реализация действия по генерации тангетов используя старый алгоритм.
+ *
+ * @author Ronn
+ */
+public class TangentGeneratorAction extends AbstractNodeAction {
+
+    public TangentGeneratorAction(final ModelNodeTree nodeTree, final ModelNode<?> node) {
+        super(nodeTree, node);
+    }
+
+    @Override
+    protected String getName() {
+        return Messages.MODEL_NODE_TREE_ACTION_TANGENT_GENERATOR;
+    }
+
+    @Override
+    protected void process() {
+
+        final ModelNode<?> node = getNode();
+        final Geometry element = (Geometry) node.getElement();
+
+        TangentGenerator.useStandardGenerator(element, false);
+
+        final ModelNodeTree nodeTree = getNodeTree();
+        nodeTree.notifyChanged(node);
+    }
+}

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

@@ -7,6 +7,7 @@
 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;
 
 import javafx.collections.ObservableList;
 import javafx.scene.control.Menu;
@@ -57,7 +58,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 MikktspaceTangetGeneratorAction(nodeTree, this));
+        toolActions.getItems().addAll(new TangentGeneratorAction(nodeTree, this), new MikktspaceTangetGeneratorAction(nodeTree, this));
 
         items.add(toolActions);
         items.add(new RenameNodeAction(nodeTree, this));

src/com/ss/editor/ui/tooltip/ImageChannelPreview.java

@@ -171,9 +171,9 @@ private ImageView getRedView() {
      */
     public void showImage(final Path file) {
 
-        final Image image = file == null? null : IMAGE_MANAGER.getTexturePreview(file, 120, 120);
+        final Image image = file == null ? null : IMAGE_MANAGER.getTexturePreview(file, 120, 120);
 
-        if (file == null|| image.getWidth() != 120) {
+        if (file == null || image.getWidth() != 120) {
 
             final ImageView redView = getRedView();
             redView.setImage(null);

src/com/ss/editor/util/EditorUtil.java

@@ -1,5 +1,6 @@
 package com.ss.editor.util;
 
+import com.jme3.asset.AssetKey;
 import com.jme3.material.Material;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector3f;
@@ -135,6 +136,32 @@ public static void addGeometryWithMaterial(final Spatial spatial, final Array<Ge
         }
     }
 
+    /**
+     * Сбор всех объектов использующих указанный asset path.
+     */
+    public static void addSpatialWithAssetPath(final Spatial spatial, final Array<Spatial> container, final String assetPath) {
+
+        if (StringUtils.isEmpty(assetPath)) {
+            return;
+        }
+
+        final AssetKey key = spatial.getKey();
+
+        if (key != null && StringUtils.equals(key.getName(), assetPath)) {
+            container.add(spatial);
+        }
+
+        if (!(spatial instanceof Node)) {
+            return;
+        }
+
+        final Node node = (Node) spatial;
+
+        for (final Spatial children : node.getChildren()) {
+            addSpatialWithAssetPath(children, container, assetPath);
+        }
+    }
+
     /**
      * Сбор всей геометрии.
      */