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

ExportExpression

Browse Source
This commit is contained in:
ousttrue
2021-04-08 17:15:56 +09:00
parent 4bf461a226
commit 50078af9bc
5 changed files with 138 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/VRM10/Editor/Vrm10ExportDialog.cs
View File

@@ -302,7 +302,8 @@ namespace UniVRM10
try
{
var model = new UniVRM10.RuntimeVrmConverter().ToModelFrom10(root);
var converter = new UniVRM10.RuntimeVrmConverter();
var model = converter.ToModelFrom10(root);
// if (MeshUtility.Validators.HumanoidValidator.HasRotationOrScale(root))
// {
@@ -316,11 +317,10 @@ namespace UniVRM10
m_logLabel += $"convert to right handed coordinate...\n";
model.ConvertCoordinate(VrmLib.Coordinates.Vrm1, ignoreVrm: false);
// var exportedBytes = GetGlb(model);
// export vrm-1.0
var exporter = new UniVRM10.Vrm10Exporter(AssetTextureUtil.IsTextureEditorAsset);
var option = new VrmLib.ExportArgs();
exporter.Export(root, model, option, Meta ? Meta : m_tmpMeta);
exporter.Export(root, model, converter, option, Meta ? Meta : m_tmpMeta);
var exportedBytes = exporter.Storage.ToBytes();

2
Assets/VRM10/Runtime/IO/ModelExtensions.cs
View File

@@ -12,7 +12,7 @@ namespace UniVRM10
{
// vrm = false
};
exporter10.Export(null, model, option);
exporter10.Export(null, model, null, option);
var glb10 = UniGLTF.Glb.Parse(exporter10.Storage.ToBytes());
return glb10.ToBytes();
}

146
Assets/VRM10/Runtime/IO/Vrm10Exporter.cs
View File

@@ -118,7 +118,7 @@ namespace UniVRM10
});
}
public void Export(GameObject root, Model model, ExportArgs option, VRM10MetaObject metaObject = null)
public void Export(GameObject root, Model model, RuntimeVrmConverter converter, ExportArgs option, VRM10MetaObject metaObject = null)
{
ExportAsset(model);
@@ -166,7 +166,7 @@ namespace UniVRM10
Storage.Gltf.materials.Add(glTFMaterial);
}
var (vrm, thumbnailTextureIndex) = ExportVrm(root, model, metaObject);
var (vrm, thumbnailTextureIndex) = ExportVrm(root, model, converter, metaObject);
// Extension で Texture が増える場合があるので最後に呼ぶ
for (int i = 0; i < m_textureExporter.Exported.Count; ++i)
@@ -184,12 +184,13 @@ namespace UniVRM10
}
(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm, int?) ExportVrm(GameObject root, Model model, VRM10MetaObject meta)
(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm, int?) ExportVrm(GameObject root, Model model, RuntimeVrmConverter converter, VRM10MetaObject meta)
{
if (meta is null)
var vrmController = root.GetComponent<VRM10Controller>();
if (meta == null)
{
var vrmController = root.GetComponent<VRM10Controller>();
if (vrmController is null || vrmController.Meta is null)
if (vrmController == null || vrmController.Meta == null)
{
throw new NullReferenceException("metaObject is null");
}
@@ -214,19 +215,138 @@ namespace UniVRM10
};
ExportHumanoid(vrm, model);
var thumbnailTextureIndex = ExportMeta(vrm, meta);
// meta
// expression
// lookAt
// firstPerson
if (vrmController != null)
{
ExportExpression(vrm, vrmController, model, converter);
// lookAt
// firstPerson
}
return (vrm, thumbnailTextureIndex);
}
UniGLTF.Extensions.VRMC_vrm.MorphTargetBind ExportMorphTargetBinding(MorphTargetBinding binding, Func<string, int> getIndex)
{
return new UniGLTF.Extensions.VRMC_vrm.MorphTargetBind
{
Node = getIndex(binding.RelativePath),
Index = binding.Index,
Weight = binding.Weight,
};
}
UniGLTF.Extensions.VRMC_vrm.MaterialColorBind ExportMaterialColorBinding(MaterialColorBinding binding, Func<string, int> getIndex)
{
return new UniGLTF.Extensions.VRMC_vrm.MaterialColorBind
{
Material = getIndex(binding.MaterialName),
Type = binding.BindType,
TargetValue = new float[] { binding.TargetValue.x, binding.TargetValue.y, binding.TargetValue.z, binding.TargetValue.w },
};
}
UniGLTF.Extensions.VRMC_vrm.TextureTransformBind ExportTextureTransformBinding(MaterialUVBinding binding, Func<string, int> getIndex)
{
return new UniGLTF.Extensions.VRMC_vrm.TextureTransformBind
{
Material = getIndex(binding.MaterialName),
Offset = new float[] { binding.Offset.x, binding.Offset.y },
Scaling = new float[] { binding.Scaling.x, binding.Scaling.y },
};
}
void ExportExpression(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, VRM10Controller vrmController, Model model, RuntimeVrmConverter converter)
{
if (vrmController?.Expression?.ExpressionAvatar?.Clips == null)
{
return;
}
vrm.Expressions = new List<UniGLTF.Extensions.VRMC_vrm.Expression>();
foreach (var e in vrmController.Expression.ExpressionAvatar.Clips)
{
var vrmExpression = new UniGLTF.Extensions.VRMC_vrm.Expression
{
Preset = e.Preset,
Name = e.ExpressionName,
IsBinary = e.IsBinary,
OverrideBlink = e.OverrideBlink,
OverrideLookAt = e.OverrideLookAt,
OverrideMouth = e.OverrideMouth,
MorphTargetBinds = new List<UniGLTF.Extensions.VRMC_vrm.MorphTargetBind>(),
MaterialColorBinds = new List<UniGLTF.Extensions.VRMC_vrm.MaterialColorBind>(),
TextureTransformBinds = new List<UniGLTF.Extensions.VRMC_vrm.TextureTransformBind>(),
};
foreach (var b in e.MorphTargetBindings)
{
try
{
Func<string, int> getIndex = relativePath =>
{
var rendererNode = vrmController.transform.GetFromPath(relativePath);
var node = converter.Nodes[rendererNode.gameObject];
return model.Nodes.IndexOf(node);
};
vrmExpression.MorphTargetBinds.Add(ExportMorphTargetBinding(b, getIndex));
}
catch (Exception ex)
{
Debug.LogWarning(ex);
}
}
foreach (var b in e.MaterialColorBindings)
{
try
{
Func<string, int> getIndex = materialName =>
{
for (int i = 0; i < model.Materials.Count; ++i)
{
var m = model.Materials[i] as Material;
if (m.name == materialName)
{
return i;
}
}
throw new KeyNotFoundException();
};
vrmExpression.MaterialColorBinds.Add(ExportMaterialColorBinding(b, getIndex));
}
catch (Exception ex)
{
Debug.LogWarning(ex);
}
}
foreach (var b in e.MaterialUVBindings)
{
try
{
Func<string, int> getIndex = materialName =>
{
for (int i = 0; i < model.Materials.Count; ++i)
{
var m = model.Materials[i] as Material;
if (m.name == materialName)
{
return i;
}
}
throw new KeyNotFoundException();
};
vrmExpression.TextureTransformBinds.Add(ExportTextureTransformBinding(b, getIndex));
}
catch (Exception ex)
{
Debug.LogWarning(ex);
}
}
vrm.Expressions.Add(vrmExpression);
}
}
int? ExportMeta(UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm, VRM10MetaObject meta)
{
vrm.Meta.Name = meta.Name;

2
Assets/VRM10/Runtime/Scenes/ExportDebugUtil.cs
View File

@@ -27,7 +27,7 @@ public static class ExportDebugUtil
{
// vrm = false
};
exporter10.Export(null, model, option);
exporter10.Export(null, model, null, option);
var glbBytes10 = exporter10.Storage.ToBytes();
var glb10 = UniGLTF.Glb.Parse(glbBytes10);
return System.Text.Encoding.UTF8.GetString(glb10.Json.Bytes.Array, glb10.Json.Bytes.Offset, glb10.Json.Bytes.Count);

11
Assets/VRM10/vrmlib/Runtime/Extensions/ArraySegmentExtensions.cs.meta
View File

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