Merge pull request #49 from from2001/develop

0.1.0
from2001 · Apr 27, 2024 · 150a5b2 · 150a5b2
2 parents 961544d + ed966d9
commit 150a5b2
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 143 deletions.
diff --git a/README.md b/README.md
@@ -71,7 +71,3 @@ Notice: Check "Coroutine" in the "On Start Event" triger node.
 - [OpenUPM](https://openupm.com/packages/com.from2001.gltfast-visualscripting-nodes/)
 
 ## Others
-
-### Vision OS Support
-
-Materials are generated with UnityGLTF routine with `UnityGLTF/PBRGraph` shader on ViisonOS until glTFast shaders support Vision OS.
diff --git a/...ptingNodes/Packages/com.from2001.gltfast-visualscripting-nodes/Editor/AddDefineSymbols.cs b/...ptingNodes/Packages/com.from2001.gltfast-visualscripting-nodes/Editor/AddDefineSymbols.cs
@@ -9,8 +9,6 @@ class AddDefineSymbols
 {
     // Scripting Define Symbol list to add
     static readonly string[] symbolsToAdd = {
-            "UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON",         // Enable UnityGLTF import
-            "GLTFAST_FORCE_DEFAULT_IMPORTER_OFF",          // Disable GLTFast import
             "UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER",    // Disable importer in UniVRM
             "UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER",     // Disable importer in UniVRM
         };

diff --git a/...iptingNodes/Packages/com.from2001.gltfast-visualscripting-nodes/Runtime/Nodes/LoadGltf.cs b/...iptingNodes/Packages/com.from2001.gltfast-visualscripting-nodes/Runtime/Nodes/LoadGltf.cs
@@ -78,8 +78,7 @@ private async UniTask<GameObject> LoadGltfWithURL(string URL, GameObject target
                 if (httpResponse.IsSuccessful)
                 {
                     GlbBytes = httpResponse.Bytes;
-                    GLTFast.Materials.IMaterialGenerator materialGenerator = Utils.IsVisionOS() ? new PBRGraphMaterialGenerator(new MemoryStream(GlbBytes)) : null;
-                    var gltfImport = new GltfImport(null, null, materialGenerator, null);
+                    var gltfImport = new GltfImport(null, null, null, null);
                     var instantiator = new GameObjectInstantiator(gltfImport, gltfInstance.transform);
 
                     bool success_load = await gltfImport.LoadGltfBinary(

diff --git a/...ges/com.from2001.gltfast-visualscripting-nodes/Runtime/Utils/PBRGraphMaterialGenerator.cs b/...ges/com.from2001.gltfast-visualscripting-nodes/Runtime/Utils/PBRGraphMaterialGenerator.cs
diff --git a/...om.from2001.gltfast-visualscripting-nodes/Runtime/Utils/PBRGraphMaterialGenerator.cs.meta b/...om.from2001.gltfast-visualscripting-nodes/Runtime/Utils/PBRGraphMaterialGenerator.cs.meta
diff --git a/...ast_VisualScriptingNodes/Packages/com.from2001.gltfast-visualscripting-nodes/package.json b/...ast_VisualScriptingNodes/Packages/com.from2001.gltfast-visualscripting-nodes/package.json
@@ -1,24 +1,22 @@
 {
   "name": "com.from2001.gltfast-visualscripting-nodes",
-  "version": "0.0.21",
+  "version": "0.1.0",
   "displayName": "glTFast Visual Scripting Nodes",
   "description": "Unity Visual Scripting node library for glTF",
   "unity": "2021.3",
   "documentationUrl": "https://github.com/from2001/glTFast_VisualScriptingNodes",
   "changelogUrl": "",
   "licensesUrl": "https://github.com/from2001/glTFast_VisualScriptingNodes/blob/main/LICENSE",
   "dependencies": {
-    "com.unity.burst": "1.8.13",
     "com.unity.visualscripting": "1.9.1",
     "com.cysharp.unitask": "2.4.1",
-    "com.unity.cloud.gltfast": "6.0.1",
+    "com.unity.cloud.gltfast": "6.4.0",
     "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.modules.imageconversion": "1.0.0",
     "com.styly.webrequest-visualscripting-nodes": "0.0.7",
-    "org.khronos.unitygltf": "2.10.2-rc",
-    "com.unity.cloud.draco": "5.0.2",
-    "com.unity.cloud.ktx": "3.3.0",
-    "com.unity.meshopt.decompress": "0.1.0-preview.5",
+    "com.unity.cloud.draco": "5.1.3",
+    "com.unity.cloud.ktx": "3.4.0",
+    "com.unity.meshopt.decompress": "0.1.0-preview.6",
     "com.unity.render-pipelines.universal": "10.10.1"
   },
   "keywords": [

diff --git a/glTFast_VisualScriptingNodes/Packages/manifest.json b/glTFast_VisualScriptingNodes/Packages/manifest.json
@@ -1,18 +1,12 @@
 {
   "dependencies": {
     "com.styly.webrequest-visualscripting-nodes": "0.0.6",
-    "com.unity.cloud.draco": "5.0.2",
-    "com.unity.cloud.draco.webgl-2022": "1.0.0",
-    "com.unity.cloud.ktx": "3.3.0",
-    "com.unity.cloud.ktx.webgl-2022": "1.0.1",
     "com.unity.collab-proxy": "2.2.0",
     "com.unity.feature.development": "1.0.1",
-    "com.unity.meshopt.decompress": "0.1.0-preview.5",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.9.1",
-    "org.khronos.unitygltf": "2.10.2-rc",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/glTFast_VisualScriptingNodes/Packages/packages-lock.json b/glTFast_VisualScriptingNodes/Packages/packages-lock.json
@@ -12,17 +12,15 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "com.unity.burst": "1.8.13",
         "com.unity.visualscripting": "1.9.1",
         "com.cysharp.unitask": "2.4.1",
-        "com.unity.cloud.gltfast": "6.0.1",
+        "com.unity.cloud.gltfast": "6.4.0",
         "com.unity.nuget.newtonsoft-json": "3.2.1",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.styly.webrequest-visualscripting-nodes": "0.0.7",
-        "org.khronos.unitygltf": "2.10.2-rc",
-        "com.unity.cloud.draco": "5.0.2",
-        "com.unity.cloud.ktx": "3.3.0",
-        "com.unity.meshopt.decompress": "0.1.0-preview.5",
+        "com.unity.cloud.draco": "5.1.3",
+        "com.unity.cloud.ktx": "3.4.0",
+        "com.unity.meshopt.decompress": "0.1.0-preview.6",
         "com.unity.render-pipelines.universal": "10.10.1"
       }
     },
@@ -37,8 +35,8 @@
       "url": "https://package.openupm.com"
     },
     "com.unity.burst": {
-      "version": "1.8.13",
-      "depth": 1,
+      "version": "1.8.12",
+      "depth": 2,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
@@ -47,24 +45,17 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.cloud.draco": {
-      "version": "5.0.2",
-      "depth": 0,
+      "version": "5.1.3",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.burst": "1.8.11",
         "com.unity.mathematics": "1.3.1"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.cloud.draco.webgl-2022": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.cloud.gltfast": {
-      "version": "6.0.1",
+      "version": "6.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -76,21 +67,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.cloud.ktx": {
-      "version": "3.3.0",
-      "depth": 0,
+      "version": "3.4.0",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.modules.unitywebrequest": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.cloud.ktx.webgl-2022": {
-      "version": "1.0.1",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.collab-proxy": {
       "version": "2.2.0",
       "depth": 0,
@@ -153,14 +137,14 @@
     },
     "com.unity.mathematics": {
       "version": "1.3.1",
-      "depth": 1,
+      "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.meshopt.decompress": {
-      "version": "0.1.0-preview.5",
-      "depth": 0,
+      "version": "0.1.0-preview.6",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.mathematics": "1.2.1",
@@ -215,7 +199,7 @@
     },
     "com.unity.searcher": {
       "version": "4.9.2",
-      "depth": 2,
+      "depth": 3,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
@@ -229,7 +213,7 @@
     },
     "com.unity.shadergraph": {
       "version": "14.0.10",
-      "depth": 1,
+      "depth": 2,
       "source": "builtin",
       "dependencies": {
         "com.unity.render-pipelines.core": "14.0.10",
@@ -297,18 +281,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "org.khronos.unitygltf": {
-      "version": "2.10.2-rc",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "2.0.0",
-        "com.unity.modules.imageconversion": "1.0.0",
-        "com.unity.shadergraph": "10.0.0",
-        "com.unity.mathematics": "1.0.0"
-      },
-      "url": "https://package.openupm.com"
-    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,

diff --git a/glTFast_VisualScriptingNodes/ProjectSettings/ProjectSettings.asset b/glTFast_VisualScriptingNodes/ProjectSettings/ProjectSettings.asset
@@ -883,13 +883,13 @@ PlayerSettings:
   webGLMemoryGeometricGrowthCap: 96
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON;GLTFAST_FORCE_DEFAULT_IMPORTER_OFF;UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
+    Android: UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
     Server: 
-    Standalone: UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON;GLTFAST_FORCE_DEFAULT_IMPORTER_OFF;UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
+    Standalone: UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
     VisionOS: UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON;GLTFAST_FORCE_DEFAULT_IMPORTER_OFF;UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
-    WebGL: UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON;GLTFAST_FORCE_DEFAULT_IMPORTER_OFF;UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
-    iPhone: UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON;GLTFAST_FORCE_DEFAULT_IMPORTER_OFF;UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
-    tvOS: UNITYGLTF_FORCE_DEFAULT_IMPORTER_ON;GLTFAST_FORCE_DEFAULT_IMPORTER_OFF;UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
+    WebGL: UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
+    iPhone: UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
+    tvOS: UNIGLTF_DISABLE_DEFAULT_GLTF_IMPORTER;UNIGLTF_DISABLE_DEFAULT_GLB_IMPORTER
   additionalCompilerArguments:
     Android: []
     Server: []