From 5076c1288c5a9db028e4a54624fc408074b4f0b2 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 14 Jun 2018 09:25:37 -0700 Subject: [PATCH] Changing default sides to 40 from 30 so that aabb matches diameter issue: MatterHackers/MCCentral#3618 Change primitive sides to 40 by default. This makes size same as radius. --- DesignTools/Primitives/ConeObject3D.cs | 2 +- DesignTools/Primitives/CylinderObject3D.cs | 2 +- DesignTools/Primitives/HalfCylinderObject3D.cs | 2 +- DesignTools/Primitives/HalfSphereObject3D.cs | 2 +- DesignTools/Primitives/RingObject3D.cs | 2 +- DesignTools/Primitives/SphereObject3D.cs | 2 +- DesignTools/Primitives/TorusObject3D.cs | 2 +- Submodules/MatterSlice | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DesignTools/Primitives/ConeObject3D.cs b/DesignTools/Primitives/ConeObject3D.cs index 481ea2d2c..8e5806bb6 100644 --- a/DesignTools/Primitives/ConeObject3D.cs +++ b/DesignTools/Primitives/ConeObject3D.cs @@ -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) { diff --git a/DesignTools/Primitives/CylinderObject3D.cs b/DesignTools/Primitives/CylinderObject3D.cs index 5890397c0..6866b270d 100644 --- a/DesignTools/Primitives/CylinderObject3D.cs +++ b/DesignTools/Primitives/CylinderObject3D.cs @@ -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; diff --git a/DesignTools/Primitives/HalfCylinderObject3D.cs b/DesignTools/Primitives/HalfCylinderObject3D.cs index ea6b86761..e890e4d40 100644 --- a/DesignTools/Primitives/HalfCylinderObject3D.cs +++ b/DesignTools/Primitives/HalfCylinderObject3D.cs @@ -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) { diff --git a/DesignTools/Primitives/HalfSphereObject3D.cs b/DesignTools/Primitives/HalfSphereObject3D.cs index 1a46a4e57..d403091f1 100644 --- a/DesignTools/Primitives/HalfSphereObject3D.cs +++ b/DesignTools/Primitives/HalfSphereObject3D.cs @@ -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) diff --git a/DesignTools/Primitives/RingObject3D.cs b/DesignTools/Primitives/RingObject3D.cs index e4d31b59a..51417aa1d 100644 --- a/DesignTools/Primitives/RingObject3D.cs +++ b/DesignTools/Primitives/RingObject3D.cs @@ -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; diff --git a/DesignTools/Primitives/SphereObject3D.cs b/DesignTools/Primitives/SphereObject3D.cs index 2ff8a6bb7..ca33c2c84 100644 --- a/DesignTools/Primitives/SphereObject3D.cs +++ b/DesignTools/Primitives/SphereObject3D.cs @@ -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; diff --git a/DesignTools/Primitives/TorusObject3D.cs b/DesignTools/Primitives/TorusObject3D.cs index db38bafeb..55dd7467e 100644 --- a/DesignTools/Primitives/TorusObject3D.cs +++ b/DesignTools/Primitives/TorusObject3D.cs @@ -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; diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index dfc3f0f80..7049f80b9 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit dfc3f0f8062d75808be6a30c3419a3ef08194a8b +Subproject commit 7049f80b9629225a0fa66eef2c257fa7a9bc8684