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

Refactoring for move passing to all object3d controls

Browse source
This commit is contained in:
LarsBrubaker 2020-09-13 15:02:30 -07:00
parent f166728aa1
commit 34a63956f9
10 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
MatterControlLib/DesignTools/Primitives/TracedPositionObject3DControl.cs
View file

@ -46,9 +46,7 @@ namespace MatterHackers.MatterControl.DesignTools
private readonly double blockSize = 7 * GuiWidget.DeviceScale;
private ITraceable collisionVolume;
private Color color;
private ThemeConfig theme;
private IObject3DControlContext context;
private Func<Vector3> getPosition;
@ -58,13 +56,14 @@ namespace MatterHackers.MatterControl.DesignTools
private Action<Vector3> setPosition;
private Mesh shape;
private bool mouseOver;
public TracedPositionObject3DControl(IObject3DControlContext context, IObject3D owner, Color color, Func<Vector3> getPosition, Action<Vector3> setPosition)
public TracedPositionObject3DControl(IObject3DControlContext context, IObject3D owner, Func<Vector3> getPosition, Action<Vector3> setPosition)
{
this.theme = ApplicationController.Instance.Theme;
this.context = context;
this.getPosition = getPosition;
this.setPosition = setPosition;
this.color = color;
this.shape = PlatonicSolids.CreateCube();
this.owner = owner;
collisionVolume = shape.CreateBVHData();
@ -86,6 +85,12 @@ namespace MatterHackers.MatterControl.DesignTools
public void Draw(DrawGlContentEventArgs e)
{
var color = Color.Black;
if (mouseOver)
{
color = theme.PrimaryAccentColor;
}
GLHelper.Render(shape, color, ShapeMatrix(), RenderTypes.Shaded);
}
@ -109,8 +114,13 @@ namespace MatterHackers.MatterControl.DesignTools
{
}
public void OnMouseMove(Mouse3DEventArgs mouseEvent3D)
public void OnMouseMove(Mouse3DEventArgs mouseEvent3D, bool mouseIsOver)
{
if (mouseOver != mouseIsOver)
{
mouseOver = mouseIsOver;
context.GuiSurface.Invalidate();
}
}
public void OnMouseUp(Mouse3DEventArgs mouseEvent3D)