Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optionally prefer Body over viseme mesh during merging #74

Closed
wants to merge 1 commit into from
Closed

Optionally prefer Body over viseme mesh during merging #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions Editor/d4rkAvatarOptimizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class Settings
public bool NaNimationAllow3BoneSkinning = false;
public bool MergeSkinnedMeshesSeparatedByDefaultEnabledState = true;
public bool MergeStaticMeshesAsSkinned = true;
public bool MergePreferBodyOverVisemeMesh = false;
public bool MergeDifferentPropertyMaterials = true;
public bool MergeSameDimensionTextures = true;
public bool MergeMainTex = false;
Expand Down Expand Up @@ -220,6 +221,9 @@ public bool MergeSkinnedMeshesSeparatedByDefaultEnabledState {
public bool MergeStaticMeshesAsSkinned {
get { return settings.MergeSkinnedMeshes && settings.MergeStaticMeshesAsSkinned; }
set { settings.MergeStaticMeshesAsSkinned = value; } }
public bool MergePreferBodyOverVisemeMesh {
get { return settings.MergeSkinnedMeshes && settings.MergePreferBodyOverVisemeMesh; }
set { settings.MergePreferBodyOverVisemeMesh = value; } }
public bool MergeDifferentPropertyMaterials {
get { return HasCustomShaderSupport && settings.MergeDifferentPropertyMaterials; }
set { settings.MergeDifferentPropertyMaterials = value; } }
Expand Down Expand Up @@ -282,6 +286,7 @@ public bool CanChangeSetting(string fieldName)
{nameof(NaNimationAllow3BoneSkinning), "Allow 3 Bone Skinning"},
{nameof(MergeSkinnedMeshesSeparatedByDefaultEnabledState), "Keep Default Enabled State"},
{nameof(MergeStaticMeshesAsSkinned), "Merge Static Meshes as Skinned"},
{nameof(MergePreferBodyOverVisemeMesh), "Prefer Merging into Body over Viseme Mesh"},
{nameof(MergeDifferentPropertyMaterials), "Merge Different Property Materials"},
{nameof(MergeSameDimensionTextures), "Merge Same Dimension Textures"},
{nameof(MergeMainTex), "Merge MainTex"},
Expand Down Expand Up @@ -318,6 +323,7 @@ public static string GetDisplayName(string fieldName)
{nameof(Settings.NaNimationAllow3BoneSkinning), false},
{nameof(Settings.MergeSkinnedMeshesSeparatedByDefaultEnabledState), true},
{nameof(Settings.MergeStaticMeshesAsSkinned), false},
{nameof(Settings.MergePreferBodyOverVisemeMesh), false},
{nameof(Settings.MergeDifferentPropertyMaterials), false},
{nameof(Settings.MergeSameDimensionTextures), false},
{nameof(Settings.MergeMainTex), false},
Expand All @@ -339,6 +345,7 @@ public static string GetDisplayName(string fieldName)
{nameof(Settings.NaNimationAllow3BoneSkinning), false},
{nameof(Settings.MergeSkinnedMeshesSeparatedByDefaultEnabledState), true},
{nameof(Settings.MergeStaticMeshesAsSkinned), true},
{nameof(Settings.MergePreferBodyOverVisemeMesh), false},
{nameof(Settings.MergeDifferentPropertyMaterials), true},
{nameof(Settings.MergeSameDimensionTextures), true},
{nameof(Settings.MergeMainTex), false},
Expand All @@ -360,6 +367,7 @@ public static string GetDisplayName(string fieldName)
{nameof(Settings.NaNimationAllow3BoneSkinning), true},
{nameof(Settings.MergeSkinnedMeshesSeparatedByDefaultEnabledState), false},
{nameof(Settings.MergeStaticMeshesAsSkinned), true},
{nameof(Settings.MergePreferBodyOverVisemeMesh), false},
{nameof(Settings.MergeDifferentPropertyMaterials), true},
{nameof(Settings.MergeSameDimensionTextures), true},
{nameof(Settings.MergeMainTex), true},
Expand Down Expand Up @@ -1032,13 +1040,24 @@ public List<List<Renderer>> FindPossibleSkinnedMeshMerges()
{
if (subList.Count == 1)
continue;
int index = subList.FindIndex(smr => smr == avDescriptor?.VisemeSkinnedMesh);
if (index == -1)
{
var obj = subList.OrderBy(smr => GetPathToRoot(smr).Count(c => c == '/'))
.ThenByDescending(smr => smr.name == "Body" ? 1 : 0).First();
index = subList.IndexOf(obj);

int visemeMeshIndex = subList.FindIndex(smr => smr == avDescriptor?.VisemeSkinnedMesh);
int bodyMeshIndex = subList.FindIndex(smr => smr.name == "Body");
int shallowestMeshIndex = subList.IndexOf(subList.OrderBy(smr => GetPathToRoot(smr).Count(c => c == '/')).First());

int index = shallowestMeshIndex;
if (settings.MergePreferBodyOverVisemeMesh) {
if (bodyMeshIndex >= 0)
index = bodyMeshIndex;
else if (visemeMeshIndex >= 0)
index = visemeMeshIndex;
} else {
if (visemeMeshIndex >= 0)
index = visemeMeshIndex;
else if (bodyMeshIndex >= 0)
index = bodyMeshIndex;
}

var oldFirst = subList[0];
subList[0] = subList[index];
subList[index] = oldFirst;
Expand Down
1 change: 1 addition & 0 deletions Editor/d4rkAvatarOptimizerEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public override void OnInspectorGUI()
ToggleOptimizerProperty(nameof(optimizer.MergeSkinnedMeshesSeparatedByDefaultEnabledState));
EditorGUI.indentLevel--;
ToggleOptimizerProperty(nameof(optimizer.MergeStaticMeshesAsSkinned));
ToggleOptimizerProperty(nameof(optimizer.MergePreferBodyOverVisemeMesh));
EditorGUI.indentLevel--;
if (d4rkAvatarOptimizer.HasCustomShaderSupport)
{
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ This is useful to not look weird with blocked animations in case of NaNimation t
## Merge Static Meshes as Skinned
Automatically converts static meshes to skinned meshes so that they can be merged with other meshes and have their materials merged as well. This only happens if the static mesh has materials that can be merged with materials from the skinned mesh it tries to get merged into.
Does not convert meshes on the UIMenu layer since they are mostly used for computation.
## Prefer Merging into Body over Viseme Mesh
By default, when merging meshes together, the Viseme mesh referenced in the VRC Avatar Descriptor will be prioritized as the merge target, followed by any mesh named "Body". Enable this setting to prefer merging into a "Body" mesh by default instead. This can be used to improve compatiblity with MMD worlds if your avatar contains a Body mesh and a separate viseme mesh.
## Merge Different Property Materials
Merges materials with the same shader where properties can have different values. If they do have different values the values will get written to a constant buffer. Material IDs get written to uv.w and used to access the correct value from that cbuffer.

Expand Down