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

Restore World* functions with default scene root and overridable param

Browse source
This commit is contained in:
John Lewin 2018-02-04 00:38:50 -08:00
parent d65cc1bad6
commit cd1c6c3269
9 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PartPreviewWindow/View3D/Actions/SubtractEditor.cs
View file

@ -211,12 +211,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
progressStatus.Status = "Copy Remove";
reporter?.Report(progressStatus);
var transformedRemove = Mesh.Copy(remove.Mesh, CancellationToken.None);
transformedRemove.Transform(remove.WorldMatrix(null));
transformedRemove.Transform(remove.WorldMatrix());
progressStatus.Status = "Copy Keep";
reporter?.Report(progressStatus);
var transformedKeep = Mesh.Copy(keep.Mesh, CancellationToken.None);
transformedKeep.Transform(keep.WorldMatrix(null));
transformedKeep.Transform(keep.WorldMatrix());
progressStatus.Status = "Do CSG";
reporter?.Report(progressStatus);
@ -229,7 +229,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
progressStatus.Progress0To1 = percentCompleted + amountPerOperation * progress0To1;
reporter?.Report(progressStatus);
}, cancellationToken);
var inverse = keep.WorldMatrix(null);
var inverse = keep.WorldMatrix();
inverse.Invert();
transformedKeep.Transform(inverse);