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

Working to correct some null refs

Browse source
This commit is contained in:
Lars Brubaker 2021-05-13 18:12:22 -07:00
parent 4ef7ecfeb7
commit 87bd79901a
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MatterControlLib/PartPreviewWindow/View3D/TrackballTumbleWidgetExtended.cs
View file

@ -349,14 +349,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ZeroVelocity();
}
var rayAtPosition = world.GetRayForLocalBounds(position);
var hitAtPosition = hitPlane.GetClosestIntersection(rayAtPosition);
if (hitPlane != null)
{
var rayAtPosition = world.GetRayForLocalBounds(position);
var hitAtPosition = hitPlane.GetClosestIntersection(rayAtPosition);
var offset = hitAtPosition.HitPosition - mouseDownWorldPosition;
bedCenter += offset;
world.Translate(offset);
if (hitAtPosition != null)
{
var offset = hitAtPosition.HitPosition - mouseDownWorldPosition;
bedCenter += offset;
world.Translate(offset);
Invalidate();
Invalidate();
}
}
}
public void ZeroVelocity()

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 16e9e5a2b5ff60df9c39d084e7820f346ac48111
Subproject commit a2bfc7651149af674638c5925789a72acf557e23

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit ef102435a4a6250caf7599fb6a889089b46a19b7
Subproject commit d7dec9cc62b55e5dd55655fa0456caba9f845252