diff --git a/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 b/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 index dbc0d15b..bf929636 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 6e865dd1..bf860b82 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 5608fd45..044b9b41 100644 Binary files a/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 and b/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/0de5d36a-cef4-4024-9af3-7b3c518a0cd7.vsidx b/源代码/.vs/StgSharp/FileContentIndex/0de5d36a-cef4-4024-9af3-7b3c518a0cd7.vsidx new file mode 100644 index 00000000..3b821370 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/0de5d36a-cef4-4024-9af3-7b3c518a0cd7.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/5cf10fc7-0c0b-4215-9ee2-1a1f4f1804ba.vsidx b/源代码/.vs/StgSharp/FileContentIndex/5cf10fc7-0c0b-4215-9ee2-1a1f4f1804ba.vsidx new file mode 100644 index 00000000..bc0b3f11 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/5cf10fc7-0c0b-4215-9ee2-1a1f4f1804ba.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/63533227-649b-4657-98c6-96845baba5cc.vsidx b/源代码/.vs/StgSharp/FileContentIndex/63533227-649b-4657-98c6-96845baba5cc.vsidx new file mode 100644 index 00000000..32e717b8 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/63533227-649b-4657-98c6-96845baba5cc.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/858cbc3c-f049-44a5-91ea-23913abf05f4.vsidx b/源代码/.vs/StgSharp/FileContentIndex/858cbc3c-f049-44a5-91ea-23913abf05f4.vsidx new file mode 100644 index 00000000..546af122 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/858cbc3c-f049-44a5-91ea-23913abf05f4.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/c155612a-959a-47b2-a130-cc11410b0145.vsidx b/源代码/.vs/StgSharp/FileContentIndex/c155612a-959a-47b2-a130-cc11410b0145.vsidx deleted file mode 100644 index 93be94f4..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/c155612a-959a-47b2-a130-cc11410b0145.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/e7fb216e-c54c-4c91-8bb1-8cf1027a90c0.vsidx b/源代码/.vs/StgSharp/FileContentIndex/e7fb216e-c54c-4c91-8bb1-8cf1027a90c0.vsidx deleted file mode 100644 index 1437c2de..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/e7fb216e-c54c-4c91-8bb1-8cf1027a90c0.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/f720ebf3-8217-447c-8806-fee567b48181.vsidx b/源代码/.vs/StgSharp/FileContentIndex/f720ebf3-8217-447c-8806-fee567b48181.vsidx deleted file mode 100644 index 1e0367cc..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/f720ebf3-8217-447c-8806-fee567b48181.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/f74488ce-4718-4b87-ad0b-39ff61ff090b.vsidx b/源代码/.vs/StgSharp/FileContentIndex/f74488ce-4718-4b87-ad0b-39ff61ff090b.vsidx deleted file mode 100644 index 0b85d902..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/f74488ce-4718-4b87-ad0b-39ff61ff090b.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/v17/.suo b/源代码/.vs/StgSharp/v17/.suo index c4f3383a..fae578f3 100644 Binary files a/源代码/.vs/StgSharp/v17/.suo and b/源代码/.vs/StgSharp/v17/.suo differ diff --git a/源代码/StgSharp/Control/Add.cs b/源代码/StgSharp/Control/Add.cs index a9fa1c21..0c2f9839 100644 --- a/源代码/StgSharp/Control/Add.cs +++ b/源代码/StgSharp/Control/Add.cs @@ -12,14 +12,6 @@ namespace StgSharp.Control GameTimeLine.allPool.Add(pool); } - public static void GeometryCombination(IPlainGeometryCombination geometry) - { - foreach (IPlainGeometry geo in geometry) - { - GameTimeLine._currentPool.geometryContainer.Add(geo); - } - } - public static void Geometry(IPlainGeometry geometry) { GameTimeLine._currentPool.geometryContainer.Add(geometry); diff --git a/源代码/StgSharp/Geometries/Arc.cs b/源代码/StgSharp/Geometries/Arc.cs index ec2516f8..46448b47 100644 --- a/源代码/StgSharp/Geometries/Arc.cs +++ b/源代码/StgSharp/Geometries/Arc.cs @@ -55,6 +55,21 @@ namespace StgSharp.Geometries _endPoint._position = vec + UpdateAngle(tick); } + + internal sealed override void CalcVec04(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec05(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec06(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec07(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec08(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec09(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec10(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec11(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec12(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec13(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec14(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec15(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec16(vec3d vec, uint tick) => throw new UnusedVertexException(); + public virtual vec3d MoveCenter(uint tick) => default; public virtual vec3d UpdateRadius(uint tick) => default; diff --git a/源代码/StgSharp/Geometries/Circle.cs b/源代码/StgSharp/Geometries/Circle.cs index ecd2ef3b..75522f52 100644 --- a/源代码/StgSharp/Geometries/Circle.cs +++ b/源代码/StgSharp/Geometries/Circle.cs @@ -50,6 +50,20 @@ namespace StgSharp.Geometries _pointOnPlain._position = vec + UpdatePlain(tick); } + internal sealed override void CalcVec04(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec05(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec06(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec07(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec08(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec09(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec10(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec11(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec12(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec13(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec14(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec15(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec16(vec3d vec, uint tick) => throw new UnusedVertexException(); + public virtual vec3d MoveCenter(uint tick) => default; public virtual vec3d UpdateRadius(uint tick) => default; diff --git a/源代码/StgSharp/Geometries/Line.cs b/源代码/StgSharp/Geometries/Line.cs index 2e1a0352..87de41ad 100644 --- a/源代码/StgSharp/Geometries/Line.cs +++ b/源代码/StgSharp/Geometries/Line.cs @@ -65,10 +65,20 @@ namespace StgSharp.Geometries _endPoint._position = vec + MoveEndPoint(tick); } - internal sealed override void CalcVec03(vec3d vec, uint tick) - { - throw new ArgumentException("Lines do not need the third parameter to define!"); - } + internal sealed override void CalcVec03(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec04(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec05(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec06(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec07(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec08(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec09(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec10(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec11(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec12(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec13(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec14(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec15(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec16(vec3d vec, uint tick) => throw new UnusedVertexException(); //计算线起点的方法,通过对线的派生的重写实现功能 public virtual vec3d MoveBeginPoint(uint tick) diff --git a/源代码/StgSharp/Geometries/Parallelogram.cs b/源代码/StgSharp/Geometries/Parallelogram.cs index f9863768..c8f90f13 100644 --- a/源代码/StgSharp/Geometries/Parallelogram.cs +++ b/源代码/StgSharp/Geometries/Parallelogram.cs @@ -82,6 +82,21 @@ namespace StgSharp.Geometries _vertex2._position = vec + UpdateCTC2(tick); } + + internal sealed override void CalcVec04(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec05(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec06(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec07(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec08(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec09(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec10(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec11(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec12(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec13(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec14(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec15(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec16(vec3d vec, uint tick) => throw new UnusedVertexException(); + public virtual vec3d MovCenter(uint tick) => default(vec3d); public virtual vec3d UpdateCTC1(uint tick) => default(vec3d); diff --git a/源代码/StgSharp/Geometries/Point.cs b/源代码/StgSharp/Geometries/Point.cs index f6eee237..4cee7738 100644 --- a/源代码/StgSharp/Geometries/Point.cs +++ b/源代码/StgSharp/Geometries/Point.cs @@ -31,11 +31,6 @@ namespace StgSharp.Geometries throw new NotImplementedException(); } - public bool IsInGeometry(IPlainGeometryCombination geo) - { - throw new NotImplementedException(); - } - public bool IsOnPlain(IPlainGeometry geo) { return this._position * geo.GetPlain().plainParameter == 1; diff --git a/源代码/StgSharp/Geometries/Rectangle.cs b/源代码/StgSharp/Geometries/Rectangle.cs index 35c9c397..e538599b 100644 --- a/源代码/StgSharp/Geometries/Rectangle.cs +++ b/源代码/StgSharp/Geometries/Rectangle.cs @@ -98,6 +98,21 @@ namespace StgSharp.Geometries } } + + internal sealed override void CalcVec04(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec05(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec06(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec07(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec08(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec09(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec10(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec11(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec12(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec13(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec14(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec15(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec16(vec3d vec, uint tick) => throw new UnusedVertexException(); + /// /// 计算中心点相对于参考原点的位移 /// @@ -106,7 +121,7 @@ namespace StgSharp.Geometries public virtual vec3d MovCenter(uint tick)=>default(vec3d); /// - /// 计算一个顶点相对于 + /// 计算第一个顶点相对于参考点的位移,可以是中心点,也可以是参考原点 /// /// /// diff --git a/源代码/StgSharp/Geometries/Triangle.cs b/源代码/StgSharp/Geometries/Triangle.cs index 0e8682ef..4a9f1355 100644 --- a/源代码/StgSharp/Geometries/Triangle.cs +++ b/源代码/StgSharp/Geometries/Triangle.cs @@ -52,6 +52,21 @@ namespace StgSharp.Geometries _vertex3._position = vec + CalcSide2(tick); } + + internal sealed override void CalcVec04(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec05(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec06(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec07(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec08(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec09(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec10(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec11(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec12(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec13(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec14(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec15(vec3d vec, uint tick) => throw new UnusedVertexException(); + internal sealed override void CalcVec16(vec3d vec, uint tick) => throw new UnusedVertexException(); + public virtual vec3d MovBegin(uint tick) => default(vec3d); public virtual vec3d CalcSide1(uint tick)=> default(vec3d); diff --git a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache index 8dc5d867..e6e0049c 100644 --- a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache +++ b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ff849decdf788400d580af0a2c6cad5f58d8e017 +8c8a835e66daaf164fa2e6efae7c02f12143e5b9