diff --git a/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 b/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1
index 76ca4fbc..ba0eb031 100644
Binary files a/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 and b/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 differ
diff --git a/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 b/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1
index 08397aef..7c6e63e3 100644
Binary files a/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 and b/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 differ
diff --git a/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 b/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2
index 12fce0a7..7313a9b9 100644
Binary files a/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 and b/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/155a64ca-cc70-483c-8b89-196a2edea9f4.vsidx b/源代码/.vs/StgSharp/FileContentIndex/155a64ca-cc70-483c-8b89-196a2edea9f4.vsidx
deleted file mode 100644
index 936de2f5..00000000
Binary files a/源代码/.vs/StgSharp/FileContentIndex/155a64ca-cc70-483c-8b89-196a2edea9f4.vsidx and /dev/null differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/2dcc0ee9-50b9-4727-8947-6fe2884d2c44.vsidx b/源代码/.vs/StgSharp/FileContentIndex/2dcc0ee9-50b9-4727-8947-6fe2884d2c44.vsidx
deleted file mode 100644
index 36485501..00000000
Binary files a/源代码/.vs/StgSharp/FileContentIndex/2dcc0ee9-50b9-4727-8947-6fe2884d2c44.vsidx and /dev/null differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/98c4f078-bc72-4530-84cb-197d9742149c.vsidx b/源代码/.vs/StgSharp/FileContentIndex/98c4f078-bc72-4530-84cb-197d9742149c.vsidx
new file mode 100644
index 00000000..07c48876
Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/98c4f078-bc72-4530-84cb-197d9742149c.vsidx differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/aeb08921-05ca-4f02-8d62-5618275d4e1a.vsidx b/源代码/.vs/StgSharp/FileContentIndex/aeb08921-05ca-4f02-8d62-5618275d4e1a.vsidx
new file mode 100644
index 00000000..7778023c
Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/aeb08921-05ca-4f02-8d62-5618275d4e1a.vsidx differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/c31c2cc5-8ff4-4518-9944-db7c6a5b987b.vsidx b/源代码/.vs/StgSharp/FileContentIndex/c31c2cc5-8ff4-4518-9944-db7c6a5b987b.vsidx
deleted file mode 100644
index 606d67a3..00000000
Binary files a/源代码/.vs/StgSharp/FileContentIndex/c31c2cc5-8ff4-4518-9944-db7c6a5b987b.vsidx and /dev/null differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/d7f24135-d430-4964-8048-2dec336ea8a4.vsidx b/源代码/.vs/StgSharp/FileContentIndex/d7f24135-d430-4964-8048-2dec336ea8a4.vsidx
new file mode 100644
index 00000000..2aab350d
Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/d7f24135-d430-4964-8048-2dec336ea8a4.vsidx differ
diff --git a/源代码/.vs/StgSharp/FileContentIndex/3a146413-6a20-4013-bec5-beb57b7e9d77.vsidx b/源代码/.vs/StgSharp/FileContentIndex/f21a4b88-bfd6-43f7-927b-5d9fa95ee628.vsidx
similarity index 83%
rename from 源代码/.vs/StgSharp/FileContentIndex/3a146413-6a20-4013-bec5-beb57b7e9d77.vsidx
rename to 源代码/.vs/StgSharp/FileContentIndex/f21a4b88-bfd6-43f7-927b-5d9fa95ee628.vsidx
index a96d7f47..5ae507da 100644
Binary files a/源代码/.vs/StgSharp/FileContentIndex/3a146413-6a20-4013-bec5-beb57b7e9d77.vsidx and b/源代码/.vs/StgSharp/FileContentIndex/f21a4b88-bfd6-43f7-927b-5d9fa95ee628.vsidx differ
diff --git a/源代码/.vs/StgSharp/v17/.futdcache.v2 b/源代码/.vs/StgSharp/v17/.futdcache.v2
index 5adecef8..7a8fc2b4 100644
Binary files a/源代码/.vs/StgSharp/v17/.futdcache.v2 and b/源代码/.vs/StgSharp/v17/.futdcache.v2 differ
diff --git a/源代码/.vs/StgSharp/v17/.suo b/源代码/.vs/StgSharp/v17/.suo
index f4fb8fe8..d59a9e7b 100644
Binary files a/源代码/.vs/StgSharp/v17/.suo and b/源代码/.vs/StgSharp/v17/.suo differ
diff --git a/源代码/.vs/StgSharp/v17/Browse.VC.db b/源代码/.vs/StgSharp/v17/Browse.VC.db
index 674b9b9a..023fbc9e 100644
Binary files a/源代码/.vs/StgSharp/v17/Browse.VC.db and b/源代码/.vs/StgSharp/v17/Browse.VC.db differ
diff --git a/源代码/StgSharp/ClassDiagram1.cd b/源代码/StgSharp/ClassDiagram1.cd
index 03e064e1..61f75821 100644
--- a/源代码/StgSharp/ClassDiagram1.cd
+++ b/源代码/StgSharp/ClassDiagram1.cd
@@ -65,7 +65,7 @@
- AAAAAAAAAAAAoAAAAABAAAAAAACAAAAAAAAAAAAAAAA=
+ AgAAAAAAAAAAogAAAABAAAAAAACAAAAAAAAAAAAAAAA=
Logic\ContainerNode.cs
@@ -87,7 +87,7 @@
- AAIIAAABAIAQAQAAAAAABAAAAAgAAAAEAAACAAAAAAA=
+ AAIIAAAAAIAAAQAAAAAABAAAAAgAAAAEAAACAAAAQAA=
Logic\LinkedList.cs
@@ -95,7 +95,7 @@
- ACAAAAABAwAYAAAAAQAAAAAAAAABAgAAAAAQIIAAEAA=
+ ACAAAABBAwAYAAAAAQAAAAAAAAABAgAAAAAQIIAAEAA=
Logic\Pool.cs
@@ -204,8 +204,8 @@
Geometries\PlainGeometry\Line.cs
-
-
+
+
AIgCAAAAAAAAAAAAAAABAIABgAAAAAAAAAAC4AIAAAA=
Geometries\PlainGeometry\Parallelogram.cs
@@ -247,7 +247,7 @@
Geometries\PlainGeometry\Polygon6.cs
-
+
AAgCAAAAAAAAAAAAAAABAAAAgAAAAAAAAAAA4AIAAAA=
@@ -311,6 +311,13 @@
Math\Scalar\Function.cs
+
+
+
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+ Geometries\PlainGeometry\Square.cs
+
+
diff --git a/源代码/StgSharp/Geometries/PlainGeometry/Rectangle.cs b/源代码/StgSharp/Geometries/PlainGeometry/Rectangle.cs
index da8e27cd..87c61671 100644
--- a/源代码/StgSharp/Geometries/PlainGeometry/Rectangle.cs
+++ b/源代码/StgSharp/Geometries/PlainGeometry/Rectangle.cs
@@ -38,7 +38,7 @@ namespace StgSharp.Geometries
internal override sealed void OnRender(uint tick)
{
tick-=bornTick;
- this.MovCenter(tick);
+ this.MovCenter(tick);
}
}
diff --git a/源代码/StgSharp/Geometries/PlainGeometry/Square.cs b/源代码/StgSharp/Geometries/PlainGeometry/Square.cs
index 0999c3e7..997c4fe4 100644
--- a/源代码/StgSharp/Geometries/PlainGeometry/Square.cs
+++ b/源代码/StgSharp/Geometries/PlainGeometry/Square.cs
@@ -2,9 +2,11 @@
using System.Collections.Generic;
using System.Text;
-namespace StgSharp
+namespace StgSharp.Geometries
{
- public class Square
+ public class Square:Rectangle
{
+
+
}
}
\ No newline at end of file
diff --git a/源代码/StgSharp/Geometries/PlainGeometry/Triangle.cs b/源代码/StgSharp/Geometries/PlainGeometry/Triangle.cs
index d293f2af..2cb94a64 100644
--- a/源代码/StgSharp/Geometries/PlainGeometry/Triangle.cs
+++ b/源代码/StgSharp/Geometries/PlainGeometry/Triangle.cs
@@ -42,8 +42,6 @@ namespace StgSharp.Geometries
this.vertex2 = new Point(vertexArray.vertex2Ptr);
this.vertex3 = new Point(vertexArray.vertex3Ptr);
- Console.WriteLine("vertex ok");
- Console.WriteLine(ProgramTimeLine._currentPool);
/**/
ProgramTimeLine._currentPool.pointContainer.Add(vertex1);
ProgramTimeLine._currentPool.pointContainer.Add(vertex2);
diff --git a/源代码/StgSharp/Logic/ContainerNode.cs b/源代码/StgSharp/Logic/ContainerNode.cs
index 8e0c1ebb..8749fe43 100644
--- a/源代码/StgSharp/Logic/ContainerNode.cs
+++ b/源代码/StgSharp/Logic/ContainerNode.cs
@@ -13,8 +13,10 @@ namespace StgSharp
[NotNull]
protected ContainerNode _id;
- [AllowNull]
- internal ContainerNode ID { get; }
+ internal ContainerNode ID
+ {
+ get { return _id; }
+ }
internal ContainerNode Previous
{
diff --git a/源代码/StgSharp/Logic/LinkedList.cs b/源代码/StgSharp/Logic/LinkedList.cs
index 9a07ee61..a94cf6eb 100644
--- a/源代码/StgSharp/Logic/LinkedList.cs
+++ b/源代码/StgSharp/Logic/LinkedList.cs
@@ -17,10 +17,6 @@ namespace StgSharp
{
_heading = new ContainerNode(null);
isEmpty = true;
-
-#if DEBUG
- Console.WriteLine("Linked list init ok");
-#endif
}
public T First
@@ -49,19 +45,12 @@ namespace StgSharp
t.Next = _heading;
t.Previous = _heading;
isEmpty = false;
- Console.WriteLine("1st item ok");
- Console.WriteLine(_heading._next);
- Console.WriteLine(_heading._previous);
}
else
{
- Console.WriteLine("next begin");
t.Next = _heading;
- Console.WriteLine("step 01 ok");
t.Previous = _heading.Previous;
- Console.WriteLine("step 02 ok");
_heading._previous._next = t.ID;
- Console.WriteLine("step 03 ok");
_heading._previous = t.ID;
}
diff --git a/源代码/StgSharp/bin/x64/Debug/netstandard2.1/StgSharp.dll b/源代码/StgSharp/bin/x64/Debug/netstandard2.1/StgSharp.dll
index ec9ae49e..11debdae 100644
Binary files a/源代码/StgSharp/bin/x64/Debug/netstandard2.1/StgSharp.dll and b/源代码/StgSharp/bin/x64/Debug/netstandard2.1/StgSharp.dll differ
diff --git a/源代码/StgSharp/obj/x64/Debug/netstandard2.1/StgSharp.dll b/源代码/StgSharp/obj/x64/Debug/netstandard2.1/StgSharp.dll
index ec9ae49e..11debdae 100644
Binary files a/源代码/StgSharp/obj/x64/Debug/netstandard2.1/StgSharp.dll and b/源代码/StgSharp/obj/x64/Debug/netstandard2.1/StgSharp.dll differ
diff --git a/源代码/StgSharpDebug/bin/x64/Debug/net6.0/StgSharp.dll b/源代码/StgSharpDebug/bin/x64/Debug/net6.0/StgSharp.dll
index ec9ae49e..11debdae 100644
Binary files a/源代码/StgSharpDebug/bin/x64/Debug/net6.0/StgSharp.dll and b/源代码/StgSharpDebug/bin/x64/Debug/net6.0/StgSharp.dll differ
diff --git a/源代码/StgSharpDebug/obj/x64/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache b/源代码/StgSharpDebug/obj/x64/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache
index ced6874f..13c97843 100644
Binary files a/源代码/StgSharpDebug/obj/x64/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache and b/源代码/StgSharpDebug/obj/x64/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache differ