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

Refactoring to use ITraceable preferentially to IPrimitive

Browse source
This commit is contained in:
LarsBrubaker 2020-09-12 09:51:43 -07:00
parent 52df1380a7
commit 6e682494de
16 changed files with 145 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MatterControlLib/PartPreviewWindow/SceneViewer/ItemTraceDataDrawable.cs
View file

@ -76,9 +76,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (items.Any())
{
int i = 0;
foreach(var p in items)
foreach (var (BvhItem, Matrix) in items)
{
Object3DControlLayer.RenderBounds(e, world, p.Matrix, p.BvhItem, i++);
Object3DControlLayer.RenderBounds(e, world, Matrix, BvhItem, i++);
}
}
}
@ -100,7 +100,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public static class PrimitivesExtensions
{
public static IEnumerable<(IBvhItem BvhItem, Matrix4X4 Matrix)> FilterX(this IPrimitive source, Predicate<BvhItemView> filter)
public static IEnumerable<(IBvhItem BvhItem, Matrix4X4 Matrix)> FilterX(this ITraceable source, Predicate<BvhItemView> filter)
{
var items = new Stack<(IBvhItem BvhItem, Matrix4X4 Matrix)>();
items.Push((source, Matrix4X4.Identity));

32
MatterControlLib/PartPreviewWindow/View3D/Gui3D/MoveInZControl.cs
View file

@ -79,8 +79,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
// if another control gets a hover
if (object3DControlContext.HoveredObject3DControl != this
&& object3DControlContext.HoveredObject3DControl != null)
if (Object3DControlContext.HoveredObject3DControl != this
&& Object3DControlContext.HoveredObject3DControl != null)
{
return true;
}
@ -112,10 +112,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var newZPosition = zHeightDisplayInfo.Value;
if (object3DControlContext.SnapGridDistance > 0)
if (Object3DControlContext.SnapGridDistance > 0)
{
// snap this position to the grid
double snapGridDistance = object3DControlContext.SnapGridDistance;
double snapGridDistance = Object3DControlContext.SnapGridDistance;
// snap this position to the grid
newZPosition = ((int)((newZPosition / snapGridDistance) + .5)) * snapGridDistance;
@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
context.Scene.AddTransformSnapshot(startingTransform);
};
object3DControlContext.GuiSurface.AddChild(zHeightDisplayInfo);
Object3DControlContext.GuiSurface.AddChild(zHeightDisplayInfo);
DrawOnTop = true;
@ -144,14 +144,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
CollisionVolume = upArrowMesh.CreateBVHData();
object3DControlContext.GuiSurface.AfterDraw += Object3DControl_AfterDraw;
Object3DControlContext.GuiSurface.AfterDraw += Object3DControl_AfterDraw;
}
public override void Draw(DrawGlContentEventArgs e)
{
bool shouldDrawMoveControls = true;
if (object3DControlContext.SelectedObject3DControl != null
&& object3DControlContext.SelectedObject3DControl as MoveInZControl == null)
if (Object3DControlContext.SelectedObject3DControl != null
&& Object3DControlContext.SelectedObject3DControl as MoveInZControl == null)
{
shouldDrawMoveControls = false;
}
@ -234,10 +234,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double newZPosition = mouseDownSelectedBounds.MinXYZ.Z + delta;
if (object3DControlContext.SnapGridDistance > 0)
if (Object3DControlContext.SnapGridDistance > 0)
{
// snap this position to the grid
double snapGridDistance = object3DControlContext.SnapGridDistance;
double snapGridDistance = Object3DControlContext.SnapGridDistance;
// snap this position to the grid
newZPosition = ((int)((newZPosition / snapGridDistance) + .5)) * snapGridDistance;
@ -259,7 +259,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public override void OnMouseUp(Mouse3DEventArgs mouseEvent3D)
{
object3DControlContext.Scene.AddTransformSnapshot(transformOnMouseDown);
Object3DControlContext.Scene.AddTransformSnapshot(transformOnMouseDown);
base.OnMouseUp(mouseEvent3D);
}
@ -273,8 +273,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
MouseDownOnControl = false;
MouseIsOver = false;
object3DControlContext.Scene.DrawSelection = true;
object3DControlContext.Scene.ShowSelectionShadow = true;
Object3DControlContext.Scene.DrawSelection = true;
Object3DControlContext.Scene.ShowSelectionShadow = true;
}
base.CancelOperation();
@ -286,7 +286,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Vector3 topPosition = GetTopPosition(selectedItem);
var bottomPosition = new Vector3(topPosition.X, topPosition.Y, selectedBounds.MinXYZ.Z);
double distBetweenPixelsWorldSpace = object3DControlContext.World.GetWorldUnitsPerScreenPixelAtPosition(topPosition);
double distBetweenPixelsWorldSpace = Object3DControlContext.World.GetWorldUnitsPerScreenPixelAtPosition(topPosition);
Vector3 boxCenter = topPosition;
boxCenter.Z += (10 * GuiWidget.DeviceScale + upArrowSize / 2) * distBetweenPixelsWorldSpace;
@ -298,10 +298,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// left lines
// the lines on the bed
var bedPosition = new Vector3(topPosition.X, topPosition.Y, 0);
lines.Add(object3DControlContext.World.GetScreenPosition(bedPosition + new Vector3(distToStart * distBetweenPixelsWorldSpace, 0, 0)));
lines.Add(Object3DControlContext.World.GetScreenPosition(bedPosition + new Vector3(distToStart * distBetweenPixelsWorldSpace, 0, 0)));
lines.Add(new Vector2(lines[0].X + lineLength, lines[0].Y));
lines.Add(object3DControlContext.World.GetScreenPosition(bottomPosition + new Vector3(distToStart * distBetweenPixelsWorldSpace, 0, 0)));
lines.Add(Object3DControlContext.World.GetScreenPosition(bottomPosition + new Vector3(distToStart * distBetweenPixelsWorldSpace, 0, 0)));
lines.Add(new Vector2(lines[2].X + lineLength, lines[2].Y));
}

2
MatterControlLib/PartPreviewWindow/View3D/Gui3D/SelectionShadow.cs
View file

@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
var selectedItem = RootSelection;
if (selectedItem != null
&& object3DControlContext.Scene.ShowSelectionShadow)
&& Object3DControlContext.Scene.ShowSelectionShadow)
{
// draw the bounds on the bed
AxisAlignedBoundingBox selectedBounds = selectedItem.GetAxisAlignedBoundingBox();

8
MatterControlLib/PartPreviewWindow/View3D/Gui3D/SnapingIndicator.cs
View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
this.DrawOnTop = true;
this.meshSelectInfo = currentSelectInfo;
object3DControlContext.GuiSurface.AfterDraw += Object3DControl_AfterDraw;
Object3DControlContext.GuiSurface.AfterDraw += Object3DControl_AfterDraw;
}
public override void SetPosition(IObject3D selectedItem)
@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// draw the hight from the bottom to the bed
AxisAlignedBoundingBox selectedBounds = selectedItem.GetAxisAlignedBoundingBox();
var world = object3DControlContext.World;
var world = Object3DControlContext.World;
switch (meshSelectInfo.HitQuadrant)
{
@ -116,8 +116,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void Object3DControl_AfterDraw(object drawingWidget, DrawEventArgs drawEvent)
{
if (object3DControlContext.Scene.SelectedItem != null
&& object3DControlContext.SnapGridDistance > 0
if (Object3DControlContext.Scene.SelectedItem != null
&& Object3DControlContext.SnapGridDistance > 0
&& meshSelectInfo.DownOnPart)
{
if (drawEvent != null)

3
MatterControlLib/PartPreviewWindow/View3D/Interaction/IObject3DControl.cs
View file

@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.DataConverters3D;
using MatterHackers.RayTracer;
namespace MatterHackers.MeshVisualizer
{
@ -56,5 +57,7 @@ namespace MatterHackers.MeshVisualizer
bool DrawOnTop { get; }
void Draw(DrawGlContentEventArgs e);
ITraceable GetTraceable();
}
}

26
MatterControlLib/PartPreviewWindow/View3D/Interaction/Object3DControlBase.cs
View file

@ -30,6 +30,7 @@ either expressed or implied, of the FreeBSD Project.
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.RayTracer;
using MatterHackers.RayTracer.Traceable;
using MatterHackers.VectorMath;
namespace MatterHackers.MeshVisualizer
@ -42,10 +43,10 @@ namespace MatterHackers.MeshVisualizer
public Object3DControlBase(IObject3DControlContext meshViewerToDrawWith)
{
this.object3DControlContext = meshViewerToDrawWith;
this.Object3DControlContext = meshViewerToDrawWith;
}
public IPrimitive CollisionVolume { get; set; }
public ITraceable CollisionVolume { get; set; }
public bool DrawOnTop { get; protected set; }
@ -70,14 +71,14 @@ namespace MatterHackers.MeshVisualizer
public string Name { get; set; }
protected IObject3DControlContext object3DControlContext { get; }
protected IObject3DControlContext Object3DControlContext { get; }
public IObject3D RootSelection
{
get
{
var selectedItemRoot = object3DControlContext.Scene.SelectedItemRoot;
var selectedItem = object3DControlContext.Scene.SelectedItem;
var selectedItemRoot = Object3DControlContext.Scene.SelectedItemRoot;
var selectedItem = Object3DControlContext.Scene.SelectedItem;
return (selectedItemRoot == selectedItem) ? selectedItem : null;
}
}
@ -105,7 +106,7 @@ namespace MatterHackers.MeshVisualizer
public void Invalidate()
{
object3DControlContext.GuiSurface.Invalidate();
Object3DControlContext.GuiSurface.Invalidate();
}
public virtual void CancelOperation()
@ -121,7 +122,7 @@ namespace MatterHackers.MeshVisualizer
if (mouseEvent3D.MouseEvent2D.Button == MouseButtons.Left)
{
MouseDownOnControl = true;
object3DControlContext.GuiSurface.Invalidate();
Object3DControlContext.GuiSurface.Invalidate();
}
}
@ -137,5 +138,16 @@ namespace MatterHackers.MeshVisualizer
public virtual void SetPosition(IObject3D selectedItem)
{
}
public ITraceable GetTraceable()
{
if (CollisionVolume != null)
{
ITraceable traceData = CollisionVolume;
return new Transform(traceData, TotalTransform);
}
return null;
}
}
}

27
MatterControlLib/PartPreviewWindow/View3D/InteractionLayer.cs
View file

@ -260,7 +260,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Ray ray = this.World.GetRayForLocalBounds(mouseEvent.Position);
if (this.Scene.SelectedItem != null
&& !SuppressUiVolumes
&& !SuppressObject3DControls
&& FindHitObject3DControl(ray, out mouseDownObject3DControl, out IntersectInfo info))
{
mouseDownObject3DControl.OnMouseDown(new Mouse3DEventArgs(mouseEvent, ray, info));
@ -276,7 +276,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
base.OnMouseMove(mouseEvent);
if (SuppressUiVolumes
if (SuppressObject3DControls
|| !this.PositionWithinLocalBounds(mouseEvent.X, mouseEvent.Y))
{
return;
@ -320,7 +320,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
Invalidate();
if (SuppressUiVolumes)
if (SuppressObject3DControls)
{
return;
}
@ -407,28 +407,25 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return false;
}
// TODO: Rewrite as projection without extra list
// - Looks like the extra list is always required as CreateNewHierachy requires a List and we can only produce an IEnumerable without the list overhead
// - var uiTraceables = iaVolumes.Where(ia => ia.CollisionVolume != null).Select(ia => new Transform(ia.CollisionVolume, ia.TotalTransform)).ToList<IPrimitive>();
var uiTraceables = new List<IPrimitive>();
foreach (var object3DControl in object3DControls.OfType<Object3DControlBase>())
var traceables = new List<ITraceable>();
foreach (var object3DControl in object3DControls)
{
if (object3DControl.CollisionVolume != null)
ITraceable traceable = object3DControl.GetTraceable();
if (traceable != null)
{
IPrimitive traceData = object3DControl.CollisionVolume;
uiTraceables.Add(new Transform(traceData, object3DControl.TotalTransform));
traceables.Add(traceable);
}
}
if (uiTraceables.Count <= 0)
if (traceables.Count <= 0)
{
info = null;
return false;
}
IPrimitive allUiObjects = BoundingVolumeHierarchy.CreateNewHierachy(uiTraceables);
var bvhHierachy = BoundingVolumeHierarchy.CreateNewHierachy(traceables);
info = allUiObjects.GetClosestIntersection(ray);
info = bvhHierachy.GetClosestIntersection(ray);
if (info != null)
{
foreach (var object3DControlBase in object3DControls.OfType<Object3DControlBase>())
@ -449,7 +446,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return false;
}
public bool SuppressUiVolumes { get; set; } = false;
public bool SuppressObject3DControls { get; set; } = false;
public bool MouseDownOnObject3DControlVolume => SelectedObject3DControl != null;

4
MatterControlLib/PartPreviewWindow/View3D/Object3DUiControlLayer.cs
View file

@ -614,10 +614,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
foreach (var item in this.Object3DControls.OfType<IObject3DControl>())
{
item.Visible = !SuppressUiVolumes;
item.Visible = !SuppressObject3DControls;
}
if (SuppressUiVolumes)
if (SuppressObject3DControls)
{
return;
}

2
MatterControlLib/PartPreviewWindow/View3D/TumbleCubeControl.cs
View file

@ -152,7 +152,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public class TumbleCubeControl : GuiWidget
{
private Mesh cube = PlatonicSolids.CreateCube(4, 4, 4);
private IPrimitive cubeTraceData;
private ITraceable cubeTraceData;
private Object3DControlLayer object3DControlLayer;
private Vector2 lastMovePosition;
private LightingData lighting = new LightingData();

6
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -1049,7 +1049,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (mouseEvent.Button == MouseButtons.Right ||
mouseEvent.Button == MouseButtons.Middle)
{
this.Object3DControlLayer.SuppressUiVolumes = true;
this.Object3DControlLayer.SuppressObject3DControls = true;
}
base.OnMouseDown(mouseEvent);
@ -1067,7 +1067,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
if (!this.Object3DControlLayer.MouseDownOnObject3DControlVolume)
{
this.Object3DControlLayer.SuppressUiVolumes = true;
this.Object3DControlLayer.SuppressObject3DControls = true;
var info = new IntersectInfo();
@ -1429,7 +1429,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
this.Object3DControlLayer.SuppressUiVolumes = false;
this.Object3DControlLayer.SuppressObject3DControls = false;
CurrentSelectInfo.DownOnPart = false;