diff --git a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs index 106ce62..4557638 100644 --- a/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs +++ b/OSCADSharp/OSCADSharp.UnitTests/OSCADObjectTests.cs @@ -78,7 +78,7 @@ namespace OSCADSharp.UnitTests .Translate(0, 5, 10).Rotate(0, 90, 0) .Translate(0, 0, 10).Scale(1, 1, 2); - List ids = obj.Children().Select(child => child.Id).ToList(); + List ids = obj.Children().Select(child => child.Id).ToList(); ids.Add(obj.Id); Assert.AreEqual(ids.Count, ids.Distinct().Count()); diff --git a/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs b/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs index a913c6d..2a60005 100644 --- a/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs +++ b/OSCADSharp/OSCADSharp/Internal/Booleans/Difference.cs @@ -21,12 +21,12 @@ namespace OSCADSharp public override Vector3 Position() { - return children[0].Position(); + return m_children[0].Position(); } public override Bounds Bounds() { - return children[0].Bounds(); + return m_children[0].Bounds(); } } } diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs index 745a71b..b540ec9 100644 --- a/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs +++ b/OSCADSharp/OSCADSharp/Internal/Scripting/MultiStatementObject.cs @@ -18,7 +18,7 @@ namespace OSCADSharp internal MultiStatementObject(string outerStatement, IEnumerable children) { this.outerStatement = outerStatement; - this.children = children.ToList(); + this.m_children = children.ToList(); foreach (var child in children) { child.Parent = this; @@ -28,7 +28,7 @@ namespace OSCADSharp public override string ToString() { StringBuilder sb = new StringBuilder(); - foreach (var child in this.children) + foreach (var child in this.m_children) { sb.Append(child.ToString()); } @@ -40,7 +40,7 @@ namespace OSCADSharp public override OSCADObject Clone() { List childClones = new List(); - foreach (var child in this.children) + foreach (var child in this.m_children) { childClones.Add(child.Clone()); } @@ -53,7 +53,7 @@ namespace OSCADSharp public override Vector3 Position() { - var positions = this.children.Select(child => child.Position()); + var positions = this.m_children.Select(child => child.Position()); return Vector3.Average(positions.ToArray()); } @@ -62,7 +62,7 @@ namespace OSCADSharp var newBottomLeft = new Vector3(); var newTopRight = new Vector3(); - foreach (var child in this.children) + foreach (var child in this.m_children) { var bounds = child.Bounds(); if (bounds.XMin < newBottomLeft.X) diff --git a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs index eb8b2ab..6826a97 100644 --- a/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs +++ b/OSCADSharp/OSCADSharp/Internal/Scripting/SingleStatementObject.cs @@ -17,7 +17,7 @@ namespace OSCADSharp { this.obj = obj; - this.children.Add(obj); + this.m_children.Add(obj); obj.Parent = this; } } diff --git a/OSCADSharp/OSCADSharp/Internal/Settings/Ids.cs b/OSCADSharp/OSCADSharp/Internal/Settings/Ids.cs index 1659714..b2a62d0 100644 --- a/OSCADSharp/OSCADSharp/Internal/Settings/Ids.cs +++ b/OSCADSharp/OSCADSharp/Internal/Settings/Ids.cs @@ -11,14 +11,14 @@ namespace OSCADSharp /// internal static class Ids { - private static uint globalId = 0; + private static int globalId = 0; private static object idLockObject = new object(); /// /// Gets a unique auto-incrementing integer id /// /// - internal static uint Get() + internal static int Get() { lock (idLockObject) { diff --git a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs b/OSCADSharp/OSCADSharp/Public/OSCADObject.cs index 12db2a2..0cba32a 100644 --- a/OSCADSharp/OSCADSharp/Public/OSCADObject.cs +++ b/OSCADSharp/OSCADSharp/Public/OSCADObject.cs @@ -5,6 +5,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +[assembly: CLSCompliant(true)] + namespace OSCADSharp { /// @@ -14,13 +16,13 @@ namespace OSCADSharp public abstract class OSCADObject : IBindable { #region Attributes - private uint id = Ids.Get(); + private int id = Ids.Get(); /// /// The unique Id of the object /// these values auto-increment /// - public uint Id { get { return this.id; } } + public int Id { get { return this.id; } } /// /// Name of this OSCADObject @@ -775,7 +777,7 @@ namespace OSCADSharp /// /// Internal collection of children for this object /// - protected List children = new List(); + protected List m_children = new List(); /// /// Returns all chidren of this OSCADObject @@ -786,12 +788,12 @@ namespace OSCADSharp { if(recursive == false) { - return new List(this.children); + return new List(this.m_children); } // Initial children are reversed here because for objects with multiple children (such as boolean operations) // the natural collection order would yield opposite the expected order in a stack (first child would be the last popped) - Stack toTraverse = new Stack(this.children.Reverse()); + Stack toTraverse = new Stack(this.m_children.Reverse()); List allChildren = new List(); OSCADObject child = null; @@ -800,7 +802,7 @@ namespace OSCADSharp child = toTraverse.Pop(); allChildren.Add(child); - foreach (var subChild in child.children) + foreach (var subChild in child.m_children) { toTraverse.Push(subChild); } @@ -864,12 +866,12 @@ namespace OSCADSharp { if(left.GetType() == typeof(Union)) { - left.children.Add(right); + left.m_children.Add(right); return left; } else if(right.GetType() == typeof(Union)) { - right.children.Add(left); + right.m_children.Add(left); return right; } else @@ -888,12 +890,12 @@ namespace OSCADSharp { if (left.GetType() == typeof(Difference)) { - left.children.Add(right); + left.m_children.Add(right); return left; } else if (right.GetType() == typeof(Difference)) { - right.children.Add(left); + right.m_children.Add(left); return right; } else