diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs index 5ef09e2..888a052 100644 --- a/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs +++ b/OSCADSharp/OSCADSharp/Internal/Bindings/Bindings.cs @@ -21,7 +21,7 @@ namespace OSCADSharp this.propertyNametoOpenSCADFieldMappings = new Dictionary(); } - public Bindings(Dictionary mappings) + internal Bindings(Dictionary mappings) { this.propertyNametoOpenSCADFieldMappings = mappings; } diff --git a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs b/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs index dfe0bf9..eb597c5 100644 --- a/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs +++ b/OSCADSharp/OSCADSharp/Internal/Bindings/Solids/CubeBindings.cs @@ -19,8 +19,8 @@ namespace OSCADSharp {"height", "z" } }; - public BindableVector SizeBinding = new BindableVector(new Vector3(), sizeSynonyms); - public BindableBoolean CenterBinding = new BindableBoolean("center"); + public BindableVector SizeBinding { get; set; } = new BindableVector(new Vector3(), sizeSynonyms); + public BindableBoolean CenterBinding { get; set; } = new BindableBoolean("center"); public void Bind(T obj, string property, Variable variable) { diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs index 6826a97..bd6aa56 100644 --- a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs +++ b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs @@ -11,7 +11,7 @@ namespace OSCADSharp /// internal abstract class SingleStatementObject : OSCADObject { - protected OSCADObject obj; + protected OSCADObject obj { get; set; } protected SingleStatementObject(OSCADObject obj) { diff --git a/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs b/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs index 61d558e..d152869 100644 --- a/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs +++ b/OSCADSharp/OSCADSharp/Internal/Spatial/Matrix.cs @@ -78,13 +78,14 @@ namespace OSCADSharp return piOver180 * degrees; } - private static readonly Matrix identity = new Matrix(new double[] { - 1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1 - }, 4, 4); - internal static Matrix Identity { get { return identity; } } + internal static Matrix Identity() + { + return new Matrix(new double[] { + 1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1}, 4, 4); ; + } /// /// Gets a transformation matrix for performing rotations on the X-Axis @@ -95,7 +96,7 @@ namespace OSCADSharp internal static Matrix XRotation(double angle) { if (angle == 0) - return Identity; + return Identity(); double radAngle = toRadians(angle); double[] rotationArr = new double[] { @@ -117,7 +118,7 @@ namespace OSCADSharp internal static Matrix YRotation(double angle) { if (angle == 0) - return Identity; + return Identity(); double radAngle = toRadians(angle); double[] rotationArr = new double[] { @@ -139,7 +140,7 @@ namespace OSCADSharp internal static Matrix ZRotation(double angle) { if (angle == 0) - return Identity; + return Identity(); double radAngle = toRadians(angle); double[] rotationArr = new double[] { diff --git a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs b/OSCADSharp/OSCADSharp/Public/OSCADObject.cs index 0cba32a..783d0e1 100644 --- a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs +++ b/OSCADSharp/OSCADSharp/Public/OSCADObject.cs @@ -777,7 +777,7 @@ namespace OSCADSharp /// /// Internal collection of children for this object /// - protected List m_children = new List(); + protected List m_children { get; set; } = new List(); /// /// Returns all chidren of this OSCADObject diff --git a/OSCADSharp/OSCADSharp/Public/Scripting/Variables.cs b/OSCADSharp/OSCADSharp/Public/Scripting/Variables.cs index fd1b34a..d343d39 100644 --- a/OSCADSharp/OSCADSharp/Public/Scripting/Variables.cs +++ b/OSCADSharp/OSCADSharp/Public/Scripting/Variables.cs @@ -16,7 +16,7 @@ namespace OSCADSharp /// Global variables that can be assigned for output at the /// top of OpenSCAD scripts /// - public static Variables Global = new Variables(); + public static Variables Global { get; set; } = new Variables(); private ConcurrentDictionary variables = new ConcurrentDictionary(); /// diff --git a/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs b/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs index ec3cab7..4cee8b4 100644 --- a/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs +++ b/OSCADSharp/OSCADSharp/Public/Settings/Settings.cs @@ -22,6 +22,6 @@ namespace OSCADSharp /// Path to the OpenSCAD executable for file invocation /// (Default value is set the default install directory on Windows) /// - public static string OpenSCADPath = new OpenSCADPathFinder().GetPath(); + public static string OpenSCADPath { get; set; } = new OpenSCADPathFinder().GetPath(); } }