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

Merge branch 'master' into fix/webgl_build

Browse Source
This commit is contained in:
ousttrue
2025-01-27 19:47:49 +09:00
committed by GitHub
parent 6536238722 4fcdd0cde0
commit 721f007e7d
10 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/VRM10/Editor/Components/SpringBone/VRM10SpringBoneColliderGroupEditor.cs
View File

@@ -43,7 +43,11 @@ namespace UniVRM10
{
bindingPath = nameof(VRM10SpringBoneColliderGroup.Colliders)
};
#if UNITY_2022_3_OR_NEWER
m_colliders.selectionChanged += (e) =>
#else
m_colliders.onSelectionChange += (e) =>
#endif
{
var item = (SerializedProperty)e.FirstOrDefault();
if (item == null)

4
Assets/VRM10/Editor/Vrm10InstanceEditor.cs
View File

@@ -309,7 +309,11 @@ namespace UniVRM10
root.Add(m_springs);
var selected = new PropertyField();
#if UNITY_2022_3_OR_NEWER
m_springs.selectedIndicesChanged += (e) =>
#else
m_springs.onSelectedIndicesChange += (e) =>
#endif
{
var values = e.ToArray();
if (values.Length > 0)

31
Assets/VRM10/Runtime/Components/VrmAnimationInstance/Vrm10AnimationInstance.cs
View File

@@ -3,10 +3,11 @@ using System.Collections.Generic;
using UniGLTF;
using UniHumanoid;
using UnityEngine;
using UnityEngine.Timeline;
namespace UniVRM10
{
public class Vrm10AnimationInstance : MonoBehaviour, IVrm10Animation
public class Vrm10AnimationInstance : MonoBehaviour, IVrm10Animation, ITimeControl
{
public SkinnedMeshRenderer BoxMan;
public void ShowBoxMan(bool enable)
@@ -330,5 +331,33 @@ namespace UniVRM10
}
}
}
Animation m_animation;
AnimationState m_state;
void ITimeControl.OnControlTimeStart()
{
m_animation = GetComponent<Animation>();
foreach (AnimationState state in m_animation)
{
m_state = state;
break;
}
m_state.speed = 0;
m_state.enabled = true;
m_animation.Play();
}
void ITimeControl.OnControlTimeStop()
{
m_animation.Stop();
m_state = null;
}
void ITimeControl.SetTime(double time)
{
m_state.time = (float)time;
m_animation.Sample();
}
}
}

3
Assets/VRM10/Runtime/VRM10.asmdef
View File

@@ -9,7 +9,8 @@
"GUID:f2ca1407928ebdc4bbe7765cc278be44",
"GUID:2665a8d13d1b3f18800f46e256720795",
"GUID:1cd941934d098654fa21a13f28346412",
"GUID:3e5d614bc16b50d41bd94c8d7444ca46"
"GUID:3e5d614bc16b50d41bd94c8d7444ca46",
"GUID:f06555f75b070af458a003d92f9efb00"
],
"includePlatforms": [],
"excludePlatforms": [],

3
Assets/VRM10_Samples/ClothSample/ClothViewer/ClothViewer.asmdef
View File

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

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

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

1
Packages/manifest.json
View File

@@ -10,6 +10,7 @@
"com.unity.postprocessing": "3.4.0",
"com.unity.render-pipelines.universal": "14.0.11",
"com.unity.test-framework": "1.1.33",
"com.unity.timeline": "1.7.6",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

12
Packages/packages-lock.json
View File

@@ -141,6 +141,18 @@
},
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.7.6",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
"depth": 0,

16
ProjectSettings/TimelineSettings.asset Normal file
View File

@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 53
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
m_Name:
m_EditorClassIdentifier:
assetDefaultFramerate: 60
m_DefaultFrameRate: 60

2
README.md
View File

@@ -35,7 +35,7 @@ UniVRM can import/export following supported file types at both runtime and edit
## Supported Environments
The latest UniVRM supports Unity 2021.3 LTS or later.
The latest UniVRM supports Unity 2022.3 LTS or later from `v0.128.0`.
UniVRM supports scripting backends both .NET and IL2CPP.