Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 11 additions & 18 deletions Ndmf/Editor/NdmfPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,9 @@ protected override void Configure()
{
foreach (var meshiaMeshSimplifier in meshiaMeshSimplifiers)
{
if (meshiaMeshSimplifier.TryGetComponent<SkinnedMeshRenderer>(out var skinnedMeshRenderer))
if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))
{
var sourceMesh = skinnedMeshRenderer.sharedMesh;
Mesh simplifiedMesh = new();
parameters.Add((sourceMesh, meshiaMeshSimplifier.target, meshiaMeshSimplifier.options, simplifiedMesh));
}
if (meshiaMeshSimplifier.TryGetComponent<MeshFilter>(out var meshFilter))
{
var sourceMesh = meshFilter.sharedMesh;
var sourceMesh = RendererUtility.GetRequiredMesh(renderer);
Mesh simplifiedMesh = new();
parameters.Add((sourceMesh, meshiaMeshSimplifier.target, meshiaMeshSimplifier.options, simplifiedMesh));
}
Expand All @@ -82,19 +76,15 @@ protected override void Configure()

foreach (var meshiaMeshSimplifier in meshiaMeshSimplifiers)
{
if (meshiaMeshSimplifier.TryGetComponent<SkinnedMeshRenderer>(out var skinnedMeshRenderer))
{
var (mesh, target, options, simplifiedMesh) = parameters[i++];
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
skinnedMeshRenderer.sharedMesh = simplifiedMesh;
}
if (meshiaMeshSimplifier.TryGetComponent<MeshFilter>(out var meshFilter))
if(meshiaMeshSimplifier.enabled && meshiaMeshSimplifier.TryGetComponent<Renderer>(out var renderer))
{
var (mesh, target, options, simplifiedMesh) = parameters[i++];
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
meshFilter.sharedMesh = simplifiedMesh;
RendererUtility.SetMesh(renderer, simplifiedMesh);
}

}
foreach (var meshiaMeshSimplifier in meshiaMeshSimplifiers)
{
UnityEngine.Object.DestroyImmediate(meshiaMeshSimplifier);
}

Expand All @@ -110,10 +100,13 @@ protected override void Configure()
AssetDatabase.AddObjectToAsset(simplifiedMesh, context.AssetContainer);
RendererUtility.SetMesh(renderer, simplifiedMesh);

UnityEngine.Object.DestroyImmediate(meshiaCascadingMeshSimplifier);
}
}

foreach (var meshiaCascadingMeshSimplifier in meshiaCascadingMeshSimplifiers)
{
UnityEngine.Object.DestroyImmediate(meshiaCascadingMeshSimplifier);
}
#endif

}
Expand Down
Loading