Daily update on 20221021 by NitloadYoumu

2022-10-22 02:24:54 +08:00
parent 7dc8f402e1
commit 003bc4ed27
25 changed files with 212 additions and 58 deletions
@@ -16,7 +16,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@@ -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++)
+			{
+				
+			}
+		}
+	}
+}
@@ -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;
-		}
-	}
-}
@@ -0,0 +1,25 @@
+<configuration>
+  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>
@@ -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; }
+		}
+
+		
+	}
+
+}
@@ -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));
+
+        }
+    }
+}
@@ -8,7 +8,7 @@
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>StgSharp_Geometry</RootNamespace>
-    <AssemblyName>StgSharp Geometry</AssemblyName>
+    <AssemblyName>StgSharp_Geometry</AssemblyName>
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <Deterministic>true</Deterministic>
@@ -16,11 +16,12 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -31,6 +32,9 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenTK.3.3.3\lib\net20\OpenTK.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
@@ -41,8 +45,20 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Class1.cs" />
+    <Compile Include="Circle.cs" />
+    <Compile Include="PointOnCircle.cs" />
+    <Compile Include="Point.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="OpenTK.dll.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\StgSharp_Logic\StgSharp_Logic.csproj">
+      <Project>{ae7f3290-9ab4-4b54-aab1-4ddcba20f89d}</Project>
+      <Name>StgSharp_Logic</Name>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="OpenTK" version="3.3.3" targetFramework="net472" />
+</packages>
@@ -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
@@ -17,7 +17,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@@ -16,7 +16,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@@ -13,11 +13,13 @@ namespace StgSharp_Logic
 		public LinkedTarget Previous
 		{
 			get { return _previous; }
-			set {
-                if (value==null||this.GetType().FullName == value.GetType().FullName)
+			set 
+			{
+				if (value.GetType()==this.GetType())
 				{
 					_previous = value;
 				}
+                    
            }
 		}

@@ -27,12 +29,9 @@ namespace StgSharp_Logic
 		{
 			get { return _next; }
 			set {
-				if (value == null || this.GetType().FullName==value.GetType().FullName)
-				{
                    _next = value;
 			}
 		}
-		}



@@ -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
+    {
+
+    }
+}
@@ -16,7 +16,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
+    <Optimize>true</Optimize>
    <OutputPath>bin\Debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@@ -45,6 +45,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
+    <Compile Include="SimpleContainer.cs" />
    <Compile Include="LinkedList.cs" />
    <Compile Include="LinkedTarget.cs" />
    <Compile Include="Counter.cs" />