elias/OSCADSharpDotnet7
1
0
Fork 0
mirror of https://github.com/eliasstepanik/OSCADSharpDotnet7.git synced 2026-01-11 13:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Smith 2016-03-11 18:40:19 -08:00
parent 1f41470dbb
commit 93912fde9e
51 changed files with 63 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs
View File

@ -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;

2
OSCADSharp/OSCADSharp.UnitTests/SettingsTests.cs
View File

@ -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;

1
OSCADSharp/OSCADSharp.UnitTests/Solids/CubeTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Solids/CylinderTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Solids/SphereTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Solids/Text3DTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Transforms/ColorTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Transforms/MirrorTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Transforms/ResizeTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Transforms/RotateTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Transforms/ScaleTests.cs
View File

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

1
OSCADSharp/OSCADSharp.UnitTests/Transforms/TranslateTests.cs
View File

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

3
OSCADSharp/OSCADSharp/Internal/Bindings/BindableBoolean.cs
View File

@ -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
{

3
OSCADSharp/OSCADSharp/Internal/Bindings/BindableVector.cs
View File

@ -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
{

5
OSCADSharp/OSCADSharp/Internal/Bindings/Binding.cs
View File

@ -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
{

5
OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs
View File

@ -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
{

3
OSCADSharp/OSCADSharp/Internal/Bindings/IBindable.cs
View File

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

2
OSCADSharp/OSCADSharp/Internal/Bindings/IBindings.cs
View File

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

5
OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs
View File

@ -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
{

2
OSCADSharp/OSCADSharp/Internal/Bindings/Solids/SphereBindings.cs
View File

@ -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
{

6
OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs
View File

@ -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).

6
OSCADSharp/OSCADSharp/Internal/Booleans/Intersection.cs
View File

@ -1,12 +1,10 @@
using OSCADSharp.Scripting;
using OSCADSharp.Spatial;
using System;
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

5
OSCADSharp/OSCADSharp/Internal/Booleans/Union.cs
View File

@ -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).

2
OSCADSharp/OSCADSharp/Internal/Files/DefaultFileInvoker.cs
View File

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

2
OSCADSharp/OSCADSharp/Internal/Files/DefaultFileWriter.cs
View File

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

2
OSCADSharp/OSCADSharp/Internal/Scripting/CompoundVariable.cs
View File

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

3
OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs
View File

@ -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>

2
OSCADSharp/OSCADSharp/Internal/Scripting/SingleBlockFormatter.cs
View File

@ -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

3
OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs
View File

@ -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

6
OSCADSharp/OSCADSharp/Internal/Scripting/Solids/CubeScriptBuilder.cs
View File

@ -1,12 +1,10 @@
using OSCADSharp.Bindings;
using OSCADSharp.Bindings.Solids;
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 CubeScriptBuilder
{

5
OSCADSharp/OSCADSharp/Internal/Scripting/Solids/SphereScriptBuilder.cs
View File

@ -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
{

9
OSCADSharp/OSCADSharp/Internal/Scripting/StatementBuilder.cs
View File

@ -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;
}

3
OSCADSharp/OSCADSharp/Internal/Scripting/VariableCalculator.cs
View File

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

2
OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs
View File

@ -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

8
OSCADSharp/OSCADSharp/Internal/Transforms/ColoredObject.cs
View File

@ -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" }
});

5
OSCADSharp/OSCADSharp/Internal/Transforms/HulledObject.cs
View File

@ -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

6
OSCADSharp/OSCADSharp/Internal/Transforms/MinkowskiedObject.cs
View File

@ -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

9
OSCADSharp/OSCADSharp/Internal/Transforms/MirroredObject.cs
View File

@ -1,13 +1,10 @@
using OSCADSharp.Bindings;
using OSCADSharp.Scripting;
using OSCADSharp.Spatial;
using System;
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)

12
OSCADSharp/OSCADSharp/Internal/Transforms/ResizedObject.cs
View File

@ -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)

9
OSCADSharp/OSCADSharp/Internal/Transforms/RotatedObject.cs
View File

@ -1,13 +1,10 @@
using OSCADSharp.Bindings;
using OSCADSharp.Scripting;
using OSCADSharp.Spatial;
using System;
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)

12
OSCADSharp/OSCADSharp/Internal/Transforms/ScaledObject.cs
View File

@ -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)

12
OSCADSharp/OSCADSharp/Internal/Transforms/TranslatedObject.cs
View File

@ -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)

8
OSCADSharp/OSCADSharp/Public/OSCADObject.cs
View File

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

3
OSCADSharp/OSCADSharp/Public/Scripting/Variable.cs
View File

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

3
OSCADSharp/OSCADSharp/Public/Settings/Dependencies.cs
View File

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

4
OSCADSharp/OSCADSharp/Public/Settings/Settings.cs
View File

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

5
OSCADSharp/OSCADSharp/Public/Solids/Cube.cs
View File

@ -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
{

5
OSCADSharp/OSCADSharp/Public/Solids/Cylinder.cs
View File

@ -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" },

5
OSCADSharp/OSCADSharp/Public/Solids/Sphere.cs
View File

@ -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
{

7
OSCADSharp/OSCADSharp/Public/Solids/Text3D.cs
View File

@ -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" },

3
OSCADSharp/OSCADSharp/Public/Spatial/Vector3.cs
View File

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