diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/000b4831-94cb-4e98-8fe6-dfe0107375f1.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/000b4831-94cb-4e98-8fe6-dfe0107375f1.vsidx deleted file mode 100644 index 867d780e..00000000 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/000b4831-94cb-4e98-8fe6-dfe0107375f1.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/0afec6e9-9089-463d-a122-fadd798422b6.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/0afec6e9-9089-463d-a122-fadd798422b6.vsidx new file mode 100644 index 00000000..643963c5 Binary files /dev/null and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/0afec6e9-9089-463d-a122-fadd798422b6.vsidx differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/7f9b991a-cb21-4bd1-8b32-d3cbb8061d72.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/7f9b991a-cb21-4bd1-8b32-d3cbb8061d72.vsidx deleted file mode 100644 index 0c699fe0..00000000 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/7f9b991a-cb21-4bd1-8b32-d3cbb8061d72.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/cbadf440-79f0-4ad9-8421-df592ef6af09.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/cbadf440-79f0-4ad9-8421-df592ef6af09.vsidx new file mode 100644 index 00000000..bc5f4e30 Binary files /dev/null and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/cbadf440-79f0-4ad9-8421-df592ef6af09.vsidx differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/cd676e67-87d8-4dfd-9951-8c21bce7514d.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/cd676e67-87d8-4dfd-9951-8c21bce7514d.vsidx new file mode 100644 index 00000000..472e9a6c Binary files /dev/null and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/cd676e67-87d8-4dfd-9951-8c21bce7514d.vsidx differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/fa4efbad-776f-4b6a-84ad-28dbb5068bc1.vsidx b/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/fa4efbad-776f-4b6a-84ad-28dbb5068bc1.vsidx deleted file mode 100644 index 216a0cb2..00000000 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/FileContentIndex/fa4efbad-776f-4b6a-84ad-28dbb5068bc1.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo b/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo index ba68f590..bb1c52e9 100644 Binary files a/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo and b/源代码/.Net Framework/StgSharp/.vs/StgSharp/v17/.suo differ diff --git a/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj b/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj index 57070174..ce3d9942 100644 --- a/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj +++ b/源代码/.Net Framework/StgSharp/Game/StgSharp_Game.csproj @@ -16,7 +16,7 @@ true full - false + true bin\Debug\ DEBUG;TRACE prompt diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/Circle.cs b/源代码/.Net Framework/StgSharp/StgSharp Geometry/Circle.cs new file mode 100644 index 00000000..f84b8a0f --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp Geometry/Circle.cs @@ -0,0 +1,42 @@ +using StgSharp_Logic; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp_Geometry +{ + internal unsafe class Circle + { + private Point _center; + + public Point Center + { + get { return _center; } + set { _center = value; } + } + + + private float _radius; + public float Radius + { + get { return _radius; } + set { _radius = value; } + } + + public Circle(Point center,float radius) + { + this._center = center; + this._radius = radius; + } + + public void BindPoint(float angle,int number,SimpleContainer geoItemPool) + { + for (int i = 1; i <= number; i++) + { + + } + } + } +} diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/Class1.cs b/源代码/.Net Framework/StgSharp/StgSharp Geometry/Class1.cs deleted file mode 100644 index a2b4823e..00000000 --- a/源代码/.Net Framework/StgSharp/StgSharp Geometry/Class1.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace StgSharp_Geometry -{ - public class Circle - { - private float _centerX; - - public float CenterX - { - get { return _centerX; } - set { _centerX = value; } - } - private float _centerY; - - public float CenterY - { - get { return _centerY; } - set { _centerY = value; } - } - - private float _radius; - public float Radius - { - get { return _radius; } - set { _radius = value; } - } - - - - public Circle(float centerX,float centerY,float radius) - { - this._centerX = centerX; - this._centerY = centerY; - this._radius = radius; - } - } -} diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/OpenTK.dll.config b/源代码/.Net Framework/StgSharp/StgSharp Geometry/OpenTK.dll.config new file mode 100644 index 00000000..7098d39e --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp Geometry/OpenTK.dll.config @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/Point.cs b/源代码/.Net Framework/StgSharp/StgSharp Geometry/Point.cs new file mode 100644 index 00000000..dbbc54fa --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp Geometry/Point.cs @@ -0,0 +1,31 @@ +using StgSharp_Logic; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp_Geometry +{ + internal class Point:LinkedTarget + { + private float _x; + + public float X + { + get { return _x; } + set { _x = value; } + } + + private float _y; + + public float Y + { + get { return _y; } + set { _y = value; } + } + + + } + +} diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/PointOnCircle.cs b/源代码/.Net Framework/StgSharp/StgSharp Geometry/PointOnCircle.cs new file mode 100644 index 00000000..a27d27cf --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp Geometry/PointOnCircle.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp_Geometry +{ + internal class PointOnCircle : Point + { + private Circle _bindedItem; + + public Circle geometryItem + { + get { return _bindedItem; } + set { _bindedItem = value; } + } + + private float _angle; + + public float Angle + { + get { return _angle; } + set { _angle = value; } + } + + private float[] _angularVelocity; + + public PointOnCircle(Circle c, float p, float angle, int counts) + { + _bindedItem = c; + _angle = (angle + counts * (360.0f / counts))*(float)(2*Math.PI/360); + + } + + public void AddRotation(float[] aFunc) + { + if (aFunc.Length==10) + { + _angularVelocity=aFunc; + } + else + { + throw new Exception("Parameters are too much or too few!"); + } + } + public void onRender() + { + if (_angularVelocity!=null) + { + + for (int i = 0; i < 10; i++) + { + + } + } + + + this.X = (float)(_bindedItem.Center.X + _bindedItem.Radius * Math.Cos(_angle)); + this.Y = (float)(_bindedItem.Center.X + _bindedItem.Radius * Math.Sin(_angle)); + + } + } +} diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/StgSharp Geometry.csproj b/源代码/.Net Framework/StgSharp/StgSharp Geometry/StgSharp_Geometry.csproj similarity index 72% rename from 源代码/.Net Framework/StgSharp/StgSharp Geometry/StgSharp Geometry.csproj rename to 源代码/.Net Framework/StgSharp/StgSharp Geometry/StgSharp_Geometry.csproj index aceaecb6..c660565e 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp Geometry/StgSharp Geometry.csproj +++ b/源代码/.Net Framework/StgSharp/StgSharp Geometry/StgSharp_Geometry.csproj @@ -8,7 +8,7 @@ Library Properties StgSharp_Geometry - StgSharp Geometry + StgSharp_Geometry v4.7.2 512 true @@ -16,11 +16,12 @@ true full - false + true bin\Debug\ DEBUG;TRACE prompt 4 + true pdbonly @@ -31,6 +32,9 @@ 4 + + ..\packages\OpenTK.3.3.3\lib\net20\OpenTK.dll + @@ -41,8 +45,20 @@ - + + + + + + + + + + {ae7f3290-9ab4-4b54-aab1-4ddcba20f89d} + StgSharp_Logic + + \ No newline at end of file diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 00000000..8499c13a Binary files /dev/null and b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9bfe6980..f0e2bc27 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp Geometry.csproj.AssemblyReference.cache b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp Geometry.csproj.AssemblyReference.cache index 442efad4..4da0c39d 100644 Binary files a/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp Geometry.csproj.AssemblyReference.cache and b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp Geometry.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp_Geometry.csproj.AssemblyReference.cache b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp_Geometry.csproj.AssemblyReference.cache new file mode 100644 index 00000000..db332a5b Binary files /dev/null and b/源代码/.Net Framework/StgSharp/StgSharp Geometry/obj/Debug/StgSharp_Geometry.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/StgSharp/StgSharp Geometry/packages.config b/源代码/.Net Framework/StgSharp/StgSharp Geometry/packages.config new file mode 100644 index 00000000..bf655677 --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp Geometry/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/源代码/.Net Framework/StgSharp/StgSharp.sln b/源代码/.Net Framework/StgSharp/StgSharp.sln index 2c6265e1..7533e1eb 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp.sln +++ b/源代码/.Net Framework/StgSharp/StgSharp.sln @@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeMap", "CodeMap", "{06C3 CodeMap1.dgml = CodeMap1.dgml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StgSharp Geometry", "StgSharp Geometry\StgSharp Geometry.csproj", "{00B490AA-9FBB-4A9A-9293-D3CE79895D25}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StgSharp_Geometry", "StgSharp Geometry\StgSharp_Geometry.csproj", "{00B490AA-9FBB-4A9A-9293-D3CE79895D25}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/源代码/.Net Framework/StgSharp/StgSharp/StgSharp.csproj b/源代码/.Net Framework/StgSharp/StgSharp/StgSharp.csproj index 4b35d270..45120f54 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp/StgSharp.csproj +++ b/源代码/.Net Framework/StgSharp/StgSharp/StgSharp.csproj @@ -17,7 +17,7 @@ AnyCPU true full - false + true bin\Debug\ DEBUG;TRACE prompt diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj b/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj index 2dbed194..d43b3d2f 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj +++ b/源代码/.Net Framework/StgSharp/StgSharp_Entity/StgSharp_Entity.csproj @@ -16,7 +16,7 @@ true full - false + true bin\Debug\ DEBUG;TRACE prompt diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs b/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs index d0e2ecf7..5880f92d 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/LinkedTarget.cs @@ -13,11 +13,13 @@ namespace StgSharp_Logic public LinkedTarget Previous { get { return _previous; } - set { - if (value==null||this.GetType().FullName == value.GetType().FullName) - { - _previous = value; - } + set + { + if (value.GetType()==this.GetType()) + { + _previous = value; + } + } } @@ -27,10 +29,7 @@ namespace StgSharp_Logic { get { return _next; } set { - if (value == null || this.GetType().FullName==value.GetType().FullName) - { _next = value; - } } } diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/SimpleContainer.cs b/源代码/.Net Framework/StgSharp/StgSharp_Logic/SimpleContainer.cs new file mode 100644 index 00000000..3e8b67b1 --- /dev/null +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/SimpleContainer.cs @@ -0,0 +1,14 @@ +using OpenTK; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp_Logic +{ + public class SimpleContainer + { + + } +} diff --git a/源代码/.Net Framework/StgSharp/StgSharp_Logic/StgSharp_Logic.csproj b/源代码/.Net Framework/StgSharp/StgSharp_Logic/StgSharp_Logic.csproj index 49cd5c3b..222237da 100644 --- a/源代码/.Net Framework/StgSharp/StgSharp_Logic/StgSharp_Logic.csproj +++ b/源代码/.Net Framework/StgSharp/StgSharp_Logic/StgSharp_Logic.csproj @@ -16,7 +16,7 @@ true full - false + true bin\Debug\ DEBUG;TRACE prompt @@ -45,6 +45,7 @@ +