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

Merged Arrange and Align

Browse source 
First pass on Bake and Remove for FitToBounds
This commit is contained in:
LarsBrubaker 2018-03-19 09:27:15 -07:00
parent 0e0d2bf4f7
commit 6e5674a279
8 changed files with 342 additions and 350 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TextCreator/Braille/BrailleCardObject3D.cs
View file

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.DesignTools
};
textObject.Rebuild(null);
IObject3D letterObject = new Rotate(textObject, -MathHelper.Tau / 4);
letterObject = new Align(letterObject, Face.Bottom | Face.Front, brailleLetter, Face.Top | Face.Front, 0, 0, 3.5);
letterObject = new Align3D(letterObject, Face.Bottom | Face.Front, brailleLetter, Face.Top | Face.Front, 0, 0, 3.5);
letterObject = new SetCenter(letterObject, brailleLetter.GetCenter(), true, false, false);
this.Children.Add(letterObject);
@ -106,13 +106,13 @@ namespace MatterHackers.MatterControl.DesignTools
Matrix = Matrix4X4.CreateRotationX(MathHelper.Tau / 4)
};
basePlate = new Align(basePlate, Face.Bottom | Face.Back, brailleLetter, Face.Bottom | Face.Back);
basePlate = new Align3D(basePlate, Face.Bottom | Face.Back, brailleLetter, Face.Bottom | Face.Back);
basePlate = new SetCenter(basePlate, brailleLetter.GetCenter(), true, false, false);
this.Children.Add(basePlate);
IObject3D underline = new CubeObject3D(basePlate.XSize(), .2, 1);
underline = new Align(underline, Face.Bottom, brailleLetter, Face.Top);
underline = new Align(underline, Face.Back | Face.Left, basePlate, Face.Front | Face.Left, 0, .01);
underline = new Align3D(underline, Face.Bottom, brailleLetter, Face.Top);
underline = new Align3D(underline, Face.Back | Face.Left, basePlate, Face.Front | Face.Left, 0, .01);
this.Children.Add(underline);
if (aabb.ZSize > 0)

6
TextCreator/Braille/BrailleObject3D.cs
View file

@ -194,8 +194,8 @@ namespace MatterHackers.MatterControl.DesignTools
Mesh = VertexSourceToMesh.Extrude(basePath, BaseHeight)
};
basePlate = new Align(basePlate, Face.Top, textObject, Face.Bottom, 0, 0, .01);
basePlate = new Align(basePlate, Face.Left | Face.Front,
basePlate = new Align3D(basePlate, Face.Top, textObject, Face.Bottom, 0, 0, .01);
basePlate = new Align3D(basePlate, Face.Left | Face.Front,
size.Left - padding/2,
size.Bottom - padding/2);
this.Children.Add(basePlate);
@ -234,7 +234,7 @@ namespace MatterHackers.MatterControl.DesignTools
Matrix = Matrix4X4.CreateRotationX(MathHelper.Tau / 4)
};
chainHook = new Align(chainHook, Face.Left | Face.Bottom | Face.Back, basePlate, Face.Right | Face.Bottom | Face.Back, -.01);
chainHook = new Align3D(chainHook, Face.Left | Face.Bottom | Face.Back, basePlate, Face.Right | Face.Bottom | Face.Back, -.01);
this.Children.Add(chainHook);
}