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

Orthographic projection mode with dynamic near/far.

Browse source
This commit is contained in:
fortsnek9348 2022-03-02 00:52:04 +00:00
parent 0834aff9f4
commit e7947a2fd2
70 changed files with 2548 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

59
MatterControlLib/DesignTools/EditorTools/RotateControls/RotateCornerControl.cs
View file

@ -201,6 +201,27 @@ namespace MatterHackers.Plugins.EditorTools
base.Draw(e);
}
public override AxisAlignedBoundingBox GetWorldspaceAABB()
{
AxisAlignedBoundingBox box = AxisAlignedBoundingBox.Empty();
IObject3D selectedItem = RootSelection;
if (selectedItem != null)
{
if (Object3DControlContext.SelectedObject3DControl == null)
{
box = AxisAlignedBoundingBox.Union(box, rotationHandle.GetAxisAlignedBoundingBox().NewTransformed(TotalTransform));
}
if (mouseMoveInfo != null || mouseDownInfo != null || MouseIsOver)
{
box = AxisAlignedBoundingBox.Union(box, GetRotationCompassAABB(selectedItem));
}
}
return box;
}
public Vector3 GetCornerPosition(IObject3D objectBeingRotated)
{
return GetCornerPosition(objectBeingRotated, out _);
@ -326,7 +347,7 @@ namespace MatterHackers.Plugins.EditorTools
}
var hitPlane = new PlaneShape(RotationPlanNormal, RotationPlanNormal.Dot(controlCenter), null);
IntersectInfo hitOnRotationPlane = hitPlane.GetClosestIntersection(mouseEvent3D.MouseRay);
IntersectInfo hitOnRotationPlane = hitPlane.GetClosestIntersectionWithinRayDistanceRange(mouseEvent3D.MouseRay);
if (hitOnRotationPlane != null)
{
AxisAlignedBoundingBox currentSelectedBounds = selectedItem.GetAxisAlignedBoundingBox();
@ -645,6 +666,42 @@ namespace MatterHackers.Plugins.EditorTools
}
}
private AxisAlignedBoundingBox GetRotationCompassAABB(IObject3D selectedItem)
{
AxisAlignedBoundingBox box = AxisAlignedBoundingBox.Empty();
if (Object3DControlContext.Scene.SelectedItem == null)
{
return box;
}
AxisAlignedBoundingBox currentSelectedBounds = selectedItem.GetAxisAlignedBoundingBox();
if (currentSelectedBounds.XSize > 100000)
{
return box;
}
if (mouseMoveInfo != null)
{
Matrix4X4 rotationCenterTransform = GetRotationTransform(selectedItem, out double radius);
double innerRadius = radius + RingWidth / 2;
double outerRadius = innerRadius + RingWidth;
double snappingMarkRadius = outerRadius + 20;
if (mouseDownInfo != null || MouseIsOver)
{
double snapMarkerRadius = GuiWidget.DeviceScale * 10;
double snapMarkerOuterRadius = snappingMarkRadius + snapMarkerRadius;
box = AxisAlignedBoundingBox.Union(box, new AxisAlignedBoundingBox(-snapMarkerOuterRadius, -snapMarkerOuterRadius, 0, snapMarkerOuterRadius, snapMarkerOuterRadius, 0).NewTransformed(rotationCenterTransform));
}
}
return box;
}
private bool ForceHideAngle()
{
return (Object3DControlContext.HoveredObject3DControl != this