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

Fix whitespace

Browse source
This commit is contained in:
jlewin 2019-05-13 13:03:50 -07:00
parent 209826d504
commit 1f5bdfcf3b
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,6 +162,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private WorldView world;
private ThemeConfig theme;
private List<ConnectedFaces> connections = new List<ConnectedFaces>();
private HitData lastHitData = new HitData();
public TumbleCubeControl(InteractionLayer interactionLayer, ThemeConfig theme)
: base(100 * GuiWidget.DeviceScale, 100 * GuiWidget.DeviceScale)
@ -268,7 +269,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
HitData lastHitData = new HitData();
private void DrawMouseHover(HitData hitData)
{
if (!lastHitData.Equals(hitData))
@ -400,6 +400,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double duration = .25;
var timer = Stopwatch.StartNew();
var time = timer.Elapsed.TotalSeconds;
while (time < duration)
{
var current = Quaternion.Slerp(start, end, time / duration);
@ -411,6 +412,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
time = timer.Elapsed.TotalSeconds;
Thread.Sleep(10);
}
interactionLayer.World.RotationMatrix = Matrix4X4.CreateRotation(end);
Invalidate();
});
@ -425,6 +427,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var up = Vector3.Zero;
var normal = Vector3.Zero;
var count = 0;
for (int i = 0; i < 3; i++)
{
count++;