From 9f11c39986e1b414624e64e3c72f44822813e100 Mon Sep 17 00:00:00 2001
From: Michael Smith <mike@mikelikescoding.com>
Date: Wed, 24 Feb 2016 23:30:21 -0800
Subject: [PATCH] + Added SingleStatementObject (abstract) between OSCADObject
 and repetetive single-objectt transforms. + Shifted basic parent/child/object
 reference assignments to SingleStatementObject

---
 OSCADSharp/OSCADSharp/OSCADSharp.csproj       |  1 +
 .../Scripting/SingleStatementObject.cs        | 25 +++++++++++++++++++
 .../OSCADSharp/Scripting/StatementBuilder.cs  |  1 +
 .../OSCADSharp/Transforms/ColoredObject.cs    | 12 +++------
 .../Transforms/LinearExtrudedObject.cs        |  9 ++-----
 .../OSCADSharp/Transforms/MirroredObject.cs   | 12 +++------
 .../OSCADSharp/Transforms/ResizedObject.cs    |  9 ++-----
 .../OSCADSharp/Transforms/RotatedObject.cs    |  9 ++-----
 .../OSCADSharp/Transforms/ScaledObject.cs     |  9 ++-----
 .../OSCADSharp/Transforms/TranslatedObject.cs |  9 ++-----
 10 files changed, 43 insertions(+), 53 deletions(-)
 create mode 100644 OSCADSharp/OSCADSharp/Scripting/SingleStatementObject.cs

diff --git a/OSCADSharp/OSCADSharp/OSCADSharp.csproj b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
index b07c370..0e43fd2 100644
--- a/OSCADSharp/OSCADSharp/OSCADSharp.csproj
+++ b/OSCADSharp/OSCADSharp/OSCADSharp.csproj
@@ -48,6 +48,7 @@
     <Compile Include="Files\IFileInvoker.cs" />
     <Compile Include="Files\IFileWriter.cs" />
     <Compile Include="Ids.cs" />
+    <Compile Include="Scripting\SingleStatementObject.cs" />
     <Compile Include="Scripting\StatementBuilder.cs" />
     <Compile Include="Settings.cs" />
     <Compile Include="Sizes.cs" />
diff --git a/OSCADSharp/OSCADSharp/Scripting/SingleStatementObject.cs b/OSCADSharp/OSCADSharp/Scripting/SingleStatementObject.cs
new file mode 100644
index 0000000..ad30701
--- /dev/null
+++ b/OSCADSharp/OSCADSharp/Scripting/SingleStatementObject.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OSCADSharp.Spatial;
+
+namespace OSCADSharp.Scripting
+{
+    /// <summary>
+    /// A statement with just one nested child node
+    /// </summary>
+    internal abstract class SingleStatementObject : OSCADObject
+    {
+        protected OSCADObject obj;
+
+        public SingleStatementObject(OSCADObject obj)
+        {
+            this.obj = obj;
+
+            this.children.Add(obj);
+            obj.Parent = this;
+        }        
+    }
+}
diff --git a/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs b/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs
index 30171ad..2d440f0 100644
--- a/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs
+++ b/OSCADSharp/OSCADSharp/Scripting/StatementBuilder.cs
@@ -8,6 +8,7 @@ namespace OSCADSharp.Scripting
 {
     /// <summary>
     /// Extends the capabilities of StringBuilder with domain-specific behavior
+    /// aimed at constructing OpenSCAD commands
     /// </summary>
     internal class StatementBuilder
     {
diff --git a/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs b/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
index 9f02c14..15b15ba 100644
--- a/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/ColoredObject.cs
@@ -11,29 +11,23 @@ namespace OSCADSharp.Transforms
     /// <summary>
     /// An object that has color and/or opacity applied to it
     /// </summary>
-    internal class ColoredObject : OSCADObject
+    internal class ColoredObject : SingleStatementObject
     {
         #region Attributes
         internal string ColorName { get; set; } = "Yellow";
         internal double Opacity { get; set; } = 1.0;
         #endregion
-
-        private OSCADObject obj;
-
+        
         /// <summary>
         /// Creates a colorized object
         /// </summary>
         /// <param name="obj">The object(s) to which color will be applied</param>
         /// <param name="color">The string-wise name of the color to be applied</param>
         /// <param name="opacity">Opacity from 0.0 to 1.0 </param>
-        internal ColoredObject(OSCADObject obj, string color = "Yellow", double opacity = 1.0)
+        internal ColoredObject(OSCADObject obj, string color = "Yellow", double opacity = 1.0) : base(obj)
         {
-            this.obj = obj;
             this.ColorName = color;
             this.Opacity = opacity;
-
-            this.children.Add(obj);
-            obj.Parent = this;
         }
 
         public override string ToString()
diff --git a/OSCADSharp/OSCADSharp/Transforms/LinearExtrudedObject.cs b/OSCADSharp/OSCADSharp/Transforms/LinearExtrudedObject.cs
index 0f6900c..bc1b594 100644
--- a/OSCADSharp/OSCADSharp/Transforms/LinearExtrudedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/LinearExtrudedObject.cs
@@ -13,13 +13,12 @@ namespace OSCADSharp.Transforms
     /// 
     /// This is a limited subset of the capabilities
     /// </summary>
-    internal class LinearExtrudedObject : OSCADObject
+    internal class LinearExtrudedObject : SingleStatementObject
     {
         /// <summary>
         /// Height to extrude to
         /// </summary>
         public double Height { get; set; } = 1.0;
-        private OSCADObject obj;
 
         //TODO: Possibly implement everything else?
         //linear_extrude(height = fanwidth, center = true, convexity = 10, twist = -fanrot, slices = 20, scale = 1.0) {...}        
@@ -29,13 +28,9 @@ namespace OSCADSharp.Transforms
         /// </summary>
         /// <param name="obj"></param>
         /// <param name="height"></param>
-        public LinearExtrudedObject(OSCADObject obj, double height)
+        public LinearExtrudedObject(OSCADObject obj, double height) : base(obj)
         {
-            this.obj = obj;
             this.Height = height;
-
-            this.children.Add(obj);
-            obj.Parent = this;
         }
 
         public override OSCADObject Clone()
diff --git a/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs b/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
index 7cad6ca..54d0b68 100644
--- a/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/MirroredObject.cs
@@ -11,28 +11,22 @@ namespace OSCADSharp.Transforms
     /// <summary>
     /// An object that's mirrored on a plane
     /// </summary>
-    internal class MirroredObject : OSCADObject
+    internal class MirroredObject : SingleStatementObject
     {
         /// <summary>
         /// The normal vector of a plane intersecting the origin of the object,
         /// through which to mirror it.
         /// </summary>
         internal Vector3 Normal { get; set; } = new Vector3();
-
-        private OSCADObject obj;
-
+        
         /// <summary>
         /// Creates an object that's mirrored on a plane
         /// </summary>
         /// <param name="obj">The object(s) to be mirrored</param>
         /// <param name="normal">The normal vector of the plane on the object's origin to mirror upon</param>
-        internal MirroredObject(OSCADObject obj, Vector3 normal)
+        internal MirroredObject(OSCADObject obj, Vector3 normal) : base(obj)
         {
-            this.obj = obj;
             this.Normal = normal;
-
-            this.children.Add(obj);
-            obj.Parent = this;
         }
         
         public override string ToString()
diff --git a/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs b/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
index f8eff1a..240c49e 100644
--- a/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/ResizedObject.cs
@@ -11,26 +11,21 @@ namespace OSCADSharp.Transforms
     /// <summary>
     /// An object that's been resized to a specified set of X/Y/Z dimensions
     /// </summary>
-    internal class ResizedObject : OSCADObject
+    internal class ResizedObject : SingleStatementObject
     {
         /// <summary>
         /// Size of the object in terms of X/Y/Z
         /// </summary>
         internal Vector3 Size { get; set; }
-        private OSCADObject obj;
 
         /// <summary>
         /// Creates a resized object
         /// </summary>
         /// <param name="obj">The object(s) to be resized</param>
         /// <param name="size">The size to resize to, in terms of x/y/z dimensions</param>
-        internal ResizedObject(OSCADObject obj, Vector3 size)
+        internal ResizedObject(OSCADObject obj, Vector3 size) : base(obj)
         {
-            this.obj = obj;
             this.Size = size;
-
-            this.children.Add(obj);
-            obj.Parent = this;
         }
 
         public override string ToString()
diff --git a/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs b/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
index 616b78f..6d18cbf 100644
--- a/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/RotatedObject.cs
@@ -11,26 +11,21 @@ namespace OSCADSharp.Transforms
     /// <summary>
     /// An object with rotation applied
     /// </summary>
-    internal class RotatedObject : OSCADObject
+    internal class RotatedObject : SingleStatementObject
     {
         /// <summary>
         /// The angle to rotate, in terms of X/Y/Z euler angles
         /// </summary>
         internal Vector3 Angle { get; set; } = new Vector3();
-        private OSCADObject obj;
 
         /// <summary>
         /// Creates an object with rotation applied
         /// </summary>
         /// <param name="obj">The object being rotated</param>
         /// <param name="angle">The angle to rotate</param>
-        internal RotatedObject(OSCADObject obj, Vector3 angle)
+        internal RotatedObject(OSCADObject obj, Vector3 angle) : base(obj)
         {
-            this.obj = obj;
             this.Angle = angle;
-
-            this.children.Add(obj);
-            obj.Parent = this;
         }
 
         public override string ToString()
diff --git a/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs b/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
index e4d230e..94cdf36 100644
--- a/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/ScaledObject.cs
@@ -11,26 +11,21 @@ namespace OSCADSharp.Transforms
     /// <summary>
     /// An object that's been rescaled
     /// </summary>
-    internal class ScaledObject : OSCADObject
+    internal class ScaledObject : SingleStatementObject
     {
         /// <summary>
         /// The scale factor to be applied
         /// </summary>
         internal Vector3 ScaleFactor { get; set; } = new Vector3(1, 1, 1);
-        private OSCADObject obj;
 
         /// <summary>
         /// Creates a scaled object
         /// </summary>
         /// <param name="obj">Object(s) to be scaled</param>
         /// <param name="scale">Scale factor in x/y/z components</param>
-        internal ScaledObject(OSCADObject obj, Vector3 scale)
+        internal ScaledObject(OSCADObject obj, Vector3 scale) : base(obj)
         {
-            this.obj = obj;
             this.ScaleFactor = scale;
-
-            this.children.Add(obj);
-            obj.Parent = this;
         }
 
         public override string ToString()
diff --git a/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs b/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
index b8445f3..8f5cd5d 100644
--- a/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
+++ b/OSCADSharp/OSCADSharp/Transforms/TranslatedObject.cs
@@ -11,23 +11,18 @@ namespace OSCADSharp.Transforms
     /// <summary>
     /// An object or objects that have been moved along the specified vector
     /// </summary>
-    internal class TranslatedObject : OSCADObject
+    internal class TranslatedObject : SingleStatementObject
     {
         internal Vector3 Vector { get; set; }
-        private OSCADObject obj;
 
         /// <summary>
         /// Creates a translated object
         /// </summary>
         /// <param name="obj">Object(s) to translate</param>
         /// <param name="vector">Amount to translate by</param>
-        internal TranslatedObject(OSCADObject obj, Vector3 vector)
+        internal TranslatedObject(OSCADObject obj, Vector3 vector) : base(obj)
         {
-            this.obj = obj;
             this.Vector = vector;
-
-            this.children.Add(obj);
-            obj.Parent = this;            
         }
 
         public override string ToString()