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

VrmAnimationImporter

Browse Source
This commit is contained in:
ousttrue
2023-06-14 16:23:54 +09:00
parent b9293f0c14
commit 122f15fc42
8 changed files with 212 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
Assets/VRM10_Samples/VRM10Viewer/VRM10Motion.cs → Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs
View File

@@ -1,121 +1,27 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using UniGLTF;
using UniHumanoid;
using UniJSON;
using UnityEngine;
using UniVRM10;
using VRMShaders;
namespace UniVRM10.VRM10Viewer
namespace UniVRM10
{
public interface IMotion : IDisposable
public class VrmAnimationImporter : UniGLTF.ImporterContext
{
(INormalizedPoseProvider, ITPoseProvider) ControlRig { get; }
IDictionary<ExpressionKey, Transform> ExpressionMap { get; }
void ShowBoxMan(bool enable);
}
public class BvhMotion : IMotion
{
UniHumanoid.BvhImporterContext m_context;
public Transform Root => m_context?.Root.transform;
public SkinnedMeshRenderer m_boxMan;
public SkinnedMeshRenderer BoxMan => m_boxMan;
(INormalizedPoseProvider, ITPoseProvider) m_controlRig;
(INormalizedPoseProvider, ITPoseProvider) IMotion.ControlRig => m_controlRig;
public IDictionary<ExpressionKey, Transform> ExpressionMap { get; } = new Dictionary<ExpressionKey, Transform>();
public BvhMotion(UniHumanoid.BvhImporterContext context)
public VrmAnimationImporter(GltfData data,
IReadOnlyDictionary<SubAssetKey, UnityEngine.Object> externalObjectMap = null,
ITextureDeserializer textureDeserializer = null,
IMaterialDescriptorGenerator materialGenerator = null)
: base(data, externalObjectMap, textureDeserializer, materialGenerator)
{
m_context = context;
var provider = new AnimatorPoseProvider(m_context.Root.transform, m_context.Root.GetComponent<Animator>());
m_controlRig = (provider, provider);
// create SkinnedMesh for bone visualize
var animator = m_context.Root.GetComponent<Animator>();
m_boxMan = SkeletonMeshUtility.CreateRenderer(animator);
var material = new Material(Shader.Find("Standard"));
BoxMan.sharedMaterial = material;
var mesh = BoxMan.sharedMesh;
mesh.name = "box-man";
}
public static BvhMotion LoadBvhFromText(string source, string path = "tmp.bvh")
{
var context = new UniHumanoid.BvhImporterContext();
context.Parse(path, source);
context.Load();
return new BvhMotion(context);
}
public static BvhMotion LoadBvhFromPath(string path)
{
return LoadBvhFromText(File.ReadAllText(path), path);
}
public void ShowBoxMan(bool enable)
{
m_boxMan.enabled = enable;
}
public void Dispose()
{
GameObject.Destroy(m_context.Root);
}
}
public class VrmAnimation : IMotion
{
UniGLTF.RuntimeGltfInstance m_instance;
public SkinnedMeshRenderer m_boxMan;
public SkinnedMeshRenderer BoxMan => m_boxMan;
(INormalizedPoseProvider, ITPoseProvider) m_controlRig;
(INormalizedPoseProvider, ITPoseProvider) IMotion.ControlRig => m_controlRig;
public IDictionary<ExpressionKey, Transform> ExpressionMap { get; } = new Dictionary<ExpressionKey, Transform>();
public VrmAnimation(UniGLTF.RuntimeGltfInstance instance)
{
m_instance = instance;
if (instance.GetComponent<Animation>() is Animation animation)
{
animation.Play();
}
var humanoid = instance.gameObject.AddComponent<Humanoid>();
if (humanoid.AssignBonesFromAnimator())
{
var provider = new InitRotationPoseProvider(instance.transform, humanoid);
m_controlRig = (provider, provider);
// create SkinnedMesh for bone visualize
var animator = instance.GetComponent<Animator>();
m_boxMan = SkeletonMeshUtility.CreateRenderer(animator);
var material = new Material(Shader.Find("Standard"));
BoxMan.sharedMaterial = material;
var mesh = BoxMan.sharedMesh;
mesh.name = "box-man";
}
}
public void ShowBoxMan(bool enable)
{
if (m_boxMan != null)
{
m_boxMan.enabled = enable;
}
}
public void Dispose()
{
if (m_boxMan != null)
{
GameObject.Destroy(m_boxMan.gameObject);
}
}
static int? GetNodeIndex(UniGLTF.Extensions.VRMC_vrm_animation.Humanoid humanoid, HumanBodyBones bone)
private static int? GetNodeIndex(UniGLTF.Extensions.VRMC_vrm_animation.Humanoid humanoid, HumanBodyBones bone)
{
switch (bone)
{
@@ -178,10 +84,10 @@ namespace UniVRM10.VRM10Viewer
return default;
}
static Dictionary<HumanBodyBones, Transform> GetHumanMap(GltfData data, IReadOnlyList<Transform> nodes)
public Dictionary<HumanBodyBones, Transform> GetHumanMap()
{
var humanMap = new Dictionary<HumanBodyBones, Transform>();
if (data.GLTF.extensions is UniGLTF.glTFExtensionImport extensions)
if (Data.GLTF.extensions is UniGLTF.glTFExtensionImport extensions)
{
foreach (var kv in extensions.ObjectItems())
{
@@ -196,7 +102,7 @@ namespace UniVRM10.VRM10Viewer
var node = GetNodeIndex(animation.Humanoid, bone);
if (node.HasValue)
{
humanMap.Add(bone, nodes[node.Value]);
humanMap.Add(bone, Nodes[node.Value]);
}
}
}
@@ -206,10 +112,10 @@ namespace UniVRM10.VRM10Viewer
return humanMap;
}
static List<(ExpressionKey, Transform)> GetExpressions(GltfData data, IReadOnlyList<Transform> nodes)
public List<(ExpressionKey, Transform)> GetExpressions()
{
var expressions = new List<(ExpressionKey, Transform)>();
if (data.GLTF.extensions is UniGLTF.glTFExtensionImport extensions)
if (Data.GLTF.extensions is UniGLTF.glTFExtensionImport extensions)
{
foreach (var kv in extensions.ObjectItems())
{
@@ -223,7 +129,7 @@ namespace UniVRM10.VRM10Viewer
var node = GetNodeIndex(animation.Expressions, preset);
if (node.HasValue)
{
expressions.Add((ExpressionKey.CreateFromPreset(preset), nodes[node.Value]));
expressions.Add((ExpressionKey.CreateFromPreset(preset), Nodes[node.Value]));
}
}
}
@@ -259,40 +165,27 @@ namespace UniVRM10.VRM10Viewer
return default;
}
public static async Task<VrmAnimation> LoadVrmAnimationFromPathAsync(string path)
public override async Task<RuntimeGltfInstance> LoadAsync(IAwaitCaller awaitCaller, Func<string, IDisposable> measureTime = null)
{
//
// GetHumanoid Mapping
//
using (GltfData data = new AutoGltfFileParser(path).Parse())
using (var loader = new UniGLTF.ImporterContext(data))
var instance = await base.LoadAsync(awaitCaller, measureTime);
// VRMA-humanoid
var humanMap = GetHumanMap();
if (humanMap.Count > 0)
{
loader.InvertAxis = Axes.X;
var instance = await loader.LoadAsync(new ImmediateCaller());
// VRMA-humanoid
var humanMap = GetHumanMap(data, loader.Nodes);
if (humanMap.Count > 0)
{
var description = AvatarDescription.Create(humanMap);
//
// avatar
//
var avatar = description.CreateAvatar(instance.Root.transform);
avatar.name = "Avatar";
// AvatarDescription = description;
var animator = instance.gameObject.AddComponent<Animator>();
animator.avatar = avatar;
}
// VRMA-expression
var animation = new VrmAnimation(instance);
foreach (var (preset, transform) in GetExpressions(data, loader.Nodes))
{
animation.ExpressionMap.Add(preset, transform);
}
return animation;
var description = AvatarDescription.Create(humanMap);
//
// avatar
//
var avatar = description.CreateAvatar(instance.Root.transform);
avatar.name = "Avatar";
// AvatarDescription = description;
var animator = instance.gameObject.AddComponent<Animator>();
animator.avatar = avatar;
}
return instance;
}
}
}

2
Assets/VRM10_Samples/VRM10Viewer/VRM10Motion.cs.meta → Assets/VRM10/Runtime/IO/VrmAnimationImporter.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 08f06b12436bf594b9982c6a8ec71374
guid: 0381f410b38d5184baa6f28213608810
MonoImporter:
externalObjects: {}
serializedVersion: 2

54
Assets/VRM10_Samples/VRM10Viewer/Motions/BvhMotion.cs Normal file
View File

@@ -0,0 +1,54 @@
using System.Collections.Generic;
using System.IO;
using UniHumanoid;
using UnityEngine;
namespace UniVRM10.VRM10Viewer
{
public class BvhMotion : IMotion
{
UniHumanoid.BvhImporterContext m_context;
public Transform Root => m_context?.Root.transform;
public SkinnedMeshRenderer m_boxMan;
public SkinnedMeshRenderer BoxMan => m_boxMan;
(INormalizedPoseProvider, ITPoseProvider) m_controlRig;
(INormalizedPoseProvider, ITPoseProvider) IMotion.ControlRig => m_controlRig;
public IDictionary<ExpressionKey, Transform> ExpressionMap { get; } = new Dictionary<ExpressionKey, Transform>();
public BvhMotion(UniHumanoid.BvhImporterContext context)
{
m_context = context;
var provider = new AnimatorPoseProvider(m_context.Root.transform, m_context.Root.GetComponent<Animator>());
m_controlRig = (provider, provider);
// create SkinnedMesh for bone visualize
var animator = m_context.Root.GetComponent<Animator>();
m_boxMan = SkeletonMeshUtility.CreateRenderer(animator);
var material = new Material(Shader.Find("Standard"));
BoxMan.sharedMaterial = material;
var mesh = BoxMan.sharedMesh;
mesh.name = "box-man";
}
public static BvhMotion LoadBvhFromText(string source, string path = "tmp.bvh")
{
var context = new UniHumanoid.BvhImporterContext();
context.Parse(path, source);
context.Load();
return new BvhMotion(context);
}
public static BvhMotion LoadBvhFromPath(string path)
{
return LoadBvhFromText(File.ReadAllText(path), path);
}
public void ShowBoxMan(bool enable)
{
m_boxMan.enabled = enable;
}
public void Dispose()
{
GameObject.Destroy(m_context.Root);
}
}
}

11
Assets/VRM10_Samples/VRM10Viewer/Motions/BvhMotion.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8bed75b815cb24843a50063a9dd7376e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/VRM10_Samples/VRM10Viewer/Motions/IMotion.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using UnityEngine;
namespace UniVRM10.VRM10Viewer
{
public interface IMotion : IDisposable
{
(INormalizedPoseProvider, ITPoseProvider) ControlRig { get; }
IDictionary<ExpressionKey, Transform> ExpressionMap { get; }
void ShowBoxMan(bool enable);
}
}

11
Assets/VRM10_Samples/VRM10Viewer/Motions/IMotion.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: bd8db8a4bdc3e7f40a0a7a1bcd554137
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

76
Assets/VRM10_Samples/VRM10Viewer/Motions/VrmAnimation.cs Normal file
View File

@@ -0,0 +1,76 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using UniGLTF;
using UniHumanoid;
using UnityEngine;
using VRMShaders;
namespace UniVRM10.VRM10Viewer
{
public class VrmAnimation : IMotion
{
private RuntimeGltfInstance m_instance;
public SkinnedMeshRenderer m_boxMan;
public SkinnedMeshRenderer BoxMan => m_boxMan;
private (INormalizedPoseProvider, ITPoseProvider) m_controlRig;
(INormalizedPoseProvider, ITPoseProvider) IMotion.ControlRig => m_controlRig;
public IDictionary<ExpressionKey, Transform> ExpressionMap { get; } = new Dictionary<ExpressionKey, Transform>();
public VrmAnimation(RuntimeGltfInstance instance)
{
m_instance = instance;
if (instance.GetComponent<Animation>() is Animation animation)
{
animation.Play();
}
var humanoid = instance.gameObject.AddComponent<Humanoid>();
if (humanoid.AssignBonesFromAnimator())
{
var provider = new InitRotationPoseProvider(instance.transform, humanoid);
m_controlRig = (provider, provider);
// create SkinnedMesh for bone visualize
var animator = instance.GetComponent<Animator>();
m_boxMan = SkeletonMeshUtility.CreateRenderer(animator);
var material = new Material(Shader.Find("Standard"));
BoxMan.sharedMaterial = material;
var mesh = BoxMan.sharedMesh;
mesh.name = "box-man";
}
}
public void ShowBoxMan(bool enable)
{
if (m_boxMan != null)
{
m_boxMan.enabled = enable;
}
}
public void Dispose()
{
if (m_boxMan != null)
{
GameObject.Destroy(m_boxMan.gameObject);
}
}
public static async Task<VrmAnimation> LoadVrmAnimationFromPathAsync(string path)
{
using (GltfData data = new AutoGltfFileParser(path).Parse())
using (var loader = new VrmAnimationImporter(data))
{
loader.InvertAxis = Axes.X;
var instance = await loader.LoadAsync(new ImmediateCaller());
var animation = new VrmAnimation(instance);
foreach (var (preset, transform) in loader.GetExpressions())
{
animation.ExpressionMap.Add(preset, transform);
}
return animation;
}
}
}
}

11
Assets/VRM10_Samples/VRM10Viewer/Motions/VrmAnimation.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f0180f844d447bc45889d6c72a2d4ec4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: