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

Compute rather than move for selection render

Browse source 
- Issue MatterHackers/MCCentral#3344
Won't close if there is a selection on the bed

- Issue MatterHackers/MCCentral#3347
Invalidate should not be invoked from Draw
This commit is contained in:
John Lewin 2018-05-10 08:15:12 -07:00
parent cb1882c709
commit b8d5b00ad3
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PartPreviewWindow/View3D/MeshViewerWidget.cs
View file

@ -609,8 +609,6 @@ namespace MatterHackers.MeshVisualizer
GL.Disable(EnableCap.Lighting);
// Only render back faces
GL.CullFace(CullFaceMode.Front);
// Expand the object
var oldMatrix = item.Matrix;
var meshBounds = item.Mesh.GetAxisAlignedBoundingBox();
var localCenter = meshBounds.Center;
@ -621,20 +619,24 @@ namespace MatterHackers.MeshVisualizer
var wantMm = pixelsWant * distBetweenPixelsWorldSpace;
item.ApplyAtBoundsCenter(Matrix4X4.CreateScale(
// Create scaled transform for selection
var scaledMatrix = Matrix4X4.CreateScale(
wantMm.X / item.XSize(),
wantMm.Y / item.YSize(),
wantMm.Z / item.ZSize()));
wantMm.Z / item.ZSize());
scaledMatrix = MatterControl.DesignTools.Operations.Object3DExtensions.ApplyAtCenter(item.GetAxisAlignedBoundingBox(Matrix4X4.Identity), item.Matrix, scaledMatrix);
GLHelper.Render(item.Mesh,
var totalSelectionMatrix = scaledMatrix * item.Parent.WorldMatrix();
// Render
GLHelper.Render(item.Mesh,
selectionColor,
item.WorldMatrix(), RenderTypes.Shaded,
item.WorldMatrix() * World.ModelviewMatrix,
totalSelectionMatrix, RenderTypes.Shaded,
totalSelectionMatrix * World.ModelviewMatrix,
darkWireframe);
// restore settings
GL.CullFace(CullFaceMode.Back);
item.Matrix = oldMatrix;
GL.Enable(EnableCap.Lighting);
}