diff --git a/源代码/.Net/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 b/源代码/.Net/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 index 4393315c..1a12648e 100644 Binary files a/源代码/.Net/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 and b/源代码/.Net/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 differ diff --git a/源代码/.Net/.vs/ProjectEvaluation/stgsharp.projects.v5.1 b/源代码/.Net/.vs/ProjectEvaluation/stgsharp.projects.v5.1 index c4f6bc2b..d43b6003 100644 Binary files a/源代码/.Net/.vs/ProjectEvaluation/stgsharp.projects.v5.1 and b/源代码/.Net/.vs/ProjectEvaluation/stgsharp.projects.v5.1 differ diff --git a/源代码/.Net/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 b/源代码/.Net/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 index a2726df0..91aae50c 100644 Binary files a/源代码/.Net/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 and b/源代码/.Net/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/10238615-2735-4f1d-8d51-0ca0d945e820.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/10238615-2735-4f1d-8d51-0ca0d945e820.vsidx deleted file mode 100644 index 6123f206..00000000 Binary files a/源代码/.Net/.vs/StgSharp/FileContentIndex/10238615-2735-4f1d-8d51-0ca0d945e820.vsidx and /dev/null differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/49cfc4b4-a6c5-4f49-b8da-949d312d0acc.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/49cfc4b4-a6c5-4f49-b8da-949d312d0acc.vsidx new file mode 100644 index 00000000..f6e6bf46 Binary files /dev/null and b/源代码/.Net/.vs/StgSharp/FileContentIndex/49cfc4b4-a6c5-4f49-b8da-949d312d0acc.vsidx differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/58becdc9-9908-4682-8ca8-8df964c9c4ef.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/58becdc9-9908-4682-8ca8-8df964c9c4ef.vsidx new file mode 100644 index 00000000..38d02ce5 Binary files /dev/null and b/源代码/.Net/.vs/StgSharp/FileContentIndex/58becdc9-9908-4682-8ca8-8df964c9c4ef.vsidx differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/9035f503-b30e-4a66-a0b8-c3556a44bfc5.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/9035f503-b30e-4a66-a0b8-c3556a44bfc5.vsidx deleted file mode 100644 index ea8c848e..00000000 Binary files a/源代码/.Net/.vs/StgSharp/FileContentIndex/9035f503-b30e-4a66-a0b8-c3556a44bfc5.vsidx and /dev/null differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/aeed5dd1-0eba-4f66-a1cd-065ba786bf9a.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/aeed5dd1-0eba-4f66-a1cd-065ba786bf9a.vsidx new file mode 100644 index 00000000..b2c3b6e4 Binary files /dev/null and b/源代码/.Net/.vs/StgSharp/FileContentIndex/aeed5dd1-0eba-4f66-a1cd-065ba786bf9a.vsidx differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/bcdab74b-d941-4527-9bd0-b97a8a5d7b93.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/bcdab74b-d941-4527-9bd0-b97a8a5d7b93.vsidx new file mode 100644 index 00000000..1732039e Binary files /dev/null and b/源代码/.Net/.vs/StgSharp/FileContentIndex/bcdab74b-d941-4527-9bd0-b97a8a5d7b93.vsidx differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/ed60a3ec-4baf-433c-82c2-cc9bd1dd3cc7.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/ed60a3ec-4baf-433c-82c2-cc9bd1dd3cc7.vsidx deleted file mode 100644 index bd5c809c..00000000 Binary files a/源代码/.Net/.vs/StgSharp/FileContentIndex/ed60a3ec-4baf-433c-82c2-cc9bd1dd3cc7.vsidx and /dev/null differ diff --git a/源代码/.Net/.vs/StgSharp/FileContentIndex/fd37d49c-c29f-414b-bfa2-4a22799da225.vsidx b/源代码/.Net/.vs/StgSharp/FileContentIndex/fd37d49c-c29f-414b-bfa2-4a22799da225.vsidx deleted file mode 100644 index 13fdba7e..00000000 Binary files a/源代码/.Net/.vs/StgSharp/FileContentIndex/fd37d49c-c29f-414b-bfa2-4a22799da225.vsidx and /dev/null differ diff --git a/源代码/.Net/.vs/StgSharp/v17/.futdcache.v2 b/源代码/.Net/.vs/StgSharp/v17/.futdcache.v2 index 9f7e3fac..cd74f99e 100644 Binary files a/源代码/.Net/.vs/StgSharp/v17/.futdcache.v2 and b/源代码/.Net/.vs/StgSharp/v17/.futdcache.v2 differ diff --git a/源代码/.Net/.vs/StgSharp/v17/.suo b/源代码/.Net/.vs/StgSharp/v17/.suo index 4bf7fa25..3131d9e6 100644 Binary files a/源代码/.Net/.vs/StgSharp/v17/.suo and b/源代码/.Net/.vs/StgSharp/v17/.suo differ diff --git a/源代码/.Net/StgSharp/Control/Add.cs b/源代码/.Net/StgSharp/Control/Add.cs index 70df2052..c1d4ca6a 100644 --- a/源代码/.Net/StgSharp/Control/Add.cs +++ b/源代码/.Net/StgSharp/Control/Add.cs @@ -1,5 +1,4 @@ using GLFWDotNet; -using StgSharp.Geometries; using System; using System.Collections.Generic; using System.Text; @@ -8,7 +7,7 @@ namespace StgSharp.Control { public static class Add { - public static void Point(IGeometrySimple geometry) + public static void Point(IGeometry geometry) { Point p = new Point(); p.getXHandler += geometry.SetArrayX; diff --git a/源代码/.Net/StgSharp/Control/Change.cs b/源代码/.Net/StgSharp/Control/Change.cs index 615b7c2e..54ed4b16 100644 --- a/源代码/.Net/StgSharp/Control/Change.cs +++ b/源代码/.Net/StgSharp/Control/Change.cs @@ -1,5 +1,4 @@ -using StgSharp.Logic; -using System; +using System; using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; diff --git a/源代码/.Net/StgSharp/Control/Remove.cs b/源代码/.Net/StgSharp/Control/Remove.cs index c2406953..71ea75ff 100644 --- a/源代码/.Net/StgSharp/Control/Remove.cs +++ b/源代码/.Net/StgSharp/Control/Remove.cs @@ -1,6 +1,4 @@ -using StgSharp.Logic; -using StgSharp.Geometries; -using System; +using System; using System.Collections.Generic; using System.Text; @@ -10,11 +8,11 @@ namespace StgSharp.Control { public static void Point(Point p) { - Logic.ContainerNode _cache = p.ID; - _cache.Previous.Next=_cache.Next; + StgSharp.ContainerNode _cache = p._id; + _cache.Previous.Next = _cache.Next; _cache.Next.Previous = _cache.Previous; - _cache.Next = default(Logic.ContainerNode); - _cache.Previous = default(Logic.ContainerNode); + _cache.Next = default(StgSharp.ContainerNode); + _cache.Previous = default(StgSharp.ContainerNode); } } } diff --git a/源代码/.Net/StgSharp/Control/TimeLine.cs b/源代码/.Net/StgSharp/Control/TimeLine.cs index a0c71de6..d8f37cff 100644 --- a/源代码/.Net/StgSharp/Control/TimeLine.cs +++ b/源代码/.Net/StgSharp/Control/TimeLine.cs @@ -1,5 +1,4 @@ -using StgSharp.Logic; -using System; +using System; using System.Collections.Generic; using System.Text; diff --git a/源代码/.Net/StgSharp/Entities/IEntity.cs b/源代码/.Net/StgSharp/Entities/IEntity.cs index 8adb9411..7d47da83 100644 --- a/源代码/.Net/StgSharp/Entities/IEntity.cs +++ b/源代码/.Net/StgSharp/Entities/IEntity.cs @@ -1,14 +1,15 @@ -using StgSharp.Geometries; -using StgSharp.Logic; +using StgSharp; using System; using System.Collections.Generic; using System.Text; -namespace StgSharp.Entities +namespace StgSharp { public interface IEntity:INode { - public IGeometrySimple CollisionShape { get; set; } + + + public IGeometry CollisionShape { get; set; } public Sensor CollisionSensor { get; set; } diff --git a/源代码/.Net/StgSharp/Geometries/Circle.cs b/源代码/.Net/StgSharp/Geometries/Circle.cs index a9072136..c45b07ac 100644 --- a/源代码/.Net/StgSharp/Geometries/Circle.cs +++ b/源代码/.Net/StgSharp/Geometries/Circle.cs @@ -1,14 +1,13 @@ -using StgSharp.Logic; -using StgSharp.Geometries; +using StgSharp; using System; using System.Collections.Generic; using System.Text; -namespace StgSharp.Geometries +namespace StgSharp { - public class Circle : IGeometrySimple + public class Circle : IGeometry { - private Logic.ContainerNode _id; + private StgSharp.ContainerNode _id; internal Point _referencePoint; internal float _vecX; internal float _vecY; @@ -28,7 +27,10 @@ namespace StgSharp.Geometries get { return _vecY; } } - + ContainerNode INode.ID + { + get { return _id; } + } public float SetArrayX(Counter tickCounter) { @@ -39,5 +41,17 @@ namespace StgSharp.Geometries { throw new NotImplementedException(); } + + void INode.setID(ContainerNode id) + { + if (_id == default(ContainerNode)) + { + _id = id as ContainerNode; + } + else + { + throw new ArgumentException(); + } + } } } diff --git a/源代码/.Net/StgSharp/Geometries/GetLocationHandler.cs b/源代码/.Net/StgSharp/Geometries/GetLocationHandler.cs index e0b60e3a..a6dcb8ca 100644 --- a/源代码/.Net/StgSharp/Geometries/GetLocationHandler.cs +++ b/源代码/.Net/StgSharp/Geometries/GetLocationHandler.cs @@ -1,9 +1,9 @@ -using StgSharp.Logic; +using StgSharp; using System; using System.Collections.Generic; using System.Text; -namespace StgSharp.Geometries +namespace StgSharp { public delegate float GetLocationHandler(Counter tickCounter); } diff --git a/源代码/.Net/StgSharp/Geometries/IGeometrySimple.cs b/源代码/.Net/StgSharp/Geometries/IGeometry.cs similarity index 80% rename from 源代码/.Net/StgSharp/Geometries/IGeometrySimple.cs rename to 源代码/.Net/StgSharp/Geometries/IGeometry.cs index 440049c6..2f8af74a 100644 --- a/源代码/.Net/StgSharp/Geometries/IGeometrySimple.cs +++ b/源代码/.Net/StgSharp/Geometries/IGeometry.cs @@ -1,13 +1,13 @@ -using StgSharp.Logic; +using StgSharp; using System; using System.Collections.Generic; using System.Text; -namespace StgSharp.Geometries +namespace StgSharp { - public interface IGeometrySimple:INode + public interface IGeometry:INode { public Point ReferencePoint { diff --git a/源代码/.Net/StgSharp/Geometries/Line.cs b/源代码/.Net/StgSharp/Geometries/Line.cs index ff63bb10..5e78bacf 100644 --- a/源代码/.Net/StgSharp/Geometries/Line.cs +++ b/源代码/.Net/StgSharp/Geometries/Line.cs @@ -1,14 +1,13 @@ -using StgSharp.Control; -using StgSharp.Logic; +using StgSharp; using System; using System.Collections.Generic; using System.Text; -namespace StgSharp.Geometries +namespace StgSharp { - public class Line:IGeometrySimple + public class Line:IGeometry { - private Logic.ContainerNode _id; + private ContainerNode _id; internal Point _referencePoint; internal float _vecX; @@ -29,6 +28,10 @@ namespace StgSharp.Geometries get { return _vecY; } } + ContainerNode INode.ID + { + get { return _id; } + } public Line( Point referencePoint, float vecX, float vecY) { @@ -45,8 +48,17 @@ namespace StgSharp.Geometries { return 0.0f; } - - + void INode.setID(ContainerNode id) + { + if (id == null) + { + _id = id as ContainerNode; + } + else + { + throw new ArgumentNullException("Cannot set id teice!"); + } + } } } diff --git a/源代码/.Net/StgSharp/Geometries/Rectangle.cs b/源代码/.Net/StgSharp/Geometries/Rectangle.cs deleted file mode 100644 index f73a6ddf..00000000 --- a/源代码/.Net/StgSharp/Geometries/Rectangle.cs +++ /dev/null @@ -1,35 +0,0 @@ -using StgSharp.Logic; -using System; -using System.Collections.Generic; -using System.Text; - -namespace StgSharp.Geometries -{ - public class Rectangle:IGeometryComplex - { - - internal Point _vertex; - - internal float _vecX1; - internal float _vecX2; - - internal float _vecY1; - internal float _vecY2; - - - public Rectangle( Line side1, Line side2 ) - { - _vecX1 = side1.VecX; - _vecX2 = side2.VecX; - - _vecY1 = side1.VecY; - _vecY2 = side2.VecY; - - if (_vecX1 * _vecX2 + _vecY1 * _vecY2 !=0 ) - { - throw new ArgumentException("Given lines cannot form a rectangle!"); - } - } - - } -} diff --git a/源代码/.Net/StgSharp/Geometries/Square.cs b/源代码/.Net/StgSharp/Geometries/Square.cs deleted file mode 100644 index 71d9c119..00000000 --- a/源代码/.Net/StgSharp/Geometries/Square.cs +++ /dev/null @@ -1,49 +0,0 @@ -using StgSharp.Logic; -using System; -using System.Collections.Generic; -using System.Text; - -namespace StgSharp.Geometries -{ - public class Square:IGeometrySimple - { - private readonly Logic.ContainerNode _id; - internal Point _referrencePoint; - public float _vecX; - public float _vecY; - - - - public Point ReferencePoint - { - get { return _referrencePoint; } - } - - public float VecX - { - get { return _vecX; } - } - - public float VecY - { - get - { - return _vecY; - } - } - - - - public float SetArrayX(Counter tickCounter) - { - return 0.0f; - } - - public float SetArrayY(Counter tickCounter) - { - return 0.0f; - } - - - } -} diff --git a/源代码/.Net/StgSharp/Geometries/Triangle.cs b/源代码/.Net/StgSharp/Geometries/Triangle.cs new file mode 100644 index 00000000..a737472b --- /dev/null +++ b/源代码/.Net/StgSharp/Geometries/Triangle.cs @@ -0,0 +1,59 @@ +using StgSharp; +using System; +using System.Collections.Generic; +using System.Text; + +namespace StgSharp +{ + public class Triangle : IGeometry + { + internal ContainerNode _id; + + internal Point _referencePoint; + + internal GetLocationHandler _setArrayXHandler; + internal GetLocationHandler _setArrayYHandler; + + public Point ReferencePoint + { + get { return _referencePoint; } + } + + public float VecX + { + get { return _referencePoint.X; } + } + + public float VecY + { + get { return _referencePoint.Y; } + } + + ContainerNode INode.ID + { + get { return _id; } + } + + public float SetArrayX(Counter tickCounter) + { + return _setArrayXHandler.Invoke(tickCounter); + } + + public float SetArrayY(Counter tickCounter) + { + return _setArrayYHandler.Invoke(tickCounter); + } + + void INode.setID(ContainerNode id) + { + if (id == null) + { + _id = id as ContainerNode; + } + else + { + throw new ArgumentNullException("Cannot set id teice!"); + } + } + } +} diff --git a/源代码/.Net/StgSharp/Geometries/point.cs b/源代码/.Net/StgSharp/Geometries/point.cs index d04ac3f7..be93bbe4 100644 --- a/源代码/.Net/StgSharp/Geometries/point.cs +++ b/源代码/.Net/StgSharp/Geometries/point.cs @@ -1,6 +1,5 @@ using GLFWDotNet; -using StgSharp.Control; -using StgSharp.Logic; +using StgSharp; using System; using System.Collections.Generic; using System.Drawing; @@ -8,11 +7,11 @@ using System.Security.Cryptography; using System.Text; -namespace StgSharp.Geometries +namespace StgSharp { public class Point: INode { - private Logic.ContainerNode _id; + internal StgSharp.ContainerNode _id; internal float _x; internal float _y; @@ -20,23 +19,36 @@ namespace StgSharp.Geometries public GetLocationHandler getXHandler; public GetLocationHandler getYHandler; + ContainerNode INode.ID + { + get { return this._id; } + } + public float X { get { - return getXHandler(TimeLine.tickCounter); + return getXHandler(Control.TimeLine.tickCounter); } } public float Y { get { - return getYHandler(TimeLine.tickCounter); + return getYHandler(Control.TimeLine.tickCounter); } } - - - + void INode.setID(ContainerNode id) + { + if (id == null) + { + _id = id as ContainerNode; + } + else + { + throw new ArgumentNullException("Cannot set id teice!"); + } + } } } diff --git a/源代码/.Net/StgSharp/Logic/ContainerNode.cs b/源代码/.Net/StgSharp/Logic/ContainerNode.cs index 4578d763..fb90fb82 100644 --- a/源代码/.Net/StgSharp/Logic/ContainerNode.cs +++ b/源代码/.Net/StgSharp/Logic/ContainerNode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public class ContainerNode where T : INode { @@ -11,6 +11,8 @@ namespace StgSharp.Logic internal ContainerNode _next; internal ContainerNode _side; + + public virtual ContainerNode Previous { get { return _previous; } @@ -37,6 +39,7 @@ namespace StgSharp.Logic public ContainerNode(T t) { _this = t; + t.setID(this); } } } diff --git a/源代码/.Net/StgSharp/Logic/Counter.cs b/源代码/.Net/StgSharp/Logic/Counter.cs index c7b4017e..04c04507 100644 --- a/源代码/.Net/StgSharp/Logic/Counter.cs +++ b/源代码/.Net/StgSharp/Logic/Counter.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public class Counterwhere T:struct, IConvertible, IFormattable, IComparable { diff --git a/源代码/.Net/StgSharp/Logic/Dictionary.cs b/源代码/.Net/StgSharp/Logic/Dictionary.cs index f23e897d..2e5e983d 100644 --- a/源代码/.Net/StgSharp/Logic/Dictionary.cs +++ b/源代码/.Net/StgSharp/Logic/Dictionary.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public class Dictionary where T : Enum ,INode { diff --git a/源代码/.Net/StgSharp/Logic/INode.cs b/源代码/.Net/StgSharp/Logic/INode.cs index a474cf24..0894e992 100644 --- a/源代码/.Net/StgSharp/Logic/INode.cs +++ b/源代码/.Net/StgSharp/Logic/INode.cs @@ -2,11 +2,12 @@ using System.Collections.Generic; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public interface INode { + internal ContainerNode ID { get; } - + internal void setID(ContainerNode id) where T:INode; } } diff --git a/源代码/.Net/StgSharp/Logic/LinkedList.cs b/源代码/.Net/StgSharp/Logic/LinkedList.cs index 028f1e48..671e858d 100644 --- a/源代码/.Net/StgSharp/Logic/LinkedList.cs +++ b/源代码/.Net/StgSharp/Logic/LinkedList.cs @@ -2,19 +2,19 @@ using System.Collections.Generic; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public class LinkedList where T: INode { - internal ContainerNode _head; + internal ContainerNode _first; internal ContainerNode _tail; private ContainerNode _cache; - public T Head + public T First { - get { return _head._this; } - set { _head = new ContainerNode(value); } + get { return _first._this; } + set { _first = new ContainerNode(value); } } public T Tail @@ -26,9 +26,9 @@ namespace StgSharp.Logic public void Add(T t) { - if (_head != default(ContainerNode)) + if (_first != default(ContainerNode)) { - Head = t; + First = t; } else { diff --git a/源代码/.Net/StgSharp/Logic/Pool.cs b/源代码/.Net/StgSharp/Logic/Pool.cs index cdbddeb6..34259c89 100644 --- a/源代码/.Net/StgSharp/Logic/Pool.cs +++ b/源代码/.Net/StgSharp/Logic/Pool.cs @@ -1,17 +1,15 @@ -using StgSharp.Control; -using StgSharp.Geometries; -using StgSharp.Logic; +using StgSharp; using System; using System.Collections.Generic; using System.Net.Http.Headers; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public class Pool { public LinkedList pointContainer; - public LinkedList geometryContainer; + public LinkedList geometryContainer; public LinkedList sensorContainer; public Line leftBoader; @@ -22,13 +20,13 @@ namespace StgSharp.Logic public void OnRender() { - ContainerNode idCache = pointContainer._head; + ContainerNode idCache = pointContainer._first; Point p; do { p = idCache._this; - p._x = p.getXHandler.Invoke(TimeLine.tickCounter); - p._y = p.getYHandler.Invoke(TimeLine.tickCounter); + p._x = p.getXHandler.Invoke(Control.TimeLine.tickCounter); + p._y = p.getYHandler.Invoke(Control.TimeLine.tickCounter); idCache = idCache._next; } while (idCache != default(ContainerNode)); diff --git a/源代码/.Net/StgSharp/Logic/Sensor.cs b/源代码/.Net/StgSharp/Logic/Sensor.cs index 1d85bca3..f6ead664 100644 --- a/源代码/.Net/StgSharp/Logic/Sensor.cs +++ b/源代码/.Net/StgSharp/Logic/Sensor.cs @@ -2,13 +2,27 @@ using System.Collections.Generic; using System.Text; -namespace StgSharp.Logic +namespace StgSharp { public class Sensor : INode { - private ContainerNode _id; + private ContainerNode _id; + ContainerNode INode.ID + { + get { return _id; } + } - + void INode.setID(ContainerNode id) + { + if (id == null) + { + _id = id as ContainerNode; + } + else + { + throw new ArgumentNullException("Cannot set id teice!"); + } + } } } diff --git a/源代码/.Net/StgSharp/Math/Log.cs b/源代码/.Net/StgSharp/Math/Log.cs new file mode 100644 index 00000000..6f550175 --- /dev/null +++ b/源代码/.Net/StgSharp/Math/Log.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace StgSharp +{ + public static partial class Math + { + /// + /// + /// + /// + /// + /// Returns the value of ln(x). + /// + public static float Log(float x) + { + + } + } +} diff --git a/源代码/.Net/StgSharp/Geometries/IGeometryComplex.cs b/源代码/.Net/StgSharp/Math/Sin.cs similarity index 56% rename from 源代码/.Net/StgSharp/Geometries/IGeometryComplex.cs rename to 源代码/.Net/StgSharp/Math/Sin.cs index c2c40a61..5fba4d94 100644 --- a/源代码/.Net/StgSharp/Geometries/IGeometryComplex.cs +++ b/源代码/.Net/StgSharp/Math/Sin.cs @@ -2,11 +2,10 @@ using System.Collections.Generic; using System.Text; -namespace StgSharp.Geometries +namespace StgSharp { - public interface IGeometryComplex + public static partial class Math { - } } diff --git a/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.dll b/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.dll index 2bd70e38..36e5f5f8 100644 Binary files a/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.dll and b/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.dll differ diff --git a/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.pdb b/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.pdb index 297b8697..8503ede0 100644 Binary files a/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.pdb and b/源代码/.Net/StgSharp/bin/Debug/netstandard2.1/StgSharp.pdb differ diff --git a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache index cbddf5b9..12c249dd 100644 --- a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache +++ b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9bdca74aa3bf0b9908c1b3dd7529115cfc8b9480 +ffe0859de4666337fddb22395a629f5b2a7223e3 diff --git a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.dll b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.dll index 2bd70e38..36e5f5f8 100644 Binary files a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.dll and b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.dll differ diff --git a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.pdb b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.pdb index 297b8697..8503ede0 100644 Binary files a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.pdb and b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/StgSharp.pdb differ diff --git a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/ref/StgSharp.dll b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/ref/StgSharp.dll index 0218d5aa..034dbbf8 100644 Binary files a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/ref/StgSharp.dll and b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/ref/StgSharp.dll differ diff --git a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/refint/StgSharp.dll b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/refint/StgSharp.dll index 0218d5aa..034dbbf8 100644 Binary files a/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/refint/StgSharp.dll and b/源代码/.Net/StgSharp/obj/Debug/netstandard2.1/refint/StgSharp.dll differ diff --git a/源代码/.Net/StgSharpDebug/Program.cs b/源代码/.Net/StgSharpDebug/Program.cs index 6f668f26..699264ab 100644 --- a/源代码/.Net/StgSharpDebug/Program.cs +++ b/源代码/.Net/StgSharpDebug/Program.cs @@ -1,6 +1,4 @@ using StgSharp; -using StgSharp.Geometries; -using StgSharp.Logic; using System; internal class Program @@ -24,8 +22,8 @@ internal class Program Point p = new Point(); Point p2 = new Point(); - StgSharp.Logic.ContainerNode pC = new StgSharp.Logic.ContainerNode(p); - StgSharp.Logic.ContainerNode pC02 = new StgSharp.Logic.ContainerNode(p2); + ContainerNode pC = new ContainerNode(p); + ContainerNode pC02 = new ContainerNode(p2); pC.Next=pC02; diff --git a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.dll b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.dll index 2bd70e38..36e5f5f8 100644 Binary files a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.dll and b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.dll differ diff --git a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.pdb b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.pdb index 297b8697..8503ede0 100644 Binary files a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.pdb and b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharp.pdb differ diff --git a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.dll b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.dll index 16ec25ff..63709bc4 100644 Binary files a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.dll and b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.dll differ diff --git a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.pdb b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.pdb index 84f02a3e..ddc30242 100644 Binary files a/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.pdb and b/源代码/.Net/StgSharpDebug/bin/Debug/net6.0/StgSharpDebug.pdb differ diff --git a/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache b/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache index 577d3052..f0b4d247 100644 Binary files a/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache and b/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.dll b/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.dll index 16ec25ff..63709bc4 100644 Binary files a/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.dll and b/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.dll differ diff --git a/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.pdb b/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.pdb index 84f02a3e..ddc30242 100644 Binary files a/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.pdb and b/源代码/.Net/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.pdb differ