added gltf support.

JavaSaBr · JavaSaBr · commit 3a9f40fe4c13 · 2017-08-11T17:16:04.000+03:00
diff --git a/src/main/java/com/ss/editor/FileExtensions.java b/src/main/java/com/ss/editor/FileExtensions.java
@@ -37,10 +37,6 @@ public interface FileExtensions {
      */
     String JAVA_CLASS = "class";
 
-    /**
-     * The constant POST_FILTER_VIEW.
-     */
-    String POST_FILTER_VIEW = "pfv";
 
     /**
      * The constant IMAGE_PNG.
@@ -125,6 +121,10 @@ public interface FileExtensions {
      * The constant MODEL_FBX.
      */
     String MODEL_FBX = "fbx";
+    /**
+     * The constant MODEL_GLTF.
+     */
+    String MODEL_GLTF = "gltf";
     /**
      * The constant MODEL_OBJ.
      */
diff --git a/src/main/java/com/ss/editor/Messages.java b/src/main/java/com/ss/editor/Messages.java
@@ -430,6 +430,10 @@ public class Messages {
      * The constant BLEND_TO_J3O_FILE_CONVERTER_DESCRIPTION.
      */
     public static final String BLEND_TO_J3O_FILE_CONVERTER_DESCRIPTION;
+    /**
+     * The constant GLTF_TO_J3O_FILE_CONVERTER_DESCRIPTION.
+     */
+    public static final String GLTF_TO_J3O_FILE_CONVERTER_DESCRIPTION;
     /**
      * The constant FBX_TO_J3O_FILE_CONVERTER_DESCRIPTION.
      */
@@ -2427,6 +2431,7 @@ public class Messages {
         SETTINGS_DIALOG_ENVS_FOLDER_CHOOSER_TITLE = bundle.getString("SettingsDialogEnvsFolderChooserTitle");
 
         BLEND_TO_J3O_FILE_CONVERTER_DESCRIPTION = bundle.getString("BlendToJ3oFileConverterDescription");
+        GLTF_TO_J3O_FILE_CONVERTER_DESCRIPTION = bundle.getString("GLTFToJ3oFileConverterDescription");
         FBX_TO_J3O_FILE_CONVERTER_DESCRIPTION = bundle.getString("FBXToJ3oFileConverterDescription");
         OBJ_TO_J3O_FILE_CONVERTER_DESCRIPTION = bundle.getString("ObjToJ3oFileConverterDescription");
         SCENE_TO_J3O_FILE_CONVERTER_DESCRIPTION = bundle.getString("SceneToJ3oFileConverterDescription");
diff --git a/src/main/java/com/ss/editor/file/converter/FileConverterRegistry.java b/src/main/java/com/ss/editor/file/converter/FileConverterRegistry.java
@@ -49,6 +49,7 @@ private FileConverterRegistry() {
         register(SceneToJ3oFileConverter.DESCRIPTION);
         register(MeshXmlToJ3oFileConverter.DESCRIPTION);
         register(XBufToJ3oFileConverter.DESCRIPTION);
+        register(GLTFToJ3oFileConverter.DESCRIPTION);
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/file/converter/impl/AbstractModelFileConverter.java b/src/main/java/com/ss/editor/file/converter/impl/AbstractModelFileConverter.java
@@ -66,7 +66,14 @@ private void convert(@NotNull final Path source, @NotNull final ModelConverterDi
         final EditorFXScene scene = JFX_APPLICATION.getScene();
         scene.incrementLoading();
 
-        EXECUTOR_MANAGER.addBackgroundTask(() -> convertImpl(source, dialog));
+        EXECUTOR_MANAGER.addBackgroundTask(() -> {
+            try {
+                convertImpl(source, dialog);
+            } catch (final Exception e) {
+                EditorUtil.handleException(LOGGER, this, e);
+                EXECUTOR_MANAGER.addFXTask(scene::decrementLoading);
+            }
+        });
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/file/converter/impl/GLTFToJ3oFileConverter.java b/src/main/java/com/ss/editor/file/converter/impl/GLTFToJ3oFileConverter.java
@@ -0,0 +1,51 @@
+package com.ss.editor.file.converter.impl;
+
+import com.ss.editor.FileExtensions;
+import com.ss.editor.Messages;
+import com.ss.editor.file.converter.FileConverterDescription;
+import com.ss.rlib.util.array.Array;
+import com.ss.rlib.util.array.ArrayFactory;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The implementation of {@link AbstractFileConverter} to convert .glft file to .j3o.
+ *
+ * @author JavaSaBr
+ */
+public class GLTFToJ3oFileConverter extends AbstractModelFileConverter {
+
+    @NotNull
+    private static final Array<String> EXTENSIONS = ArrayFactory.newArray(String.class);
+
+    static {
+        EXTENSIONS.add(FileExtensions.MODEL_GLTF);
+        EXTENSIONS.asUnsafe().trimToSize();
+    }
+
+    /**
+     * The constant DESCRIPTION.
+     */
+    @NotNull
+    public static final FileConverterDescription DESCRIPTION = new FileConverterDescription();
+
+    static {
+        DESCRIPTION.setDescription(Messages.GLTF_TO_J3O_FILE_CONVERTER_DESCRIPTION);
+        DESCRIPTION.setConstructor(GLTFToJ3oFileConverter::new);
+        DESCRIPTION.setExtensions(EXTENSIONS);
+    }
+
+    private GLTFToJ3oFileConverter() {
+    }
+
+    @NotNull
+    @Override
+    protected Array<String> getAvailableExtensions() {
+        return EXTENSIONS;
+    }
+
+    @NotNull
+    @Override
+    public String getTargetExtension() {
+        return FileExtensions.JME_OBJECT;
+    }
+}
diff --git a/src/main/java/com/ss/editor/manager/FileIconManager.java b/src/main/java/com/ss/editor/manager/FileIconManager.java
@@ -80,6 +80,7 @@ public class FileIconManager {
         EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.JME_SCENE, "sse");
         EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.JME_MATERIAL, "text");
         EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.JME_MATERIAL_DEFINITION, "text");
+        EXTENSION_TO_CONTENT_TYPE.put(FileExtensions.MODEL_GLTF, "cube");
 
         EXTENSION_TO_CONTENT_TYPE.put("obj", "x-office-drawing");
         EXTENSION_TO_CONTENT_TYPE.put("blend", "application-x-blender");
diff --git a/src/main/resources/credits/icons.txt b/src/main/resources/credits/icons.txt
@@ -72,4 +72,5 @@ ui/icons/svg/lantern.svg icon made by http://www.flaticon.com/authors/freepik fr
 ui/icons/svg/brightness.svg icon made by http://www.flaticon.com/authors/those-icons from www.flaticon.com
 ui/icons/svg/picture.svg icon made by http://www.flaticon.com/authors/madebyoliver from www.flaticon.com
 ui/icons/svg/document.svg icon made by http://www.flaticon.com/authors/madebyoliver from www.flaticon.com
-ui/icons/svg/plug-silhouette.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
+ui/icons/svg/plug-silhouette.svg icon made by http://www.flaticon.com/authors/freepik from www.flaticon.com
+ui/icons/filetypes/cube.svg icon made by https://www.flaticon.com/authors/madebyoliver from www.flaticon.com
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
@@ -115,6 +115,7 @@ SettingsDialogEnvsFolderLabel=Environment folder
 SettingsDialogEnvsFolderChooserTitle=Select a folder with environment textures
 
 BlendToJ3oFileConverterDescription=Convert from .blend to .j3o
+GLTFToJ3oFileConverterDescription=Convert from .gltf to .j3o
 FBXToJ3oFileConverterDescription=Convert from .fbx to .j3o
 ObjToJ3oFileConverterDescription=Convert from .obj to .j3o
 SceneToJ3oFileConverterDescription=Convert from .scene to .j3o
diff --git a/src/main/resources/messages/messages_de.properties b/src/main/resources/messages/messages_de.properties
@@ -115,6 +115,7 @@ SettingsDialogEnvsFolderLabel=Verzeichnis mit Umgebungstexturen
 SettingsDialogEnvsFolderChooserTitle=Wählen Sie Verzeichnis mit Umgebungstexturen
 
 BlendToJ3oFileConverterDescription=.blend zu .j3o konvertieren
+GLTFToJ3oFileConverterDescription=Convert from .gltf to .j3o
 FBXToJ3oFileConverterDescription=.fbx zu .j3o konvertieren
 ObjToJ3oFileConverterDescription=.obj zu .j3o konvertieren
 SceneToJ3oFileConverterDescription=.scene zu .j3o konvertieren
diff --git a/src/main/resources/messages/messages_ru.properties b/src/main/resources/messages/messages_ru.properties
@@ -116,6 +116,7 @@ SettingsDialogEnvsFolderLabel=Папка текст. окруж.
 SettingsDialogEnvsFolderChooserTitle=Выберите папку с текстурами окружения
 
 BlendToJ3oFileConverterDescription=Конверитровать .blend в .j3o
+GLTFToJ3oFileConverterDescription=Конверитровать .gltf в .j3o
 FBXToJ3oFileConverterDescription=Конверитровать .fbx в .j3o
 ObjToJ3oFileConverterDescription=Конверитровать .obj в .j3o
 SceneToJ3oFileConverterDescription=Конверитровать .scene в .j3o
diff --git a/src/main/resources/ui/icons/filetypes/cube.svg b/src/main/resources/ui/icons/filetypes/cube.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 58 58" style="enable-background:new 0 0 58 58;" xml:space="preserve">
+<g>
+	<polygon style="fill:#556080;" points="29,58 3,45 3,13 29,26 	"/>
+	<polygon style="fill:#26B99A;" points="29,58 55,45 55,13 29,26 	"/>
+	<polygon style="fill:#434C6D;" points="3,13 28,0 55,13 29,26 	"/>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ private FileConverterRegistry() {`
`49`	`49`	`register(SceneToJ3oFileConverter.DESCRIPTION);`
`50`	`50`	`register(MeshXmlToJ3oFileConverter.DESCRIPTION);`
`51`	`51`	`register(XBufToJ3oFileConverter.DESCRIPTION);`
	`52`	`+ register(GLTFToJ3oFileConverter.DESCRIPTION);`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`/**`