Massive namespace reset due to mutual dependencies that shouldn't exist.

OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs

@@ -1,7 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs

@@ -1,7 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs

@@ -2,7 +2,6 @@
 using System.Text;
 using System.Collections.Generic;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 
 namespace OSCADSharp.UnitTests
 {

OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs

@@ -1,6 +1,5 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 
 namespace OSCADSharp.UnitTests
 {

OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs

@@ -1,5 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using OSCADSharp.Scripting;
 using System;
 using System.Collections.Generic;
 using System.Linq;

OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Scripting;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class BindableBoolean : IBindable
     {

OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Scripting;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class BindableVector : Vector3, IBindable
     {

OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs

@@ -1,11 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class Binding
     {

OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs

@@ -1,12 +1,11 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal class Bindings
     {

OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs

@@ -1,5 +1,4 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings
+namespace OSCADSharp
 {
     internal interface IBindings
     {

OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs

@@ -1,11 +1,10 @@
-using OSCADSharp.Bindings;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings.Solids
+namespace OSCADSharp
 {
     internal class CubeBindings : ICloneable<CubeBindings>, IBindings
     {

OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Bindings.Solids
+namespace OSCADSharp
 {
     internal class SphereBindings : ICloneable<SphereBindings>, IBindings
     {

OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs

@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Booleans
+namespace OSCADSharp
 {
     /// <summary>
     /// Subtracts the 2nd (and all further) child nodes from the first one (logical and not).    

OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs

@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using OSCADSharp.Spatial;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Booleans
+namespace OSCADSharp
 {
     /// <summary>
     /// Creates the intersection of all child nodes

OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs

@@ -1,11 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Booleans
+namespace OSCADSharp
 {
     /// <summary>
     /// A union of child nodes. This is the sum of all children (logical or).    

OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Files
+namespace OSCADSharp
 {
     internal class DefaultFileInvoker : IFileInvoker
     {

OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Files
+namespace OSCADSharp
 {
     internal class DefaultFileWriter : IFileWriter
     {

OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     internal class CompoundVariable : Variable
     {

OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
 
     /// <summary>

OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     /// <summary>
     /// A class that creates blocks of curly-braced script with the

OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs

@@ -3,9 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     /// <summary>
     /// A statement with just one nested child node

OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs

@@ -1,12 +1,10 @@
-using OSCADSharp.Bindings;
+using System;
-using OSCADSharp.Bindings.Solids;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting.Solids
+namespace OSCADSharp
 {
     internal class CubeScriptBuilder
     {

OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs

@@ -1,11 +1,10 @@
-using OSCADSharp.Bindings;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting.Solids
+namespace OSCADSharp
 {
     internal class SphereScriptBuilder
     {

OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs

@@ -1,11 +1,10 @@
-using OSCADSharp.Bindings;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Scripting
+namespace OSCADSharp
 {
     /// <summary>
     /// Extends the capabilities of StringBuilder with domain-specific behavior
@@ -14,10 +13,10 @@ namespace OSCADSharp.Scripting
     internal class StatementBuilder
     {
         private StringBuilder SB { get; set; } = new StringBuilder();
-        private Bindings.Bindings bindings = null;
+        private Bindings bindings = null;
         private IBindings ibindings = null;
 
-        internal StatementBuilder(Bindings.Bindings bindings)
+        internal StatementBuilder(Bindings bindings)
         {
             this.bindings = bindings;
         }

OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs

@@ -1,5 +1,4 @@
-using OSCADSharp.Bindings;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;

OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Spatial
+namespace OSCADSharp
 {
     /// <summary>
     /// A Matrix for performing operations on doubles that

OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs

@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that has color and/or opacity applied to it
@@ -73,7 +71,7 @@ namespace OSCADSharp.Transforms
             return this.obj.Bounds();
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             {"color", "color" },
             {"opacity", "opacity" }
         });

OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs

@@ -1,11 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// Creates an object that's the convex hull of child objects

OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs

@@ -1,12 +1,10 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// Creates an object that's the minkowski sum of child objects

OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs

@@ -1,13 +1,10 @@
-using OSCADSharp.Bindings;
+using System;
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that's mirrored on a plane
@@ -106,7 +103,7 @@ namespace OSCADSharp.Transforms
             return new Bounds(newBottomLeft, newTopRight);
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             {"normal", "normal"}
         });
         public override void Bind(string property, Variable variable)

OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs

@@ -1,13 +1,7 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that's been resized to a specified set of X/Y/Z dimensions
@@ -87,7 +81,7 @@ namespace OSCADSharp.Transforms
         }
 
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "size", "size" }
         });
         public override void Bind(string property, Variable variable)

OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs

@@ -1,13 +1,10 @@
-using OSCADSharp.Bindings;
+using System;
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object with rotation applied
@@ -73,7 +70,7 @@ namespace OSCADSharp.Transforms
                               Matrix.GetRotatedPoint(oldBounds.TopRight, this.Angle.X, this.Angle.Y, this.Angle.Z));
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "angle", "angle" }
         });
         public override void Bind(string property, Variable variable)

OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs

@@ -1,13 +1,7 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object that's been rescaled
@@ -72,7 +66,7 @@ namespace OSCADSharp.Transforms
             return new Bounds(oldBounds.BottomLeft * this.ScaleFactor, oldBounds.TopRight * this.ScaleFactor);
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "scalefactor", "scalefactor" }
         });
         public override void Bind(string property, Variable variable)

OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs

@@ -1,13 +1,7 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
-namespace OSCADSharp.Transforms
+namespace OSCADSharp
 {
     /// <summary>
     /// An object or objects that have been moved along the specified vector
@@ -78,7 +72,7 @@ namespace OSCADSharp.Transforms
             return new Bounds(oldBounds.BottomLeft + this.Vector, oldBounds.TopRight + this.Vector);
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>() {
+        private Bindings bindings = new Bindings(new Dictionary<string, string>() {
             { "vector", "vector" }
         });
         public override void Bind(string property, Variable variable)

OSCADSharp/OSCADSharp/Public/OSCADObject.cs

@@ -1,10 +1,4 @@
-using OSCADSharp.Bindings;
+using System;
-using OSCADSharp.Booleans;
-using OSCADSharp.Files;
-using OSCADSharp.Scripting;
-using OSCADSharp.Spatial;
-using OSCADSharp.Transforms;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs

@@ -1,5 +1,4 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs

@@ -1,5 +1,4 @@
-using OSCADSharp.Files;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

OSCADSharp/OSCADSharp/Public/Settings/Settings.cs

@@ -1,6 +1,4 @@
-using OSCADSharp.Files;
+using System;
-using OSCADSharp.Scripting;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

OSCADSharp/OSCADSharp/Public/Solids/Cube.cs

@@ -3,11 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
-using OSCADSharp.Scripting;
-using OSCADSharp.Bindings.Solids;
-using OSCADSharp.Scripting.Solids;
 
 namespace OSCADSharp
 {

OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs

@@ -3,9 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Scripting;
-using OSCADSharp.Bindings;
 
 namespace OSCADSharp
 {
@@ -261,7 +258,7 @@ namespace OSCADSharp
             }
         }
                 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>()
+        private Bindings bindings = new Bindings(new Dictionary<string, string>()
         {
             {"radius", "r" },
             {"radius1", "r1" },

OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs

@@ -3,13 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Scripting;
 using System.Collections.Concurrent;
 using System.Reflection;
-using OSCADSharp.Bindings;
-using OSCADSharp.Bindings.Solids;
-using OSCADSharp.Scripting.Solids;
 
 namespace OSCADSharp
 {

OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs

@@ -1,11 +1,8 @@
-using OSCADSharp.Scripting;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using OSCADSharp.Spatial;
-using OSCADSharp.Bindings;
 
 namespace OSCADSharp
 {
@@ -170,7 +167,7 @@ namespace OSCADSharp
             throw new NotSupportedException("Bounds are not supported for objects using Text3D");
         }
 
-        private Bindings.Bindings bindings = new Bindings.Bindings(new Dictionary<string, string>()
+        private Bindings bindings = new Bindings(new Dictionary<string, string>()
         {
             { "text", "text" },
             { "size", "size" },

OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs

@@ -1,5 +1,4 @@
-using OSCADSharp.Spatial;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;