Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-12 05:48:47 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into burstCompatible

Browse Source
This commit is contained in:
ousttrue
2025-07-14 17:32:51 +09:00
committed by GitHub
parent e477cf9fdf ddf262e63e
commit 98b13abf1c
10 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
View File

@@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 0;
public const int MINOR = 129;
public const int PATCH = 2;
public const string VERSION = "0.129.2";
public const int PATCH = 3;
public const string VERSION = "0.129.3";
}
}

4
Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
View File

@@ -5,7 +5,7 @@ namespace UniGLTF
{
public const int MAJOR = 2;
public const int MINOR = 65;
public const int PATCH = 2;
public const string VERSION = "2.65.2";
public const int PATCH = 3;
public const string VERSION = "2.65.3";
}
}

4
Assets/UniGLTF/Runtime/UniHumanoid/AvatarDescription.cs
View File

@@ -98,7 +98,9 @@ namespace UniHumanoid
{
map[t.name] = t;
}
return human.Select(x => (map[x.boneName], x.humanBone));
return human
.Where(x => !string.IsNullOrEmpty(x.boneName) && map.ContainsKey(x.boneName))
.Select(x => (map[x.boneName], x.humanBone));
}
public Avatar CreateAvatarAndSetup(Transform root)

2
Assets/UniGLTF/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.129.2",
"version": "0.129.3",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2021.3",

4
Assets/VRM/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.129.2",
"version": "0.129.3",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2021.3",
@@ -14,7 +14,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.gltf": "0.129.2",
"com.vrmc.gltf": "0.129.3",
"com.unity.ugui": "1.0.0"
},
"samples": [

18
Assets/VRM10/MToon10/Shaders/vrmc_materials_mtoon_render_pipeline.hlsl
View File

@@ -52,11 +52,11 @@
#ifdef MTOON_URP
#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
#define MTOON_SHADOW_COORD input.shadowCoord
#define MTOON_SHADOW_COORD(input) input.shadowCoord
#elif defined(MAIN_LIGHT_CALCULATE_SHADOWS)
#define MTOON_SHADOW_COORD TransformWorldToShadowCoord(input.positionWS)
#define MTOON_SHADOW_COORD(input) TransformWorldToShadowCoord(input.positionWS)
#else
#define MTOON_SHADOW_COORD float4(0, 0, 0, 0)
#define MTOON_SHADOW_COORD(input) float4(0, 0, 0, 0)
#endif
#if defined(SHADOWS_SHADOWMASK) && defined(LIGHTMAP_ON)
@@ -70,7 +70,7 @@
#define MTOON_LIGHT_DESCRIPTION(input, atten, lightDir, lightColor) \
const half3 lightDir = _MainLightPosition.xyz; \
const half3 lightColor = _MainLightColor.rgb; \
const float atten = MainLightShadow(MTOON_SHADOW_COORD, input.positionWS, MTOON_SAMPLE_SHADOWMASK(input.lightmapUV), _MainLightOcclusionProbes);
const float atten = MainLightShadow(MTOON_SHADOW_COORD(input), input.positionWS, MTOON_SAMPLE_SHADOWMASK(input.lightmapUV), _MainLightOcclusionProbes);
#else
@@ -85,22 +85,22 @@
#ifdef MTOON_URP
#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
#define MTOON_TRANSFER_FOG_AND_LIGHTING(o, outpos, coord, vertex) \
#define MTOON_TRANSFER_FOG_AND_LIGHTING(output, outpos, coord, vertex) \
OUTPUT_LIGHTMAP_UV(coord.xy, unity_LightmapST, output.lightmapUV); \
OUTPUT_SH(output.normalWS.xyz, output.vertexSH); \
output.fogFactorAndVertexLight = half4(ComputeFogFactor(outpos.z), VertexLighting(output.positionWS, output.normalWS)); \
output.shadowCoord = GetShadowCoord(GetVertexPositionInputs(vertex.xyz));
#else
#define MTOON_TRANSFER_FOG_AND_LIGHTING(o, outpos, coord, vertex) \
#define MTOON_TRANSFER_FOG_AND_LIGHTING(output, outpos, coord, vertex) \
OUTPUT_LIGHTMAP_UV(coord.xy, unity_LightmapST, output.lightmapUV); \
OUTPUT_SH(output.normalWS.xyz, output.vertexSH); \
output.fogFactorAndVertexLight = half4(ComputeFogFactor(outpos.z), VertexLighting(output.positionWS, output.normalWS));
#endif
#else
#define MTOON_TRANSFER_FOG_AND_LIGHTING(o, outpos, coord, vertex) \
UNITY_TRANSFER_FOG(o, outpos); \
UNITY_TRANSFER_LIGHTING(o, coord.xy);
#define MTOON_TRANSFER_FOG_AND_LIGHTING(output, outpos, coord, vertex) \
UNITY_TRANSFER_FOG(output, outpos); \
UNITY_TRANSFER_LIGHTING(output, coord.xy);
#endif
// SampleSH

5
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@@ -590,7 +590,10 @@ namespace UniVRM10
if (gltfSpring.ColliderGroups != null)
{
spring.ColliderGroups = gltfSpring.ColliderGroups.Select(x => controller.SpringBone.ColliderGroups[x]).ToList();
spring.ColliderGroups = gltfSpring.ColliderGroups
// VRM1_Constraint_Twist_Sample_Plane.vrm
.Where(x => x >= 0 && x < controller.SpringBone.ColliderGroups.Count)
.Select(x => controller.SpringBone.ColliderGroups[x]).ToList();
}
// joint
foreach (var gltfJoint in gltfSpring.Joints)

4
Assets/VRM10/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.129.2",
"version": "0.129.3",
"displayName": "VRM-1.0",
"description": "VRM-1.0 importer",
"unity": "2021.3",
@@ -15,7 +15,7 @@
},
"dependencies": {
"com.unity.timeline": "1.7.6",
"com.vrmc.gltf": "0.129.2"
"com.vrmc.gltf": "0.129.3"
},
"samples": [
{

1
Packages/manifest.json
View File

@@ -4,6 +4,7 @@
"com.unity.cloud.ktx": "3.3.0",
"com.unity.cloud.ktx.webgl-2022": "1.0.1",
"com.unity.ide.rider": "3.0.36",
"com.unity.ide.visualstudio": "2.0.23",
"com.unity.postprocessing": "3.4.0",
"com.unity.render-pipelines.universal": "17.0.4",
"com.unity.test-framework": "1.1.33",

9
Packages/packages-lock.json
View File

@@ -42,6 +42,15 @@
},
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.23",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.6",
"depth": 1,