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

Merge branch 'master' into fix/collider_editor

Browse Source
This commit is contained in:
ousttrue
2024-11-29 17:31:53 +09:00
committed by GitHub
parent 5f5eaa641b 69c5405035
commit 0abe403afe
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/VRM/Editor/Format/VRMExportOptions.cs
View File

@@ -12,6 +12,10 @@ namespace VRM
[LangMsg(Languages.en, "Model's normalization (bake to remove roation and scaling from the hierarchy)")]
NORMALIZE,
[LangMsg(Languages.ja, "正規化するときににブレンドシェイプによる変形をベイク処理します。")]
[LangMsg(Languages.en, "Bake the blendshape deformations as the base model when normalizing.")]
FREEZE_BLENDSHAPE,
[LangMsg(Languages.ja, "エクスポート時に新しいJsonSerializerを使う")]
[LangMsg(Languages.en, "The new version of JsonSerializer for model export")]
USE_GENERATED_SERIALIZER,

2
Assets/VRM/Editor/Format/VRMExportSettings.cs
View File

@@ -23,7 +23,7 @@ namespace VRM
/// FreezeBlendShape
/// </summary>
[Tooltip("when freeze mesh, blendShpae base use current weight")]
public bool FreezeMeshUseCurrentBlendShapeWeight = false;
public bool FreezeMeshUseCurrentBlendShapeWeight = true;
/// <summary>
/// BlendShapeのシリアライズにSparseAccessorを使う

1
Assets/VRM/Editor/Format/VRMExportSettingsEditor.cs
View File

@@ -48,6 +48,7 @@ namespace VRM
private void OnEnable()
{
m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.PoseFreeze)), VRMExportOptions.NORMALIZE));
m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.FreezeMeshUseCurrentBlendShapeWeight)), VRMExportOptions.FREEZE_BLENDSHAPE));
m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.UseSparseAccessor)), VRMExportOptions.BLENDSHAPE_USE_SPARSE));
m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.OnlyBlendshapePosition)), VRMExportOptions.BLENDSHAPE_EXCLUDE_NORMAL_AND_TANGENT));
m_checkbox_list.Add(new CheckBoxProp(serializedObject.FindProperty(nameof(VRMExportSettings.ReduceBlendshape)), VRMExportOptions.BLENDSHAPE_ONLY_CLIP_USE));