daily update on 20230408 by nitload youmu
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using GLFWDotNet;
|
||||
using StgSharp.Geometries;
|
||||
using StgSharp.Geometries;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
@@ -8,9 +7,17 @@ namespace StgSharp.Control
|
||||
{
|
||||
public static class Add
|
||||
{
|
||||
public static void Pool(Pool pool)
|
||||
{
|
||||
GameTimeLine.allPool.Add(pool);
|
||||
}
|
||||
|
||||
public static void GeometryCombination(IGeometryCombination geometry)
|
||||
{
|
||||
|
||||
foreach (IGeometry geo in geometry)
|
||||
{
|
||||
GameTimeLine._currentPool.geometryContainer.Add(geo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using StgSharp.Geometries;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@ using System.Text;
|
||||
|
||||
namespace StgSharp.Control
|
||||
{
|
||||
public static class TimeLine
|
||||
public static class GameTimeLine
|
||||
{
|
||||
internal static Pool _currentPool;
|
||||
public static LinkedList<Pool> allPool;
|
||||
internal static LinkedList<Pool> allPool;
|
||||
public static Counter<uint> tickCounter
|
||||
= new Counter<uint>(0,1,1);
|
||||
internal static BlockOperation currentOperation;
|
||||
|
||||
@@ -17,8 +17,8 @@ namespace StgSharp.Entities
|
||||
|
||||
internal void InternalDieOperation(Pool home)
|
||||
{
|
||||
_dieBulletLauncher.Launch(Control.TimeLine.tickCounter, home._bulletContainer);
|
||||
_awardLauncher.Launch(Control.TimeLine.tickCounter, home._awardContainer);
|
||||
_dieBulletLauncher.Launch(Control.GameTimeLine.tickCounter, home._bulletContainer);
|
||||
_awardLauncher.Launch(Control.GameTimeLine.tickCounter, home._awardContainer);
|
||||
this._id.Remove();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using StgSharp.Math;
|
||||
using StgSharp.Geometries;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
@@ -73,7 +74,7 @@ namespace StgSharp
|
||||
|
||||
public void OnRender()
|
||||
{
|
||||
_position._position = _movHandler.Invoke(_basePoint._position, Control.TimeLine.tickCounter);
|
||||
_position._position = _movHandler.Invoke(_basePoint._position, Control.GameTimeLine.tickCounter);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -14,6 +14,17 @@ namespace StgSharp.Geometries
|
||||
internal Point _radius;
|
||||
internal Point _angle;
|
||||
internal RenderMode _renderMode;
|
||||
internal readonly uint bornTick;
|
||||
|
||||
public Arc(uint bornTime) : base(bornTime)
|
||||
{
|
||||
bornTick = bornTime;
|
||||
}
|
||||
|
||||
public Arc(Counter<uint> tickCounter) : base(tickCounter)
|
||||
{
|
||||
bornTick = tickCounter._value;
|
||||
}
|
||||
|
||||
public override Point BasePoint => _basePoint;
|
||||
|
||||
@@ -25,7 +36,7 @@ namespace StgSharp.Geometries
|
||||
|
||||
public override RenderMode renderMode => _renderMode;
|
||||
|
||||
|
||||
|
||||
|
||||
internal sealed override void CalcVec01(uint tick)
|
||||
{
|
||||
@@ -50,6 +61,7 @@ namespace StgSharp.Geometries
|
||||
|
||||
internal override void OnRender(uint tick)
|
||||
{
|
||||
tick-=bornTick;
|
||||
CalcVec01(tick);
|
||||
switch (_renderMode)
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
public class Circle : IGeometry
|
||||
{
|
||||
@@ -11,6 +11,7 @@ namespace StgSharp
|
||||
internal Point _center;
|
||||
internal Point _radiusVec;
|
||||
internal RenderMode _renderMode;
|
||||
internal readonly uint bornTick;
|
||||
|
||||
public override Point BasePoint => _baseCenter;
|
||||
|
||||
@@ -22,6 +23,16 @@ namespace StgSharp
|
||||
|
||||
public override RenderMode renderMode => _renderMode;
|
||||
|
||||
public Circle(uint bornTime) : base(bornTime)
|
||||
{
|
||||
bornTick = bornTime;
|
||||
}
|
||||
|
||||
public Circle(Counter<uint> tickCounter) : base(tickCounter)
|
||||
{
|
||||
bornTick = tickCounter._value;
|
||||
}
|
||||
|
||||
internal override void CalcVec01(uint tick)
|
||||
{
|
||||
_center._position = _baseCenter._position + MoveCenter(tick);
|
||||
@@ -55,6 +66,7 @@ namespace StgSharp
|
||||
|
||||
internal override void OnRender(uint tick)
|
||||
{
|
||||
tick-=bornTick;
|
||||
CalcVec01(tick);
|
||||
switch (_renderMode)
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
public delegate float ExpressionHandler
|
||||
(
|
||||
|
||||
@@ -4,7 +4,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
|
||||
public delegate vec2d GetLocationHandler(vec2d vec, Counter<uint> tickCounter);
|
||||
|
||||
@@ -4,23 +4,34 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
public abstract class IGeometry:INode<IGeometry>
|
||||
{
|
||||
internal ContainerNode<IGeometry> _id;
|
||||
|
||||
private readonly uint bornTick;
|
||||
|
||||
public abstract Point BasePoint { get; }
|
||||
public abstract Point RefPoint{ get; }
|
||||
public abstract Point RefVec01{ get; }
|
||||
public abstract Point RefVec02{ get; }
|
||||
public uint BornTime => bornTick;
|
||||
|
||||
public IGeometry(uint bornTime)
|
||||
{
|
||||
bornTick=bornTime;
|
||||
}
|
||||
|
||||
public IGeometry(Counter<uint> MainTimer)
|
||||
{
|
||||
bornTick = MainTimer.Value;
|
||||
}
|
||||
|
||||
internal abstract void CalcVec01(uint tick);
|
||||
internal abstract void CalcVec02(vec2d vec, uint tick);
|
||||
internal abstract void CalcVec03(vec2d vec, uint tick);
|
||||
internal abstract void OnRender(uint tick);
|
||||
|
||||
|
||||
public abstract RenderMode renderMode { get; }
|
||||
public abstract float SetArrayX();
|
||||
public abstract float SetArrayY();
|
||||
@@ -38,9 +49,6 @@ namespace StgSharp
|
||||
_id = id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
public class Line:IGeometry
|
||||
{
|
||||
@@ -15,7 +15,7 @@ namespace StgSharp
|
||||
internal GetLocationHandler _beginPointMov;
|
||||
internal GetLocationHandler _endPointMov;
|
||||
internal RenderMode _renderMode;
|
||||
|
||||
internal readonly uint bornTick;
|
||||
|
||||
public override Point BasePoint => _basePoint;
|
||||
|
||||
@@ -25,6 +25,16 @@ namespace StgSharp
|
||||
public override Point RefVec02 => default;
|
||||
public override RenderMode renderMode => _renderMode;
|
||||
|
||||
public Line(uint bornTime) : base(bornTime)
|
||||
{
|
||||
bornTick = bornTime;
|
||||
}
|
||||
|
||||
public Line(Counter<uint> tickCounter) : base(tickCounter)
|
||||
{
|
||||
bornTick = tickCounter._value;
|
||||
}
|
||||
|
||||
public override float SetArrayX()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
@@ -56,6 +66,7 @@ namespace StgSharp
|
||||
|
||||
internal override void OnRender(uint tick)
|
||||
{
|
||||
tick -= bornTick;
|
||||
CalcVec01(tick);
|
||||
switch (_renderMode)
|
||||
{
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using GLFWDotNet;
|
||||
using StgSharp;
|
||||
using StgSharp;
|
||||
using StgSharp.Math;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
@@ -8,7 +7,7 @@ using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
public class Point: INode<Point>
|
||||
{
|
||||
@@ -48,7 +47,7 @@ namespace StgSharp
|
||||
|
||||
public void OnRender()
|
||||
{
|
||||
this.getXHandler.Invoke(this._position, Control.TimeLine.tickCounter);
|
||||
this.getXHandler.Invoke(this._position, Control.GameTimeLine.tickCounter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace StgSharp.Geometries
|
||||
internal Point _centerToCorner1;
|
||||
internal Point _centerToCorner2;
|
||||
internal RenderMode _renderMode;
|
||||
|
||||
internal readonly uint bornTick;
|
||||
|
||||
public override sealed Point BasePoint => _basePoint;
|
||||
public override sealed Point RefPoint=>_center;
|
||||
@@ -23,9 +23,33 @@ namespace StgSharp.Geometries
|
||||
|
||||
public override RenderMode renderMode => _renderMode;
|
||||
|
||||
public Rectangle(uint bornTime) : base(bornTime)
|
||||
{
|
||||
bornTick = bornTime;
|
||||
}
|
||||
|
||||
public Rectangle(Counter<uint> tickCounter) : base(tickCounter)
|
||||
{
|
||||
bornTick = tickCounter._value;
|
||||
}
|
||||
|
||||
internal override sealed void OnRender(uint tick)
|
||||
{
|
||||
|
||||
tick-=bornTick;
|
||||
CalcVec01(tick);
|
||||
switch (renderMode)
|
||||
{
|
||||
case RenderMode.BasePoint:
|
||||
CalcVec02(_basePoint._position,tick);
|
||||
CalcVec03(_basePoint._position,tick);
|
||||
break;
|
||||
case RenderMode.RefPoint:
|
||||
CalcVec02(_center._position, tick);
|
||||
CalcVec03(_center._position, tick);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public override sealed float SetArrayX()
|
||||
|
||||
@@ -5,7 +5,7 @@ using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
|
||||
namespace StgSharp
|
||||
namespace StgSharp.Geometries
|
||||
{
|
||||
public class Triangle :IGeometry
|
||||
{
|
||||
@@ -14,6 +14,7 @@ namespace StgSharp
|
||||
internal Point _line1;
|
||||
internal Point _line2;
|
||||
internal RenderMode _renderMode;
|
||||
internal readonly uint bornTick;
|
||||
|
||||
public override sealed Point BasePoint => _basePoint;
|
||||
|
||||
@@ -25,6 +26,16 @@ namespace StgSharp
|
||||
|
||||
public override RenderMode renderMode => _renderMode;
|
||||
|
||||
public Triangle(uint bornTime) : base(bornTime)
|
||||
{
|
||||
bornTick = bornTime;
|
||||
}
|
||||
|
||||
public Triangle(Counter<uint> tickCounter) : base(tickCounter)
|
||||
{
|
||||
bornTick = tickCounter._value;
|
||||
}
|
||||
|
||||
internal override void CalcVec01(uint tick)
|
||||
{
|
||||
_beginPoint._position = _basePoint._position+ MovBegin(tick);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Steamworks;
|
||||
using StgSharp;
|
||||
using StgSharp.Entities;
|
||||
using StgSharp.Geometries;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Net.Http.Headers;
|
||||
@@ -21,15 +22,29 @@ namespace StgSharp
|
||||
internal Line topBoader;
|
||||
internal Line bottomBoader;
|
||||
|
||||
public Line LeftBoarder => leftBoader;
|
||||
public Line RightBoarder => rightBoader;
|
||||
public Line TopBoarder => topBoader;
|
||||
public Line BottomBoarder => bottomBoader;
|
||||
|
||||
internal Sensor<EntityPartical> Sensor;
|
||||
|
||||
private ContainerNode<Pool> _id;
|
||||
|
||||
|
||||
|
||||
public Pool()
|
||||
public Pool(Line left, Line right, Line top, Line bottom)
|
||||
{
|
||||
topBoader = top;
|
||||
bottomBoader= bottom;
|
||||
rightBoader = right;
|
||||
leftBoader = left;
|
||||
}
|
||||
public Pool( Geometries.Rectangle area)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
ContainerNode<Pool> INode<Pool>.ID => _id;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using StgSharp.Geometries;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Data;
|
||||
|
||||
@@ -12,9 +12,12 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="GLFWDotNet" Version="20.9.0" />
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Graphic\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
".NETStandard,Version=v2.1/": {
|
||||
"StgSharp/1.0.0": {
|
||||
"dependencies": {
|
||||
"GLFWDotNet": "20.9.0",
|
||||
"Microsoft.CSharp": "4.7.0",
|
||||
"Steamworks.NET": "20.1.0"
|
||||
},
|
||||
@@ -17,14 +16,6 @@
|
||||
"StgSharp.dll": {}
|
||||
}
|
||||
},
|
||||
"GLFWDotNet/20.9.0": {
|
||||
"runtime": {
|
||||
"lib/netstandard2.1/GLFWDotNet.dll": {
|
||||
"assemblyVersion": "20.9.0.0",
|
||||
"fileVersion": "20.9.0.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Microsoft.CSharp/4.7.0": {
|
||||
"runtime": {
|
||||
"lib/netstandard2.0/Microsoft.CSharp.dll": {
|
||||
@@ -49,13 +40,6 @@
|
||||
"serviceable": false,
|
||||
"sha512": ""
|
||||
},
|
||||
"GLFWDotNet/20.9.0": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
"sha512": "sha512-fWonCs+BBqeK5R8t0g293RPoqerH27FHNcPyL/Hbxe0Ap4QCNKhQYf2tXJU1XTMf1ZbuLmM1MY5lonV35eGw6Q==",
|
||||
"path": "glfwdotnet/20.9.0",
|
||||
"hashPath": "glfwdotnet.20.9.0.nupkg.sha512"
|
||||
},
|
||||
"Microsoft.CSharp/4.7.0": {
|
||||
"type": "package",
|
||||
"serviceable": true,
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -24,12 +24,12 @@
|
||||
Y position of an enemy entity
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:StgSharp.RenderMode.BasePoint">
|
||||
<member name="F:StgSharp.Geometries.RenderMode.BasePoint">
|
||||
<summary>
|
||||
坐标点将基于参考原点构建
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:StgSharp.RenderMode.RefPoint">
|
||||
<member name="F:StgSharp.Geometries.RenderMode.RefPoint">
|
||||
<summary>
|
||||
坐标点将基于参考起点构建
|
||||
</summary>
|
||||
|
||||
Binary file not shown.
@@ -1 +1 @@
|
||||
2c5d22f87b0ea0387a08d1b7f1feec1d740bd3a3
|
||||
d9fddb3184a4632597eeeb36380d494aa4b8420f
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -24,12 +24,12 @@
|
||||
Y position of an enemy entity
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:StgSharp.RenderMode.BasePoint">
|
||||
<member name="F:StgSharp.Geometries.RenderMode.BasePoint">
|
||||
<summary>
|
||||
坐标点将基于参考原点构建
|
||||
</summary>
|
||||
</member>
|
||||
<member name="F:StgSharp.RenderMode.RefPoint">
|
||||
<member name="F:StgSharp.Geometries.RenderMode.RefPoint">
|
||||
<summary>
|
||||
坐标点将基于参考起点构建
|
||||
</summary>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -45,10 +45,6 @@
|
||||
"netstandard2.1": {
|
||||
"targetAlias": "netstandard2.1",
|
||||
"dependencies": {
|
||||
"GLFWDotNet": {
|
||||
"target": "Package",
|
||||
"version": "[20.9.0, )"
|
||||
},
|
||||
"Microsoft.CSharp": {
|
||||
"target": "Package",
|
||||
"version": "[4.7.0, )"
|
||||
|
||||
@@ -2,25 +2,6 @@
|
||||
"version": 3,
|
||||
"targets": {
|
||||
".NETStandard,Version=v2.1": {
|
||||
"GLFWDotNet/20.9.0": {
|
||||
"type": "package",
|
||||
"compile": {
|
||||
"lib/netstandard2.1/GLFWDotNet.dll": {}
|
||||
},
|
||||
"runtime": {
|
||||
"lib/netstandard2.1/GLFWDotNet.dll": {}
|
||||
},
|
||||
"runtimeTargets": {
|
||||
"runtimes/win-x64/native/glfw3.dll": {
|
||||
"assetType": "native",
|
||||
"rid": "win-x64"
|
||||
},
|
||||
"runtimes/win-x86/native/glfw3.dll": {
|
||||
"assetType": "native",
|
||||
"rid": "win-x86"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Microsoft.CSharp/4.7.0": {
|
||||
"type": "package",
|
||||
"compile": {
|
||||
@@ -72,22 +53,6 @@
|
||||
}
|
||||
},
|
||||
"libraries": {
|
||||
"GLFWDotNet/20.9.0": {
|
||||
"sha512": "fWonCs+BBqeK5R8t0g293RPoqerH27FHNcPyL/Hbxe0Ap4QCNKhQYf2tXJU1XTMf1ZbuLmM1MY5lonV35eGw6Q==",
|
||||
"type": "package",
|
||||
"path": "glfwdotnet/20.9.0",
|
||||
"files": [
|
||||
".nupkg.metadata",
|
||||
".signature.p7s",
|
||||
"License.txt",
|
||||
"glfwdotnet.20.9.0.nupkg.sha512",
|
||||
"glfwdotnet.nuspec",
|
||||
"lib/netstandard2.1/GLFW.license",
|
||||
"lib/netstandard2.1/GLFWDotNet.dll",
|
||||
"runtimes/win-x64/native/glfw3.dll",
|
||||
"runtimes/win-x86/native/glfw3.dll"
|
||||
]
|
||||
},
|
||||
"Microsoft.CSharp/4.7.0": {
|
||||
"sha512": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==",
|
||||
"type": "package",
|
||||
@@ -180,7 +145,6 @@
|
||||
},
|
||||
"projectFileDependencyGroups": {
|
||||
".NETStandard,Version=v2.1": [
|
||||
"GLFWDotNet >= 20.9.0",
|
||||
"Microsoft.CSharp >= 4.7.0",
|
||||
"Steamworks.NET >= 20.1.0"
|
||||
]
|
||||
@@ -230,10 +194,6 @@
|
||||
"netstandard2.1": {
|
||||
"targetAlias": "netstandard2.1",
|
||||
"dependencies": {
|
||||
"GLFWDotNet": {
|
||||
"target": "Package",
|
||||
"version": "[20.9.0, )"
|
||||
},
|
||||
"Microsoft.CSharp": {
|
||||
"target": "Package",
|
||||
"version": "[4.7.0, )"
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
{
|
||||
"version": 2,
|
||||
"dgSpecHash": "5G3NWQf7wV5PLr5m1b580Wd0sIPC7CL1BaPzPPQflu8N6pnZ3hZTMxEXjj+C3TF5fOTJ1U9gMowOkb8ftV/V0g==",
|
||||
"dgSpecHash": "E+9DVhmJD3iKjwnjVgkXQe4WBAHxK66OG5RQDU+mTSvAaJhypgeRYBYqAJ0ou3rs/5+fuoCbzhodIhbFOCCYPQ==",
|
||||
"success": true,
|
||||
"projectFilePath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj",
|
||||
"expectedPackageFiles": [
|
||||
"C:\\Users\\Nitlo\\.nuget\\packages\\glfwdotnet\\20.9.0\\glfwdotnet.20.9.0.nupkg.sha512",
|
||||
"C:\\Users\\Nitlo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
|
||||
"C:\\Users\\Nitlo\\.nuget\\packages\\steamworks.net\\20.1.0\\steamworks.net.20.1.0.nupkg.sha512"
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user