Merge pull request #47 from from2001/develop

v0.1.11
from2001 · May 11, 2024 · cd783b9 · cd783b9
2 parents fbe13d5 + 5b68a1f
commit cd783b9
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ Add some useful features
 
 ### Vision OS Support
 
-Shaders are replaced with `Universal Render Pipeline/Lit` shader on ViisonOS
+Shaders are replaced with [PolySpatialEnvironmentDiffuseShader](https://github.com/segurvita/PolySpatialEnvironmentDiffuseShader) shader on ViisonOS
 
 ### Avoid Multiple scripted importers error
 

diff --git a/...alScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/Runtime/Nodes/LoadVRM.cs b/...alScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/Runtime/Nodes/LoadVRM.cs
@@ -9,6 +9,7 @@
 using VisualScriptingNodes;
 using STYLY.Http;
 using STYLY.Http.Service;
+using Segur.PolySpatialEnvironmentDiffuseShader.Runtime;
 
 namespace VrmVisualScriptingNodes
 {
@@ -97,12 +98,20 @@ private async UniTask<Vrm10Instance> LoadVrm(string URL)
                 return vrmInstance;
             }
             else
-            {
+            {   
+                // Set MaterialDescriptorGenerator for VisionOS
+
+                // Unlit Material 
+                // var MaterialDescriptorGenerator_visionOS = new UrpUnlitMaterialDescriptorGenerator();
+
+                // Environment Diffuse Shader Material By segurvita
+                var MaterialDescriptorGenerator_visionOS = new EnvironmentDiffuseMaterialDescriptorGenerator();
+
                 Vrm10Instance vrmInstance = await Vrm10.LoadBytesAsync(
                     VrmBytes,
                     canLoadVrm0X: true,
                     materialGenerator: GraphicsSettings.currentRenderPipeline is UniversalRenderPipelineAsset
-                        ? new UrpUnlitMaterialDescriptorGenerator() : null
+                        ? MaterialDescriptorGenerator_visionOS : null
                 );
                 return vrmInstance;
             }

diff --git a/....from2001.vrm-visualscripting-nodes/Runtime/com.from2001.vrm-visualscripting-nodes.asmdef b/....from2001.vrm-visualscripting-nodes/Runtime/com.from2001.vrm-visualscripting-nodes.asmdef
@@ -14,14 +14,15 @@
         "VrmLib",
         "VRMShaders.VRM10.MToon10.Runtime",
         "Unity.ShaderGraph.Utilities",
-        "com.styly.webrequest-visualscripting-nodes"
+        "com.styly.webrequest-visualscripting-nodes",
+        "Unity.PolySpatialEnvironmentDiffuseShader"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
-    "autoReferenced": true,
+    "autoReferenced": false,
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false

diff --git a/VRM_VisualScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/package.json b/VRM_VisualScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.from2001.vrm-visualscripting-nodes",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "displayName": "VRM Visual Scripting Nodes",
   "description": "Unity Visual Scripting node library for VRM",
   "unity": "2021.3",
@@ -9,10 +9,11 @@
   "licensesUrl": "https://github.com/from2001/VRM_VisualScriptingNodes/blob/main/LICENSE",
   "dependencies": {
     "com.unity.visualscripting": "1.9.1",
-    "com.vrmc.vrm": "0.115.0",
+    "com.vrmc.vrm": "0.122.0",
     "com.unity.render-pipelines.universal": "10.10.1",
-    "com.cysharp.unitask": "2.4.1",
-    "com.styly.webrequest-visualscripting-nodes": "0.0.5"
+    "com.cysharp.unitask": "2.5.4",
+    "com.styly.webrequest-visualscripting-nodes": "0.0.5",
+    "com.segur.poly-spatial-environment-diffuse-shader": "0.3.0"
   },
   "keywords": [
     "VRM",

diff --git a/VRM_VisualScriptingNodes/Packages/manifest.json b/VRM_VisualScriptingNodes/Packages/manifest.json
@@ -47,7 +47,8 @@
       "scopes": [
         "com.cysharp.unitask",
         "com.styly.webrequest-visualscripting-nodes",
-        "com.vrmc"
+        "com.vrmc",
+        "com.segur.poly-spatial-environment-diffuse-shader"
       ]
     }
   ]

diff --git a/VRM_VisualScriptingNodes/Packages/packages-lock.json b/VRM_VisualScriptingNodes/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.cysharp.unitask": {
-      "version": "2.4.1",
+      "version": "2.5.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -13,19 +13,27 @@
       "source": "embedded",
       "dependencies": {
         "com.unity.visualscripting": "1.9.1",
-        "com.vrmc.vrm": "0.115.0",
+        "com.vrmc.vrm": "0.122.0",
         "com.unity.render-pipelines.universal": "10.10.1",
-        "com.cysharp.unitask": "2.4.1",
-        "com.styly.webrequest-visualscripting-nodes": "0.0.3"
+        "com.cysharp.unitask": "2.5.4",
+        "com.styly.webrequest-visualscripting-nodes": "0.0.5",
+        "com.segur.poly-spatial-environment-diffuse-shader": "0.3.0"
       }
     },
+    "com.segur.poly-spatial-environment-diffuse-shader": {
+      "version": "0.3.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://package.openupm.com"
+    },
     "com.styly.webrequest-visualscripting-nodes": {
-      "version": "0.0.3",
-      "depth": 0,
+      "version": "0.0.5",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.cysharp.unitask": "2.4.1",
-        "com.unity.visualscripting": "1.9.1"
+        "com.unity.visualscripting": "1.8.0"
       },
       "url": "https://package.openupm.com"
     },
@@ -229,27 +237,27 @@
       "url": "https://packages.unity.com"
     },
     "com.vrmc.gltf": {
-      "version": "0.115.0",
+      "version": "0.122.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.vrmc.vrmshaders": "0.115.0",
+        "com.vrmc.vrmshaders": "0.122.0",
         "com.unity.modules.animation": "1.0.0"
       },
       "url": "https://package.openupm.com"
     },
     "com.vrmc.vrm": {
-      "version": "0.115.0",
+      "version": "0.122.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.vrmc.vrmshaders": "0.115.0",
-        "com.vrmc.gltf": "0.115.0"
+        "com.vrmc.vrmshaders": "0.122.0",
+        "com.vrmc.gltf": "0.122.0"
       },
       "url": "https://package.openupm.com"
     },
     "com.vrmc.vrmshaders": {
-      "version": "0.115.0",
+      "version": "0.122.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {

diff --git a/VRM_VisualScriptingNodes/ProjectSettings/PackageManagerSettings.asset b/VRM_VisualScriptingNodes/ProjectSettings/PackageManagerSettings.asset
@@ -33,6 +33,7 @@ MonoBehaviour:
     - com.cysharp.unitask
     - com.styly.webrequest-visualscripting-nodes
     - com.vrmc
+    - com.segur.poly-spatial-environment-diffuse-shader
     m_IsDefault: 0
     m_Capabilities: 0
     m_ConfigSource: 4
@@ -41,6 +42,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -830
-    m_OriginalInstanceId: -834
+    m_UserModificationsInstanceId: -834
+    m_OriginalInstanceId: -838
   m_LoadAssets: 0