daily update on 20241002 by nitload youmu, intrinsic function rebuild, syntax style arrange
This commit is contained in:
+11
-14
@@ -39,24 +39,21 @@ namespace StgSharp.Gaming
|
||||
public abstract class Bullet : IInstancing, IPlainEntity
|
||||
{
|
||||
|
||||
protected Bullet
|
||||
(
|
||||
protected Bullet(
|
||||
PlainInstancingBuffer<Bullet> buffer,
|
||||
GeometryMotion movement,
|
||||
vec2d beginPosition,
|
||||
Vec2 beginPosition,
|
||||
float angle,
|
||||
float scale
|
||||
)
|
||||
float scale )
|
||||
{
|
||||
if (buffer == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(buffer));
|
||||
if( buffer == null ) {
|
||||
throw new ArgumentNullException( nameof( buffer ) );
|
||||
}
|
||||
GlobalBuffer = buffer;
|
||||
BufferId = buffer.CreateInstanceID();
|
||||
((IInstancing)this).Scale = scale;
|
||||
((IInstancing)this).Coord = new vec3d(beginPosition, 0);
|
||||
((IInstancing)this).Rotation = angle;
|
||||
( ( IInstancing )this ).Scale = scale;
|
||||
( ( IInstancing )this ).Coord = new Vec3( beginPosition, 0 );
|
||||
( ( IInstancing )this ).Rotation = angle;
|
||||
Motion = movement;
|
||||
}
|
||||
|
||||
@@ -78,18 +75,18 @@ namespace StgSharp.Gaming
|
||||
set;
|
||||
}
|
||||
|
||||
public vec2d CenterPosition
|
||||
public Vec2 CenterPosition
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public bool CollideWith(IPlainEntity entity)
|
||||
public bool CollideWith( IPlainEntity entity )
|
||||
{
|
||||
throw new System.NotImplementedException();
|
||||
}
|
||||
|
||||
vec3d IInstancing.CenterPositionGlobal
|
||||
Vec3 IInstancing.CenterPositionGlobal
|
||||
{
|
||||
get;
|
||||
set;
|
||||
|
||||
@@ -49,79 +49,85 @@ namespace StgSharp.Stg
|
||||
public interface IOneDimensionalCollisionTexture2D
|
||||
{
|
||||
|
||||
public void Init(Radius angleStride, string name);
|
||||
public void Init( Radius angleStride, string name );
|
||||
|
||||
}
|
||||
|
||||
public sealed class OneDimensionalCollisionTexture2D_GL : glRender, IOneDimensionalCollisionTexture2D
|
||||
{
|
||||
|
||||
float[] textureOutput;
|
||||
ElementBuffer ebo;
|
||||
private float[] textureOutput;
|
||||
private ElementBuffer ebo;
|
||||
private FrameBuffer fbo;
|
||||
RenderBuffer rbo;
|
||||
private RenderBuffer rbo;
|
||||
|
||||
ShaderProgram generatingShader;
|
||||
private ShaderProgram generatingShader;
|
||||
|
||||
TextureGL t;
|
||||
private TextureGL t;
|
||||
|
||||
VertexArray vao;
|
||||
VertexBuffer vbo;
|
||||
private VertexArray vao;
|
||||
private VertexBuffer vbo;
|
||||
|
||||
public OneDimensionalCollisionTexture2D_GL()
|
||||
{
|
||||
|
||||
}
|
||||
public OneDimensionalCollisionTexture2D_GL() { }
|
||||
|
||||
public override bool IsContextSharable => false;
|
||||
|
||||
public void GenerateCollisionTexture(IEnumerable<IInstancingBuffer> bufferEnumeration)
|
||||
public void GenerateCollisionTexture(
|
||||
IEnumerable<IInstancingBuffer> bufferEnumeration )
|
||||
{
|
||||
fbo.Bind(0);
|
||||
GL.ClearColor(0, 0, 0, 1);
|
||||
GL.Clear(MaskBufferBit.DEPTH | MaskBufferBit.COLOR);
|
||||
fbo.Bind( 0 );
|
||||
GL.ClearColor( 0, 0, 0, 1 );
|
||||
GL.Clear( MaskBufferBit.DEPTH | MaskBufferBit.COLOR );
|
||||
generatingShader.Use();
|
||||
vao.Bind(0);
|
||||
vao.Bind( 0 );
|
||||
|
||||
foreach (IInstancingBuffer item in bufferEnumeration)
|
||||
{
|
||||
foreach( IInstancingBuffer item in bufferEnumeration ) {
|
||||
IGeometry g = item.TypicalShape;
|
||||
|
||||
if (!(g is PlainGeometry))
|
||||
{
|
||||
throw new InvalidOperationException("The current particle buffer contains non-planar geometry,");
|
||||
if( !( g is PlainGeometry ) ) {
|
||||
throw new InvalidOperationException(
|
||||
"The current particle buffer contains non-planar geometry," );
|
||||
}
|
||||
|
||||
ebo.Bind(0);
|
||||
ebo.SetValue<int>(0, g.VertexIndices, BufferUsage.StreamDraw);
|
||||
ebo.Bind( 0 );
|
||||
ebo.SetValue<int>( 0, g.VertexIndices, BufferUsage.StreamDraw );
|
||||
|
||||
vbo.WriteVectorData<vec4d>(0, item.CoordAndRotationSpan, BufferUsage.StreamDraw);
|
||||
vao.SetVertexAttribute(1, 3, TypeCode.Single, false, 4 * sizeof(float), 0);
|
||||
vao.SetVertexAttribute(2, 1, TypeCode.Single, false, 4 * sizeof(float), 3 * sizeof(float));
|
||||
vbo.WriteVectorData<Vec4>(
|
||||
0, item.CoordAndRotationSpan, BufferUsage.StreamDraw );
|
||||
vao.SetVertexAttribute(
|
||||
1, 3, TypeCode.Single, false, 4 * sizeof( float ), 0 );
|
||||
vao.SetVertexAttribute(
|
||||
2, 1, TypeCode.Single, false, 4 * sizeof( float ),
|
||||
3 * sizeof( float ) );
|
||||
|
||||
vbo.WriteScalerData<float>(2, item.ScalingSpan, BufferUsage.StreamDraw);
|
||||
vao.SetVertexAttribute(3, 1, TypeCode.Single, false, sizeof(float), 0);
|
||||
vbo.WriteScalerData<float>(
|
||||
2, item.ScalingSpan, BufferUsage.StreamDraw );
|
||||
vao.SetVertexAttribute(
|
||||
3, 1, TypeCode.Single, false, sizeof( float ), 0 );
|
||||
|
||||
vbo.WriteVectorData(1, g.VertexStream, BufferUsage.StreamDraw);
|
||||
vao.SetVertexAttribute(0, 3, TypeCode.Single, false, 4 * sizeof(float), 0);
|
||||
vbo.WriteVectorData( 1, g.VertexStream,
|
||||
BufferUsage.StreamDraw );
|
||||
vao.SetVertexAttribute(
|
||||
0, 3, TypeCode.Single, false, 4 * sizeof( float ), 0 );
|
||||
|
||||
GL.DrawElementsInstanced(GeometryType.TRIANGLES, ((uint)g.VertexIndices.Length) / 3,
|
||||
TypeCode.UInt32, IntPtr.Zero, (uint)item.ScalingSpan.Length);
|
||||
GL.DrawElementsInstanced(
|
||||
GeometryType.TRIANGLES,
|
||||
( ( uint )g.VertexIndices.Length ) / 3, TypeCode.UInt32,
|
||||
IntPtr.Zero, ( uint )item.ScalingSpan.Length );
|
||||
}
|
||||
|
||||
t.Bind2D(0);
|
||||
GL.GetTextureImage(Texture2DTarget.Texture2D, 0, ImageChannel.SingleColor, PixelChannelLayout.Float, textureOutput);
|
||||
t.Bind2D( 0 );
|
||||
GL.GetTextureImage(
|
||||
Texture2DTarget.Texture2D, 0, ImageChannel.SingleColor,
|
||||
PixelChannelLayout.Float, textureOutput );
|
||||
VertexArray.BindNull();
|
||||
}
|
||||
|
||||
public void Init(Radius angleStride, string name)
|
||||
public void Init( Radius angleStride, string name )
|
||||
{
|
||||
primeArgs = new ViewPort
|
||||
{
|
||||
Height = 1,
|
||||
Width = (int)((new Radius(Scaler.Pi)) / angleStride),
|
||||
Name = name,
|
||||
};
|
||||
primeArgs = new ViewPort(
|
||||
(1, ( ( new Radius( Scaler.Pi ) ) / angleStride )), name,
|
||||
IntPtr.Zero );
|
||||
|
||||
_coordStretch = (1, 1, 1);
|
||||
|
||||
@@ -129,7 +135,7 @@ namespace StgSharp.Stg
|
||||
CustomizeInit();
|
||||
}
|
||||
|
||||
#pragma warning disable CS8618
|
||||
#pragma warning disable CS8618
|
||||
|
||||
protected override void CustomizeDeinit()
|
||||
{
|
||||
@@ -140,48 +146,50 @@ namespace StgSharp.Stg
|
||||
{
|
||||
generatingShader = CreateShaderProgram();
|
||||
|
||||
Shader vertexShader = CreateShaderSegment(ShaderType.Vertex, 1);
|
||||
Shader fragmentShader = CreateShaderSegment(ShaderType.Fragment, 1);
|
||||
Shader vertexShader = CreateShaderSegment( ShaderType.Vertex, 1 );
|
||||
Shader fragmentShader = CreateShaderSegment(
|
||||
ShaderType.Fragment, 1 );
|
||||
|
||||
vertexShader.Compile(0, InternalIO.CollisionTextureVertexShader);
|
||||
fragmentShader.Compile(0, InternalIO.CollisionTextureFragmentShader);
|
||||
vertexShader.AttachTo(0, generatingShader);
|
||||
fragmentShader.AttachTo(0, generatingShader);
|
||||
vertexShader.Compile( 0, InternalIO.CollisionTextureVertexShader );
|
||||
fragmentShader.Compile(
|
||||
0, InternalIO.CollisionTextureFragmentShader );
|
||||
vertexShader.AttachTo( 0, generatingShader );
|
||||
fragmentShader.AttachTo( 0, generatingShader );
|
||||
|
||||
generatingShader.Link();
|
||||
generatingShader.Use();
|
||||
|
||||
vbo = CreateVertexBuffer(3);
|
||||
vao = CreateVertexArray(1);
|
||||
ebo = CreateElementBuffer(1);
|
||||
vbo = CreateVertexBuffer( 3 );
|
||||
vao = CreateVertexArray( 1 );
|
||||
ebo = CreateElementBuffer( 1 );
|
||||
|
||||
|
||||
fbo = CreateFrameBuffer(1);
|
||||
rbo = CreateRenderBuffer(1);
|
||||
fbo = CreateFrameBuffer( 1 );
|
||||
rbo = CreateRenderBuffer( 1 );
|
||||
GL.SetRenderBufferStorage(
|
||||
RenderBufferInternalFormat.Depth24_Stencil8, this.Size);
|
||||
RenderBufferInternalFormat.Depth24_Stencil8, this.Size );
|
||||
|
||||
|
||||
t = CreateTexture(1);
|
||||
t.Bind2D(0);
|
||||
GL.TextureImage2d<byte>(Texture2DTarget.Texture2D, 0, (int)ImageChannel.WithAlphaChannel,
|
||||
(uint)Width, (uint)Height, (int)ImageChannel.WithAlphaChannel, PixelChannelLayout.Byte, Array.Empty<byte>());
|
||||
t = CreateTexture( 1 );
|
||||
t.Bind2D( 0 );
|
||||
GL.TextureImage2d<byte>(
|
||||
Texture2DTarget.Texture2D, 0, ImageChannel.WithAlphaChannel,
|
||||
( uint )Width, ( uint )Height, ImageChannel.WithAlphaChannel,
|
||||
PixelChannelLayout.Byte, Array.Empty<byte>() );
|
||||
|
||||
t.Set2dWrapProperty(0, TextureWrap.Repeat, TextureWrap.Repeat);
|
||||
t.Set2dFilterProperty(0, TextureFilter.Nearest, TextureFilter.Nearest);
|
||||
t.Set2dWrapProperty( 0, TextureWrap.Repeat, TextureWrap.Repeat );
|
||||
t.Set2dFilterProperty(
|
||||
0, TextureFilter.Nearest, TextureFilter.Nearest );
|
||||
|
||||
GL.FrameBufferTexture2d(FrameBufferTarget.All, glAttachment.Color(0),
|
||||
Texture2DTarget.Texture2D, t[0], 0);
|
||||
GL.FrameBufferTexture2d(
|
||||
FrameBufferTarget.All, glAttachment.Color( 0 ),
|
||||
Texture2DTarget.Texture2D, t[ 0 ], 0 );
|
||||
|
||||
GL.CombineFrameBufferRenderBuffer(FrameBufferAttachment.Color, rbo[0]);
|
||||
GL.CombineFrameBufferRenderBuffer(
|
||||
FrameBufferAttachment.Color, rbo[ 0 ] );
|
||||
|
||||
textureOutput = new float[this.Width];
|
||||
}
|
||||
|
||||
protected override void Main()
|
||||
{
|
||||
throw new NotSupportedException();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,5 @@ using System.Text;
|
||||
|
||||
namespace StgSharp.Stg
|
||||
{
|
||||
public class TimeLine
|
||||
{
|
||||
}
|
||||
public class TimeLine { }
|
||||
}
|
||||
|
||||
@@ -39,8 +39,6 @@ namespace StgSharp.Stg.Touhou
|
||||
{
|
||||
public static class TouhouBuilder
|
||||
{
|
||||
|
||||
|
||||
/*
|
||||
public static ViewBase BuildTouhouWorld()
|
||||
{
|
||||
|
||||
@@ -41,11 +41,7 @@ namespace StgSharp.Touhou
|
||||
public abstract class TouhouWindowMain : ViewModelBase
|
||||
{
|
||||
|
||||
protected TouhouWindowMain(ViewPort vp) : base(vp, 60)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
protected TouhouWindowMain( ViewPort vp ) : base( vp, 60 ) { }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,12 +42,11 @@ namespace StgSharp.Stg.Touhou
|
||||
public abstract class OpenningView : ViewBase
|
||||
{
|
||||
|
||||
public override void CustomizedInitialize(ViewModelBase viewModelBinding)
|
||||
public override void CustomizedInitialize(
|
||||
ViewModelBase viewModelBinding )
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user