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

Making controls more independent

Browse source
This commit is contained in:
LarsBrubaker 2020-09-12 13:09:17 -07:00
parent 95543966d3
commit 77ec3d5909
43 changed files with 532 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,12 @@ namespace MatterHackers.MeshVisualizer
/// </summary>
void CancelOperation();
void OnMouseDown(Mouse3DEventArgs mouseEvent3D);
void OnMouseMove(Mouse3DEventArgs mouseEvent3D);
void OnMouseUp(Mouse3DEventArgs mouseEvent3D);
void LostFocus();
/// <summary>

4
MatterControlLib/PartPreviewWindow/View3D/Interaction/IObject3DControlContext.cs
View file

@ -35,9 +35,9 @@ namespace MatterHackers.MeshVisualizer
{
public interface IObject3DControlContext
{
Object3DControlBase HoveredObject3DControl { get; }
IObject3DControl HoveredObject3DControl { get; }
Object3DControlBase SelectedObject3DControl { get; }
IObject3DControl SelectedObject3DControl { get; }
InteractiveScene Scene { get; }

2
MatterControlLib/PartPreviewWindow/View3D/Interaction/IObject3DControlProvider.cs
View file

@ -33,6 +33,6 @@ namespace MatterHackers.MeshVisualizer
{
public interface IObject3DControlProvider
{
IEnumerable<Object3DControlBase> Create(IObject3DControlContext context);
IEnumerable<IObject3DControl> Create(IObject3DControlContext context);
}
}

8
MatterControlLib/PartPreviewWindow/View3D/Interaction/Object3DControlBase.cs → MatterControlLib/PartPreviewWindow/View3D/Interaction/Object3DControl.cs
View file

@ -35,15 +35,15 @@ using MatterHackers.VectorMath;
namespace MatterHackers.MeshVisualizer
{
public abstract class Object3DControlBase : IObject3DControl
public abstract class Object3DControl : IObject3DControl
{
private bool _mouseIsOver = false;
public Matrix4X4 TotalTransform { get; set; } = Matrix4X4.Identity;
public Object3DControlBase(IObject3DControlContext meshViewerToDrawWith)
public Object3DControl(IObject3DControlContext object3DControlContext)
{
this.Object3DControlContext = meshViewerToDrawWith;
this.Object3DControlContext = object3DControlContext;
}
public ITraceable CollisionVolume { get; set; }
@ -122,7 +122,7 @@ namespace MatterHackers.MeshVisualizer
if (mouseEvent3D.MouseEvent2D.Button == MouseButtons.Left)
{
MouseDownOnControl = true;
Object3DControlContext.GuiSurface.Invalidate();
this.Object3DControlContext.GuiSurface.Invalidate();
}
}