Increase editor import compatibility between different glTF packages

MetaAlms · Mar 16, 2022 · 09cfa1d · 09cfa1d
1 parent 3dbd862
commit 09cfa1d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/Scripts/Editor/GLBImporter.cs b/Scripts/Editor/GLBImporter.cs
@@ -1,3 +1,14 @@
+#if HAVE_GLTFAST || HAVE_UNITYGLTF
+#define ANOTHER_IMPORTER_HAS_HIGHER_PRIORITY
+#endif
+
+#if !ANOTHER_IMPORTER_HAS_HIGHER_PRIORITY && !GLTFUTILITY_FORCE_DEFAULT_IMPORTER_OFF
+#define ENABLE_DEFAULT_GLB_IMPORTER
+#endif
+#if GLTFUTILITY_FORCE_DEFAULT_IMPORTER_ON
+#define ENABLE_DEFAULT_GLB_IMPORTER
+#endif
+
 using UnityEngine;
 #if !UNITY_2020_2_OR_NEWER
 using UnityEditor.Experimental.AssetImporters;
@@ -6,7 +17,11 @@
 #endif
 
 namespace Siccity.GLTFUtility {
+#if ENABLE_DEFAULT_GLB_IMPORTER
 	[ScriptedImporter(1, "glb")]
+#else
+    [ScriptedImporter(2, null, overrideExts: new[] { "glb" })]
+#endif
 	public class GLBImporter : GLTFImporter {
 
 		public override void OnImportAsset(AssetImportContext ctx) {

diff --git a/Scripts/Editor/GLTFImporter.cs b/Scripts/Editor/GLTFImporter.cs
@@ -1,4 +1,14 @@
-using UnityEditor;
+#if HAVE_GLTFAST || HAVE_UNITYGLTF
+#define ANOTHER_IMPORTER_HAS_HIGHER_PRIORITY
+#endif
+
+#if !ANOTHER_IMPORTER_HAS_HIGHER_PRIORITY && !GLTFUTILITY_FORCE_DEFAULT_IMPORTER_OFF
+#define ENABLE_DEFAULT_GLB_IMPORTER
+#endif
+#if GLTFUTILITY_FORCE_DEFAULT_IMPORTER_ON
+#define ENABLE_DEFAULT_GLB_IMPORTER
+#endif
+
 #if !UNITY_2020_2_OR_NEWER
 using UnityEditor.Experimental.AssetImporters;
 #else
@@ -7,7 +17,11 @@
 using UnityEngine;
 
 namespace Siccity.GLTFUtility {
+#if ENABLE_DEFAULT_GLB_IMPORTER
 	[ScriptedImporter(1, "gltf")]
+#else
+    [ScriptedImporter(1, null, overrideExts: new[] { "gltf" })]
+#endif
 	public class GLTFImporter : ScriptedImporter {
 
 		public ImportSettings importSettings;

diff --git a/Scripts/Editor/GLTFUtility.Editor.asmdef b/Scripts/Editor/GLTFUtility.Editor.asmdef
@@ -8,5 +8,17 @@
         "Editor"
     ],
     "excludePlatforms": [],
-    "allowUnsafeCode": false
+    "allowUnsafeCode": false,
+    "versionDefines": [
+        {
+            "name": "com.atteneder.gltfast",
+            "expression": "3.0.0",
+            "define": "HAVE_GLTFAST"
+        },
+        {
+            "name": "org.khronos.unitygltf",
+            "expression": "0.0.0",
+            "define": "HAVE_UNITYGLTF"
+        }
+    ]
 }