nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle null mesh scenarios

Browse source 
- Issue MatterHackers/MCCentral#2806
NullReferenceException in BackToFrontXY due to empty mesh
This commit is contained in:
John Lewin 2018-02-09 12:24:04 -08:00
parent 1cfafa4265
commit f312a1ae20
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -699,11 +699,23 @@ namespace MatterHackers.MeshVisualizer
private int BackToFrontXY(Object3DView a, Object3DView b)
{
var aCenterWorld = Vector3.Transform(a.Object3D.Mesh.GetAxisAlignedBoundingBox().Center, a.Object3D.Matrix);
var meshA = a.Object3D.Mesh;
var meshB = b.Object3D.Mesh;
if (meshA == null)
{
return 1;
}
else if (meshB == null)
{
return -1;
}
var aCenterWorld = Vector3.Transform(meshA.GetAxisAlignedBoundingBox().Center, a.Object3D.Matrix);
aCenterWorld.Z = 0; // we only want to look at the distance on xy in world space
var aCenterInViewSpace = Vector3.Transform(aCenterWorld, World.ModelviewMatrix);
var bCenterWorld = Vector3.Transform(b.Object3D.Mesh.GetAxisAlignedBoundingBox().Center, b.Object3D.Matrix);
var bCenterWorld = Vector3.Transform(meshB.GetAxisAlignedBoundingBox().Center, b.Object3D.Matrix);
bCenterWorld.Z = 0; // we only want to look at the distance on xy in world space
var bCenterInViewSpace = Vector3.Transform(bCenterWorld, World.ModelviewMatrix);

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit a2b16945b16273fa243153926b9121ec20f06911
Subproject commit ab9ae85941ee030e16762d0a6ec1cf5ee771fe30