diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/0a05b2f3-f4af-4a6f-a20c-ed9b67a102b8.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/0a05b2f3-f4af-4a6f-a20c-ed9b67a102b8.vsidx
deleted file mode 100644
index 9adaa37a..00000000
Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/0a05b2f3-f4af-4a6f-a20c-ed9b67a102b8.vsidx and /dev/null differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/270d3872-75bd-46b7-a2bd-9f8255c673d1.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/270d3872-75bd-46b7-a2bd-9f8255c673d1.vsidx
deleted file mode 100644
index 3da4758d..00000000
Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/270d3872-75bd-46b7-a2bd-9f8255c673d1.vsidx and /dev/null differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/33343802-69a8-4b00-a6e0-a6aede8c96ef.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/33343802-69a8-4b00-a6e0-a6aede8c96ef.vsidx
deleted file mode 100644
index 0132b317..00000000
Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/33343802-69a8-4b00-a6e0-a6aede8c96ef.vsidx and /dev/null differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a985188a-1f37-45ed-ba50-2ce5492de85f.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6b16ef71-0a76-483d-99c2-67ccd85f530f.vsidx
similarity index 70%
rename from 源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a985188a-1f37-45ed-ba50-2ce5492de85f.vsidx
rename to 源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6b16ef71-0a76-483d-99c2-67ccd85f530f.vsidx
index a5d2dbdf..6dacb7f1 100644
Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a985188a-1f37-45ed-ba50-2ce5492de85f.vsidx and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6b16ef71-0a76-483d-99c2-67ccd85f530f.vsidx differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6dcbc607-3560-41f6-ad09-1744227b387d.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6dcbc607-3560-41f6-ad09-1744227b387d.vsidx
new file mode 100644
index 00000000..a6b55ddb
Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6dcbc607-3560-41f6-ad09-1744227b387d.vsidx differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/773e5335-fc03-4d05-864e-39fd27a66c89.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/773e5335-fc03-4d05-864e-39fd27a66c89.vsidx
new file mode 100644
index 00000000..c0882264
Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/773e5335-fc03-4d05-864e-39fd27a66c89.vsidx differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/e3f51627-faa0-4c9b-9e1d-db6ef6f957e2.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/e3f51627-faa0-4c9b-9e1d-db6ef6f957e2.vsidx
new file mode 100644
index 00000000..cc0979f9
Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/e3f51627-faa0-4c9b-9e1d-db6ef6f957e2.vsidx differ
diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo
index f22030a8..9d9fc570 100644
Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo differ
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entity/ComplexOperationHandler.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/ComplexOperationHandler.cs
similarity index 100%
rename from 源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entity/ComplexOperationHandler.cs
rename to 源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/ComplexOperationHandler.cs
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs
index 54f5f65f..596421c2 100644
--- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs
@@ -7,9 +7,10 @@ using System.Threading.Tasks;
namespace StgSharp.Control
{
- public class Create
+ static public class Create
{
- public void Geometry(IPoint center, float radius, float angle, int num)
+
+ public static void Geometry(IPoint center, float radius, float angle, int num)
{
}
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TextFile1.txt b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TextFile1.txt
new file mode 100644
index 00000000..a4215492
--- /dev/null
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/TextFile1.txt
@@ -0,0 +1 @@
+20221029未完成：内置的池初始化与控制
\ No newline at end of file
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Counter.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Counter.cs
index 4e8e3688..ee760e0c 100644
--- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Counter.cs
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/Counter.cs
@@ -21,8 +21,6 @@ namespace StgSharp.Logic
}
-
-
public void Increase(T deltaValue)
{
//_value += deltaValue;
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/EntityContainer.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/EntityContainer.cs
index af2bbc27..3e6255cd 100644
--- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/EntityContainer.cs
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/EntityContainer.cs
@@ -48,8 +48,8 @@ namespace StgSharp.Logic
public EntityContainer()
{
- }
+ }
public void MoveLeft(LinkedObject target)
{
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/IContainer.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/IContainer.cs
index 272de3d4..edeaaa60 100644
--- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/IContainer.cs
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/IContainer.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace StgSharp.Logic
{
- internal interface IContainer
+ public interface IContainer
{
float LeftBorder { get; set; }
@@ -16,7 +16,11 @@ namespace StgSharp.Logic
float BottomBorder { get; set; }
+
int Limit { get; set; }
-
+ IContainer Top { get; set; }
+ IContainer Bottom { get; set; }
+ IContainer Left { get; set; }
+ IContainer Right { get; set; }
}
}
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/PointContainer.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/PointContainer.cs
index 4325d4e2..3b6f5e8d 100644
--- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/PointContainer.cs
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Logic/PointContainer.cs
@@ -14,6 +14,11 @@ namespace StgSharp.Logic
private float _topBorder;
private float _bottomBorder;
+ private IContainer _left;
+ private IContainer _right;
+ private IContainer _top;
+ private IContainer _bottom;
+
private int _limit;
public float LeftBorder
@@ -37,11 +42,44 @@ namespace StgSharp.Logic
set { _bottomBorder = value; }
}
+ public IContainer Left
+ {
+ get { return _left; }
+ set { _left = value; }
+ }
+
+ public IContainer Right
+ {
+ get { return _right; }
+ set { _right = value; }
+ }
+
+ public IContainer Top
+ {
+ get { return _top; }
+ set { _top = value; }
+ }
+
+ public IContainer Bottom
+ {
+ get { return _bottom; }
+ set { _bottom = value; }
+ }
+
public int Limit
{
get { return _limit; }
set { _limit = value; }
}
+
+
+ public PointContainer(float top,float bottom,float left,float right)
+ {
+ _topBorder = top;
+ _bottomBorder = bottom;
+ _leftBorder = left;
+ _rightBorder = right;
+ }
}
}
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Pool/IPool.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Pool/IPool.cs
new file mode 100644
index 00000000..08620fe6
--- /dev/null
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Pool/IPool.cs
@@ -0,0 +1,17 @@
+using StgSharp.Logic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StgSharp.Pool
+{
+ public interface IPool
+ {
+ IContainer TopCollector { get; }
+ IContainer BottomCollector { get; }
+ IContainer LeftCollector { get; }
+ IContainer RightCollector { get; }
+ }
+}
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Pool/PointPool.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Pool/PointPool.cs
new file mode 100644
index 00000000..e9f4b600
--- /dev/null
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Pool/PointPool.cs
@@ -0,0 +1,91 @@
+using StgSharp.Logic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StgSharp.Pool
+{
+ public class PointPool:IPool
+ {
+
+ internal static IContainer _topCollector;
+ internal static IContainer _bottomCollector;
+ internal static IContainer _leftCollector;
+ internal static IContainer _rightCollector;
+
+ public IContainer TopCollector
+ {
+ get { return _topCollector; }
+ }
+
+ public IContainer BottomCollector
+ {
+ get { return _bottomCollector; }
+ }
+
+ public IContainer LeftCollector
+ {
+ get { return _leftCollector; }
+ }
+
+ public IContainer RightCollector
+ {
+ get { return _rightCollector; }
+ }
+
+ static IContainer mainContainer00;
+ static IContainer mainContainer01;
+ static IContainer mainContainer02;
+ static IContainer mainContainer10;
+ static IContainer mainContainer11;
+ static IContainer mainContainer12;
+ static IContainer mainContainer20;
+ static IContainer mainContainer21;
+ static IContainer mainContainer22;
+ static IContainer mainContainer30;
+ static IContainer mainContainer31;
+ static IContainer mainContainer32;
+
+
+ static PointPool()
+ {
+ mainContainer00 = new PointContainer(1000,400,-600,-150);
+
+ mainContainer01 = new PointContainer(1000,400,-150,150);
+
+ mainContainer02 = new PointContainer(1000,400,150,600);
+
+ mainContainer10 = new PointContainer(400,0,-600,-150);
+
+ mainContainer11 = new PointContainer(400,0,-150,150);
+
+ mainContainer12 = new PointContainer(400,0,150,600);
+
+ mainContainer20 = new PointContainer(0,-400,-600,-150);
+
+ mainContainer21 = new PointContainer(0,-400,-150,150);
+
+ mainContainer22 = new PointContainer(0,-400,150,600);
+
+ mainContainer30 = new PointContainer(-400,-1000,-600,-150);
+
+ mainContainer31 = new PointContainer(-400,-1000,-150,150);
+
+ mainContainer32 = new PointContainer(-400,-1000,150,600);
+
+ mainContainer00.Top = _topCollector;
+ mainContainer00.Bottom = mainContainer10;
+ mainContainer00.Left = _leftCollector;
+ mainContainer00.Right = mainContainer01;
+
+ Undo01：设置其他11个容器构成完整的池
+
+ }
+ public static void OnRender()
+ {
+
+ }
+ }
+}
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj
index bc15133b..b42564ef 100644
--- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj
+++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/StgSharp.csproj
@@ -50,12 +50,14 @@
-
+
+
+
@@ -71,7 +73,9 @@
-
+
+
+
diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 9efe3ff6..17c27af6 100644
Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ