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

Merge pull request #3420 from larsbrubaker/design_tools

Browse source 
Changing default sides to 40 from 30 so that aabb matches diameter
This commit is contained in:
Lars Brubaker 2018-06-14 09:37:44 -07:00 • committed by GitHub
commit 1a413cb09a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DesignTools/Primitives/ConeObject3D.cs
View file

@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.DesignTools
//[DisplayName("Top")]
//public double TopDiameter { get; set; } = 0;
public double Height { get; set; } = 20;
public int Sides { get; set; } = 30;
public int Sides { get; set; } = 40;
public override void Rebuild(UndoBuffer undoBuffer)
{

2
DesignTools/Primitives/CylinderObject3D.cs
View file

@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.DesignTools
public double Diameter { get; set; } = 20;
public double Height { get; set; } = 20;
public int Sides { get; set; } = 30;
public int Sides { get; set; } = 40;
public bool Advanced { get; set; } = false;
public double StartingAngle { get; set; } = 0;

2
DesignTools/Primitives/HalfCylinderObject3D.cs
View file

@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.DesignTools
public double Width { get; set; } = 20;
public double Depth { get; set; } = 20;
public int Sides { get; set; } = 15;
public int Sides { get; set; } = 20;
public override void Rebuild(UndoBuffer undoBuffer)
{

2
DesignTools/Primitives/HalfSphereObject3D.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
public double Diameter { get; set; } = 20;
public int LongitudeSides { get; set; } = 30;
public int LongitudeSides { get; set; } = 40;
public int LatitudeSides { get; set; } = 10;
public override void Rebuild(UndoBuffer undoBuffer)

2
DesignTools/Primitives/RingObject3D.cs
View file

@ -70,7 +70,7 @@ namespace MatterHackers.MatterControl.DesignTools
public double OuterDiameter { get; set; } = 20;
public double InnerDiameter { get; set; } = 15;
public double Height { get; set; } = 5;
public int Sides { get; set; } = 30;
public int Sides { get; set; } = 40;
public bool Advanced { get; set; } = false;
public double StartingAngle { get; set; } = 0;

2
DesignTools/Primitives/SphereObject3D.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.DesignTools
}
public double Diameter { get; set; } = 20;
public int Sides { get; set; } = 30;
public int Sides { get; set; } = 40;
public bool Advanced { get; set; } = false;
public double StartingAngle { get; set; } = 0;

2
DesignTools/Primitives/TorusObject3D.cs
View file

@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.DesignTools
public double OuterDiameter { get; set; } = 20;
public double InnerDiameter { get; set; } = 10;
public int Sides { get; set; } = 30;
public int Sides { get; set; } = 40;
public bool Advanced { get; set; } = false;
public double StartingAngle { get; set; } = 0;

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit dfc3f0f8062d75808be6a30c3419a3ef08194a8b
Subproject commit 7049f80b9629225a0fa66eef2c257fa7a9bc8684