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.

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

chore: Error if there are non-Readable Mesh #386

Merged
merged 2 commits into from
Aug 27, 2023
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG-PRERELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].
### Removed

### Fixed
- Unclear Error with Mesh with Read/Write off `#386`

### Security

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ The format is based on [Keep a Changelog].

### Fixed
- MergeBone not working well with non-restpose bones `#379`
- Unclear Error with Mesh with Read/Write off `#386`

### Security

Expand Down
3 changes: 3 additions & 0 deletions Editor/OptimizerSession.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public T AddToAsset<T>(T obj) where T : Object
public T MayInstantiate<T>(T obj) where T : Object =>
_added.Contains(obj) ? obj : AddToAsset(Object.Instantiate(obj));

public T MayCreate<T>(T obj) where T : Object, new() =>
_added.Contains(obj) ? obj : AddToAsset(new T { name = obj.name + "(Clone)" });

public void MarkDirtyAll()
{
foreach (var o in _added)
Expand Down
2 changes: 1 addition & 1 deletion Editor/Processors/EditSkinnedMeshComponentProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void SaveToMesh(OptimizerSession session)
BuildReport.ReportingObject(targetRenderer, () =>
{
var mesh = meshFilter.sharedMesh
? session.MayInstantiate(meshFilter.sharedMesh)
? session.MayCreate(meshFilter.sharedMesh)
: session.AddToAsset(new Mesh());
meshInfo.WriteToMesh(mesh);
meshFilter.sharedMesh = mesh;
Expand Down
20 changes: 15 additions & 5 deletions Editor/Processors/SkinnedMeshes/MeshInfo2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,14 @@ internal class MeshInfo2
public MeshInfo2(SkinnedMeshRenderer renderer)
{
SourceRenderer = renderer;
var mesh = renderer.sharedMesh
? renderer.sharedMesh
: new Mesh { name = $"AAOGeneratedMesh({renderer.name})" };

var mesh = renderer.sharedMesh;
if (!mesh) return; // no mesh; make empty mesh
if (!mesh.isReadable)
{
BuildReport.LogFatal("The Mesh is not readable. Please Check Read/Write")?.WithContext(mesh);
return;
}

BuildReport.ReportingObject(renderer, true, () =>
{
ReadSkinnedMesh(mesh);
Expand Down Expand Up @@ -67,6 +71,12 @@ public MeshInfo2(MeshRenderer renderer)
BuildReport.ReportingObject(renderer, true, () =>
{
var mesh = renderer.GetComponent<MeshFilter>().sharedMesh;
if (!mesh) return; // no mesh; make empty mesh
if (!mesh.isReadable)
{
BuildReport.LogFatal("The Mesh is not readable. Please Check Read/Write")?.WithContext(mesh);
return;
}
ReadStaticMesh(mesh);

SetIdentityBone(renderer.transform);
Expand Down Expand Up @@ -438,7 +448,7 @@ public void WriteToSkinnedMeshRenderer(SkinnedMeshRenderer targetRenderer, Optim
BuildReport.ReportingObject(targetRenderer, () =>
{
var mesh = targetRenderer.sharedMesh
? session.MayInstantiate(targetRenderer.sharedMesh)
? session.MayCreate(targetRenderer.sharedMesh)
: session.AddToAsset(new Mesh { name = $"AAOGeneratedMesh{targetRenderer.name}" });

WriteToMesh(mesh);
Expand Down