Skip to content

Commit cd783b9

Browse files
authored
Merge pull request #47 from from2001/develop
v0.1.11
2 parents fbe13d5 + 5b68a1f commit cd783b9

File tree

7 files changed

+46
-25
lines changed

7 files changed

+46
-25
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Add some useful features
9393

9494
### Vision OS Support
9595

96-
Shaders are replaced with `Universal Render Pipeline/Lit` shader on ViisonOS
96+
Shaders are replaced with [PolySpatialEnvironmentDiffuseShader](https://github.com/segurvita/PolySpatialEnvironmentDiffuseShader) shader on ViisonOS
9797

9898
### Avoid Multiple scripted importers error
9999

VRM_VisualScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/Runtime/Nodes/LoadVRM.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using VisualScriptingNodes;
1010
using STYLY.Http;
1111
using STYLY.Http.Service;
12+
using Segur.PolySpatialEnvironmentDiffuseShader.Runtime;
1213

1314
namespace VrmVisualScriptingNodes
1415
{
@@ -97,12 +98,20 @@ private async UniTask<Vrm10Instance> LoadVrm(string URL)
9798
return vrmInstance;
9899
}
99100
else
100-
{
101+
{
102+
// Set MaterialDescriptorGenerator for VisionOS
103+
104+
// Unlit Material
105+
// var MaterialDescriptorGenerator_visionOS = new UrpUnlitMaterialDescriptorGenerator();
106+
107+
// Environment Diffuse Shader Material By segurvita
108+
var MaterialDescriptorGenerator_visionOS = new EnvironmentDiffuseMaterialDescriptorGenerator();
109+
101110
Vrm10Instance vrmInstance = await Vrm10.LoadBytesAsync(
102111
VrmBytes,
103112
canLoadVrm0X: true,
104113
materialGenerator: GraphicsSettings.currentRenderPipeline is UniversalRenderPipelineAsset
105-
? new UrpUnlitMaterialDescriptorGenerator() : null
114+
? MaterialDescriptorGenerator_visionOS : null
106115
);
107116
return vrmInstance;
108117
}

VRM_VisualScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/Runtime/com.from2001.vrm-visualscripting-nodes.asmdef

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
"VrmLib",
1515
"VRMShaders.VRM10.MToon10.Runtime",
1616
"Unity.ShaderGraph.Utilities",
17-
"com.styly.webrequest-visualscripting-nodes"
17+
"com.styly.webrequest-visualscripting-nodes",
18+
"Unity.PolySpatialEnvironmentDiffuseShader"
1819
],
1920
"includePlatforms": [],
2021
"excludePlatforms": [],
2122
"allowUnsafeCode": false,
2223
"overrideReferences": false,
2324
"precompiledReferences": [],
24-
"autoReferenced": true,
25+
"autoReferenced": false,
2526
"defineConstraints": [],
2627
"versionDefines": [],
2728
"noEngineReferences": false

VRM_VisualScriptingNodes/Packages/com.from2001.vrm-visualscripting-nodes/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.from2001.vrm-visualscripting-nodes",
3-
"version": "0.1.10",
3+
"version": "0.1.11",
44
"displayName": "VRM Visual Scripting Nodes",
55
"description": "Unity Visual Scripting node library for VRM",
66
"unity": "2021.3",
@@ -9,10 +9,11 @@
99
"licensesUrl": "https://github.com/from2001/VRM_VisualScriptingNodes/blob/main/LICENSE",
1010
"dependencies": {
1111
"com.unity.visualscripting": "1.9.1",
12-
"com.vrmc.vrm": "0.115.0",
12+
"com.vrmc.vrm": "0.122.0",
1313
"com.unity.render-pipelines.universal": "10.10.1",
14-
"com.cysharp.unitask": "2.4.1",
15-
"com.styly.webrequest-visualscripting-nodes": "0.0.5"
14+
"com.cysharp.unitask": "2.5.4",
15+
"com.styly.webrequest-visualscripting-nodes": "0.0.5",
16+
"com.segur.poly-spatial-environment-diffuse-shader": "0.3.0"
1617
},
1718
"keywords": [
1819
"VRM",

VRM_VisualScriptingNodes/Packages/manifest.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
"scopes": [
4848
"com.cysharp.unitask",
4949
"com.styly.webrequest-visualscripting-nodes",
50-
"com.vrmc"
50+
"com.vrmc",
51+
"com.segur.poly-spatial-environment-diffuse-shader"
5152
]
5253
}
5354
]

VRM_VisualScriptingNodes/Packages/packages-lock.json

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.cysharp.unitask": {
4-
"version": "2.4.1",
4+
"version": "2.5.4",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {},
@@ -13,19 +13,27 @@
1313
"source": "embedded",
1414
"dependencies": {
1515
"com.unity.visualscripting": "1.9.1",
16-
"com.vrmc.vrm": "0.115.0",
16+
"com.vrmc.vrm": "0.122.0",
1717
"com.unity.render-pipelines.universal": "10.10.1",
18-
"com.cysharp.unitask": "2.4.1",
19-
"com.styly.webrequest-visualscripting-nodes": "0.0.3"
18+
"com.cysharp.unitask": "2.5.4",
19+
"com.styly.webrequest-visualscripting-nodes": "0.0.5",
20+
"com.segur.poly-spatial-environment-diffuse-shader": "0.3.0"
2021
}
2122
},
23+
"com.segur.poly-spatial-environment-diffuse-shader": {
24+
"version": "0.3.0",
25+
"depth": 1,
26+
"source": "registry",
27+
"dependencies": {},
28+
"url": "https://package.openupm.com"
29+
},
2230
"com.styly.webrequest-visualscripting-nodes": {
23-
"version": "0.0.3",
24-
"depth": 0,
31+
"version": "0.0.5",
32+
"depth": 1,
2533
"source": "registry",
2634
"dependencies": {
2735
"com.cysharp.unitask": "2.4.1",
28-
"com.unity.visualscripting": "1.9.1"
36+
"com.unity.visualscripting": "1.8.0"
2937
},
3038
"url": "https://package.openupm.com"
3139
},
@@ -229,27 +237,27 @@
229237
"url": "https://packages.unity.com"
230238
},
231239
"com.vrmc.gltf": {
232-
"version": "0.115.0",
240+
"version": "0.122.0",
233241
"depth": 2,
234242
"source": "registry",
235243
"dependencies": {
236-
"com.vrmc.vrmshaders": "0.115.0",
244+
"com.vrmc.vrmshaders": "0.122.0",
237245
"com.unity.modules.animation": "1.0.0"
238246
},
239247
"url": "https://package.openupm.com"
240248
},
241249
"com.vrmc.vrm": {
242-
"version": "0.115.0",
250+
"version": "0.122.0",
243251
"depth": 1,
244252
"source": "registry",
245253
"dependencies": {
246-
"com.vrmc.vrmshaders": "0.115.0",
247-
"com.vrmc.gltf": "0.115.0"
254+
"com.vrmc.vrmshaders": "0.122.0",
255+
"com.vrmc.gltf": "0.122.0"
248256
},
249257
"url": "https://package.openupm.com"
250258
},
251259
"com.vrmc.vrmshaders": {
252-
"version": "0.115.0",
260+
"version": "0.122.0",
253261
"depth": 2,
254262
"source": "registry",
255263
"dependencies": {

VRM_VisualScriptingNodes/ProjectSettings/PackageManagerSettings.asset

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ MonoBehaviour:
3333
- com.cysharp.unitask
3434
- com.styly.webrequest-visualscripting-nodes
3535
- com.vrmc
36+
- com.segur.poly-spatial-environment-diffuse-shader
3637
m_IsDefault: 0
3738
m_Capabilities: 0
3839
m_ConfigSource: 4
@@ -41,6 +42,6 @@ MonoBehaviour:
4142
m_RegistryInfoDraft:
4243
m_Modified: 0
4344
m_ErrorMessage:
44-
m_UserModificationsInstanceId: -830
45-
m_OriginalInstanceId: -834
45+
m_UserModificationsInstanceId: -834
46+
m_OriginalInstanceId: -838
4647
m_LoadAssets: 0

0 commit comments

Comments
 (0)