Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-20 17:45:22 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2716 from ousttrue/version/v0_130_0

Browse Source 
UniVRM-0.130.0
This commit is contained in:
ousttrue
2025-08-27 13:36:00 +09:00
committed by GitHub
parent 634d1b6043 ac8394e909
commit 40cccce0fc
16 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,8 +4,8 @@ namespace UniGLTF
public static partial class PackageVersion
{
public const int MAJOR = 0;
public const int MINOR = 129;
public const int PATCH = 3;
public const string VERSION = "0.129.3";
public const int MINOR = 130;
public const int PATCH = 0;
public const string VERSION = "0.130.0";
}
}

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

@@ -4,8 +4,8 @@ namespace UniGLTF
public static partial class UniGLTFVersion
{
public const int MAJOR = 2;
public const int MINOR = 65;
public const int PATCH = 3;
public const string VERSION = "2.65.3";
public const int MINOR = 66;
public const int PATCH = 0;
public const string VERSION = "2.66.0";
}
}

2
Assets/UniGLTF/package.json
View File

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

3
Assets/VRM/Samples~/SimpleViewer/VRM.Samples.SimpleViewer.asmdef
View File

@@ -6,7 +6,8 @@
"GUID:1cd941934d098654fa21a13f28346412",
"GUID:b7aa47b240b57de44a4b2021c143c9bf",
"GUID:05dd262a0c0a2f841b8252c8c3815582",
"GUID:3e5d614bc16b50d41bd94c8d7444ca46"
"GUID:3e5d614bc16b50d41bd94c8d7444ca46",
"GUID:d8b63aba1907145bea998dd612889d6b"
],
"includePlatforms": [],
"excludePlatforms": [],

10
Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
View File

@@ -343,15 +343,15 @@ namespace VRM.SimpleViewer
m_loaded.EnableLipSyncValue = m_enableLipSync.isOn;
m_loaded.EnableBlinkValue = m_enableAutoBlink.isOn;
m_loaded.SetSpringboneModelLevel(new UniGLTF.SpringBoneJobs.Blittables.BlittableModelLevel
{
ExternalForce = new Vector3(
(
externalForce: new Vector3(
m_springExternalX.value,
m_springExternalY.value,
m_springExternalZ.value
),
StopSpringBoneWriteback = m_springBonePause.isOn,
SupportsScalingAtRuntime = m_springBoneScaling.isOn,
});
stopSpringBoneWriteback: m_springBonePause.isOn,
supportsScalingAtRuntime: m_springBoneScaling.isOn
));
m_loaded.Update();
}
}

4
Assets/VRM/package.json
View File

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

3
Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarp.asmdef
View File

@@ -6,7 +6,8 @@
"GUID:e47c917724578cc43b5506c17a27e9a0",
"GUID:8d76e605759c3f64a957d63ef96ada7c",
"GUID:1cd941934d098654fa21a13f28346412",
"GUID:5f875fdc81c40184c8333b9d63c6ddd5"
"GUID:5f875fdc81c40184c8333b9d63c6ddd5",
"GUID:d8b63aba1907145bea998dd612889d6b"
],
"includePlatforms": [],
"excludePlatforms": [],

7
Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/ClothWarpRuntime.cs
View File

@@ -135,12 +135,7 @@ namespace UniVRM10.ClothWarp
// }
}
public void Process()
{
Process(Time.deltaTime);
}
void Process(float deltaTime)
public void Process(float deltaTime)
{
if (!_initialized)
{

19
Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/ClothWarpJobRuntime.cs
View File

@@ -193,14 +193,12 @@ namespace UniVRM10.ClothWarp.Jobs
var colliderTransformIndex = GetOrAddColliderTransform(collider.transform);
colliderRef.Add(colliderInfo.Count);
colliderInfo.Add(new BlittableCollider
{
offset = collider.Offset,
radius = collider.Radius,
tailOrNormal = collider.TailOrNormal,
colliderType = TranslateColliderType(collider.ColliderType),
transformIndex = colliderTransformIndex,
});
colliderInfo.Add(new BlittableCollider(
offset: collider.Offset,
radius: collider.Radius,
tailOrNormal: collider.TailOrNormal,
colliderType: TranslateColliderType(collider.ColliderType),
colliderTransformIndex: colliderTransformIndex));
_colliders.Add(collider);
}
@@ -410,11 +408,6 @@ namespace UniVRM10.ClothWarp.Jobs
}
}
public void Process()
{
Process(Time.deltaTime);
}
public void Process(float deltaTime)
{
var frame = new FrameInfo(deltaTime, Vector3.zero);

14
Assets/VRM10/Samples~/ClothSample/ClothWarp/Runtime/Jobs/Particle.cs
View File

@@ -39,14 +39,12 @@ namespace UniVRM10.ClothWarp.Jobs
public BlittableJointMutable ToBlittableJointMutable()
{
return new BlittableJointMutable
{
stiffnessForce = Stiffness,
gravityPower = 1.0f,
gravityDir = Gravity,
dragForce = Deceleration,
radius = Radius,
};
return new BlittableJointMutable(
stiffnessForce: Stiffness,
gravityPower: 1.0f,
gravityDir: Gravity,
dragForce: Deceleration,
radius: Radius);
}
}

4
Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UnlitMaterialImporter.cs
View File

@@ -4,9 +4,11 @@ namespace UniVRM10.VRM10Viewer
{
class UnlitMaterialImporter : IMaterialImporter
{
public BuiltInGltfUnlitMaterialImporter GltfUnlitMaterialImporter { get; } = new();
bool IMaterialImporter.TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
{
return BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc);
return GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc);
}
}
}

4
Assets/VRM10/Samples~/VRM10Viewer/MaterialImporter/UrpMToonMaterialImporter.cs
View File

@@ -7,9 +7,11 @@ namespace UniVRM10.VRM10Viewer
/// </summary>
public class UrpMToonMaterialImporter : IMaterialImporter
{
public UrpVrm10MToonMaterialImporter MToonMaterialImporter { get; } = new();
public bool TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
{
if (UrpVrm10MToonMaterialImporter.TryCreateParam(data, i, out matDesc))
if (MToonMaterialImporter.TryCreateParam(data, i, out matDesc))
{
return true;
}

11
Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs
View File

@@ -185,15 +185,14 @@ namespace UniVRM10.VRM10Viewer
m_controller.ShowBoxMan(m_showBoxMan.value);
if (m_controller.TryUpdate(
m_motionMode.value == 0,
new BlittableModelLevel
{
ExternalForce = new Vector3(
new BlittableModelLevel(
externalForce: new Vector3(
m_springboneExternalX.value,
m_springboneExternalY.value,
m_springboneExternalZ.value),
StopSpringBoneWriteback = m_useSpringbonePause.value,
SupportsScalingAtRuntime = m_useSpringboneScaling.value,
},
stopSpringBoneWriteback: m_useSpringbonePause.value,
supportsScalingAtRuntime: m_useSpringboneScaling.value
),
out var loaded
))
{

3
Assets/VRM10/Samples~/VRM10Viewer/VRM10.Samples.VRM10Viewer.asmdef
View File

@@ -7,7 +7,8 @@
"GUID:e47c917724578cc43b5506c17a27e9a0",
"GUID:1cd941934d098654fa21a13f28346412",
"GUID:3e5d614bc16b50d41bd94c8d7444ca46",
"GUID:f06555f75b070af458a003d92f9efb00"
"GUID:f06555f75b070af458a003d92f9efb00",
"GUID:d8b63aba1907145bea998dd612889d6b"
],
"includePlatforms": [],
"excludePlatforms": [],

11
Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs
View File

@@ -226,12 +226,11 @@ namespace UniVRM10.VRM10Viewer
m_controller.ShowBoxMan(m_showBoxMan.isOn);
if (m_controller.TryUpdate(
m_ui.IsTPose,
new BlittableModelLevel
{
ExternalForce = new Vector3(m_springboneExternalX.value, m_springboneExternalY.value, m_springboneExternalZ.value),
StopSpringBoneWriteback = m_springbonePause.isOn,
SupportsScalingAtRuntime = m_springboneScaling.isOn,
},
new BlittableModelLevel(
externalForce: new Vector3(m_springboneExternalX.value, m_springboneExternalY.value, m_springboneExternalZ.value),
stopSpringBoneWriteback: m_springbonePause.isOn,
supportsScalingAtRuntime: m_springboneScaling.isOn
),
out var loaded
))
{

4
Assets/VRM10/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.129.3",
"version": "0.130.0",
"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.3"
"com.vrmc.gltf": "0.130.0"
},
"samples": [
{