daily update on 20240613 by nitload youmu[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[D[C[4
This commit is contained in:
@@ -84,9 +84,7 @@ namespace StgSharp
|
||||
|
||||
protected override void Init()
|
||||
{
|
||||
//spanProvider = new TimeSpanProvider(1 / 60.00f, TimeSpanProvider.DefaultProvider);
|
||||
|
||||
SetSizeLimit(800, 800, 800, 800);
|
||||
//SetSizeLimit(800, 800, 800, 800);
|
||||
|
||||
FrameSizeCallback = new FrameBufferSizeHandler(
|
||||
(window, width, height) =>
|
||||
@@ -112,8 +110,8 @@ namespace StgSharp
|
||||
0.8f, -0.8f, 0,
|
||||
-0.8f, -0.8f, 0
|
||||
);
|
||||
|
||||
/**/
|
||||
|
||||
/**/
|
||||
tex = new Rectangle(
|
||||
0f, 1f,
|
||||
@@ -200,13 +198,8 @@ namespace StgSharp
|
||||
//glFunc.DrawElements(GeometryType.LINES, 6, TypeCode.UInt32, IntPtr.Zero);
|
||||
BlueprintPipeline.SkipAll(output);
|
||||
|
||||
PollEvents();
|
||||
SwapBuffers();
|
||||
}
|
||||
|
||||
protected override void ProcessInput()
|
||||
{
|
||||
|
||||
PollEvents();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ namespace StgSharp
|
||||
|
||||
protected override sealed void Init()
|
||||
{
|
||||
SetSizeLimit(800, 800, 800, 800);
|
||||
//SetSizeLimit(800, 800, 800, 800);
|
||||
|
||||
FrameSizeCallback =
|
||||
(IntPtr id, uint width, uint height) => glFunc.Viewport(0, 0, width, height);
|
||||
@@ -219,6 +219,7 @@ namespace StgSharp
|
||||
SwapBuffers();
|
||||
}
|
||||
|
||||
/*
|
||||
protected override void ProcessInput()
|
||||
{
|
||||
float movement = 0.005f;
|
||||
@@ -255,6 +256,6 @@ namespace StgSharp
|
||||
NativeCamera.Yaw(new Radius(movement));
|
||||
}
|
||||
}
|
||||
|
||||
/**/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,34 @@
|
||||
using StgSharp.Geometries;
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
// file="Particle.cs"
|
||||
// Project: StgSharp
|
||||
// AuthorGroup: Nitload Space
|
||||
// Copyright (c) Nitload Space. All rights reserved.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the “Software”), to deal in the Software without restriction,
|
||||
// including without limitation the rights to use, copy, modify, merge,
|
||||
// publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
// and to permit persons to whom the Software is furnished to do so,
|
||||
// subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and
|
||||
// this permission notice shall be included in all copies
|
||||
// or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED “AS IS”,
|
||||
// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
|
||||
// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
// ARISING FROM, OUT OF OR IN CONNECTION WITH
|
||||
// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
using StgSharp.Geometries;
|
||||
using StgSharp.Graphics;
|
||||
using StgSharp.Graphics.GL;
|
||||
using StgSharp.Logic;
|
||||
@@ -16,7 +46,21 @@ namespace StgSharp
|
||||
{
|
||||
public class ParticleStream : glRenderStream
|
||||
{
|
||||
public ParticleStream(ViewPort args, (int,int,int) cube) : base(args, (100,100,100))
|
||||
|
||||
ElementBuffer ebo;
|
||||
|
||||
FrameBuffer fbo;
|
||||
Image i;
|
||||
PlainInstancingBuffer<ParticleOnPlain> buffer;
|
||||
RenderBuffer rbo;
|
||||
|
||||
ShaderProgram s;
|
||||
|
||||
TextureGL t;
|
||||
VertexArray vao;
|
||||
VertexBuffer vbo;
|
||||
|
||||
public ParticleStream(ViewPort args, (int, int, int) cube) : base(args, (100, 100, 100))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -24,46 +68,36 @@ namespace StgSharp
|
||||
|
||||
protected override string[] OutputPortsName => ["output_1"];
|
||||
|
||||
protected override void Deinit()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
ShaderProgram s;
|
||||
PlainInstancingBuffer<ParticleOnPlain> buffer;
|
||||
VertexBuffer vbo;
|
||||
VertexArray vao;
|
||||
ElementBuffer ebo;
|
||||
|
||||
FrameBuffer fbo;
|
||||
|
||||
|
||||
|
||||
internal static vec3d DefaultRotation(TimeSpanProvider provider, out float rotation)
|
||||
{
|
||||
rotation = 0.1f;
|
||||
float angle = provider.CurrentSpan * 0.1f;
|
||||
return new vec3d(
|
||||
0.01f * Scaler.Cos(angle),
|
||||
- 0.01f * Scaler.Sin(angle),
|
||||
(-0.01f) * Scaler.Sin(angle),
|
||||
0
|
||||
);
|
||||
}
|
||||
|
||||
protected override void Deinit()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
protected override void Init()
|
||||
{
|
||||
buffer = new PlainInstancingBuffer<ParticleOnPlain>();
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
float ai =Scaler.Abs(i - 5.0f);
|
||||
float ai = Scaler.Abs(i - 5.0f);
|
||||
for (int t = 0; t < 10; t++)
|
||||
{
|
||||
float at = Scaler.Abs(t - 5.0f);
|
||||
|
||||
ParticleOnPlain p = new ParticleOnPlain(buffer);
|
||||
((IInstancing)p).Coord = new vec3d(
|
||||
(-5 + i) * 0.2f + 0.1f, (-5 + t) * 0.2f + 0.1f, 0);
|
||||
((IInstancing)p).Scale =
|
||||
(((-5) + i) * 0.2f) + 0.1f, (((-5) + t) * 0.2f) + 0.1f, 0);
|
||||
((IInstancing)p).Scale =
|
||||
Scaler.MinOf(i, t) * 0.15f;
|
||||
((IInstancing)p).Motion = new GeometryMotion(
|
||||
true, this.timeProvider,
|
||||
@@ -72,19 +106,19 @@ namespace StgSharp
|
||||
}
|
||||
}
|
||||
|
||||
SetSizeLimit(800, 800, 800, 800);
|
||||
//SetSizeLimit(800, 800, 800, 800);
|
||||
|
||||
FrameSizeCallback =
|
||||
(IntPtr id, uint width, uint height) => glFunc.Viewport(0, 0, width, height);
|
||||
|
||||
s = CreateShaderProgram();
|
||||
Shader pvs = CreateShaderSegment(ShaderType.Vertex ,1);
|
||||
Shader pfs = CreateShaderSegment(ShaderType.Fragment ,1);
|
||||
Shader pvs = CreateShaderSegment(ShaderType.Vertex, 1);
|
||||
Shader pfs = CreateShaderSegment(ShaderType.Fragment, 1);
|
||||
|
||||
pvs.Compile(0, Shader.FromCodeFile("Shader\\particle.vert"));
|
||||
pvs.AttachTo(0,s);
|
||||
pvs.AttachTo(0, s);
|
||||
pfs.Compile(0, Shader.FromCodeFile("Shader\\particle.frag"));
|
||||
pfs.AttachTo(0,s);
|
||||
pfs.AttachTo(0, s);
|
||||
s.Link();
|
||||
|
||||
vbo = CreateVertexBuffer(3);
|
||||
@@ -94,18 +128,18 @@ namespace StgSharp
|
||||
|
||||
Rectangle rec = new Rectangle
|
||||
(
|
||||
0.05f,0.05f,
|
||||
0.05f,-0.05f,
|
||||
-0.05f,-0.05f,
|
||||
-0.05f,0.05f
|
||||
0.05f, 0.05f,
|
||||
0.05f, -0.05f,
|
||||
-0.05f, -0.05f,
|
||||
-0.05f, 0.05f
|
||||
);
|
||||
|
||||
|
||||
vao.Bind(0);
|
||||
vbo.WriteVectorData(0, rec.VertexStream, BufferUsage.StaticDraw);
|
||||
ebo.SetValue(0, rec.VertexIndices, BufferUsage.StaticDraw);
|
||||
VertexArray.SetVertexAttribute(0, 3, TypeCode.Single, false, 4 * sizeof(float),0);
|
||||
|
||||
vbo.WriteVectorData<vec4d>(1, buffer.CoordAndRotationSpan,BufferUsage.StreamDraw);
|
||||
VertexArray.SetVertexAttribute(0, 3, TypeCode.Single, false, 4 * sizeof(float), 0);
|
||||
|
||||
vbo.WriteVectorData<vec4d>(1, buffer.CoordAndRotationSpan, BufferUsage.StreamDraw);
|
||||
VertexArray.SetVertexAttribute(1, 3, TypeCode.Single, false, 4 * sizeof(float), 0);
|
||||
VertexArray.SetVertexAttribute(2, 1, TypeCode.Single, false, 4 * sizeof(float), 3 * sizeof(float));
|
||||
|
||||
@@ -113,23 +147,23 @@ namespace StgSharp
|
||||
glFunc.VertexAttributeDivisor(2, 1);
|
||||
|
||||
vbo.WriteScalerData<float>(2, buffer.ScalingSpan, BufferUsage.StaticDraw);
|
||||
VertexArray.SetVertexAttribute(3,1,TypeCode.Single,false,sizeof(float),0);
|
||||
|
||||
VertexArray.SetVertexAttribute(3, 1, TypeCode.Single, false, sizeof(float), 0);
|
||||
|
||||
glFunc.VertexAttributeDivisor(3, 1);
|
||||
|
||||
|
||||
|
||||
|
||||
vbo.Unbind();
|
||||
VertexArray.BindNull();
|
||||
|
||||
NativeCameraViewTarget
|
||||
(
|
||||
(0,0,-100),
|
||||
(0,0,0),
|
||||
(0,1,0)
|
||||
(0, 0, -100),
|
||||
(0, 0, 0),
|
||||
(0, 1, 0)
|
||||
);
|
||||
NativeCameraViewRange(new Degree(1.5f),Vec2d.Zero,(50,50));
|
||||
NativeCameraUniform(s,"Camera");
|
||||
NativeCameraViewRange(new Degree(1.5f), Vec2d.Zero, (50, 50));
|
||||
NativeCameraUniform(s, "Camera");
|
||||
|
||||
s.Use();
|
||||
fbo = CreateFrameBuffer(1);
|
||||
@@ -143,62 +177,63 @@ namespace StgSharp
|
||||
|
||||
t = CreateTexture(1);
|
||||
t.Bind2D(0);
|
||||
/**/
|
||||
glFunc.TextureImage2d(Texture2DTarget.Texture2D, 0, (int)ImageChannel.WithAlphaChannel,
|
||||
(uint)Width, (uint)Height, (int)ImageChannel.WithAlphaChannel, ImageChannelLayout.Byte, glHandle.ZeroHandle);
|
||||
|
||||
/**/
|
||||
t.Set2dWrapProperty(Wrap.Repeat, Wrap.Repeat);
|
||||
t.Set2dFilterProperty(Filter.Nearest, Filter.Nearest);
|
||||
|
||||
|
||||
|
||||
glFunc.FrameBufferTexture2d(FrameBufferTarget.All, glAttachment.Color(0),
|
||||
Texture2DTarget.Texture2D,t[0],0);
|
||||
Texture2DTarget.Texture2D, t[0], 0);
|
||||
|
||||
glFunc.CombineFrameBufferRenderBuffer(fbo[0], rbo[0]);
|
||||
|
||||
int streamLength = this.Width * this.Height * 4;
|
||||
byte[] imageStream = new byte[streamLength];
|
||||
i = Image.FromMemory(this.Size,4,imageStream);
|
||||
i = Image.FromMemory(this.Size, 4, imageStream);
|
||||
}
|
||||
|
||||
TextureGL t;
|
||||
RenderBuffer rbo;
|
||||
Image i;
|
||||
|
||||
protected override void Main(
|
||||
in Dictionary<string, BlueprintPipeline> input,
|
||||
in Dictionary<string, BlueprintPipeline> input,
|
||||
in Dictionary<string, BlueprintPipeline> output)
|
||||
{
|
||||
//Console.WriteLine($"{Width} {Height}");
|
||||
buffer.UpdateAllParticles();
|
||||
|
||||
fbo.Bind(0);
|
||||
vao.Bind(0);
|
||||
t.Bind2D(0);
|
||||
/**/
|
||||
glFunc.TextureImage2d(Texture2DTarget.Texture2D, 0, (int)ImageChannel.WithAlphaChannel,
|
||||
(uint)Width, (uint)Height, (int)ImageChannel.WithAlphaChannel, ImageChannelLayout.Byte, glHandle.ZeroHandle);
|
||||
/**/
|
||||
|
||||
|
||||
glFunc.ClearColor(0.6f,0.1f,0.3f,1);
|
||||
glFunc.ClearColor(0.6f, 0.1f, 0.3f, 1);
|
||||
glFunc.Clear(MaskBufferBit.COLOR | MaskBufferBit.DEPTH);
|
||||
|
||||
vbo.Bind(1);
|
||||
vbo.WriteVectorData<vec4d>(1, buffer.CoordAndRotationSpan, BufferUsage.StreamDraw);
|
||||
|
||||
s.Use();
|
||||
|
||||
s.Use();
|
||||
NativeCamera.SetAllUniforms();
|
||||
|
||||
glFunc.DrawElementsInstanced(
|
||||
GeometryType.TRIANGLES, 6, TypeCode.UInt32,IntPtr.Zero,100
|
||||
GeometryType.TRIANGLES, 6, TypeCode.UInt32, IntPtr.Zero, 100
|
||||
);
|
||||
glFunc.WaitAccomplishment();
|
||||
VertexArray.BindNull();
|
||||
|
||||
/**/
|
||||
|
||||
t.Bind2D(0);
|
||||
ImageProcessor.Resize(i, this.Width, this.Height, ImageMovement.Discard);
|
||||
|
||||
glFunc.GetTextureImage(Texture2DTarget.Texture2D, 0,ImageChannel.WithAlphaChannel,
|
||||
ImageChannelLayout.Byte,ref i.data);
|
||||
glFunc.GetTextureImage(Texture2DTarget.Texture2D, 0, ImageChannel.WithAlphaChannel,
|
||||
ImageChannelLayout.Byte, ref i.data);
|
||||
|
||||
//Array.Fill<byte>(i.DataStream, 24);
|
||||
output["output_1"].CompleteAndWriteData( new TexturePipeline(i));
|
||||
output["output_1"].CompleteAndWriteData(new TexturePipeline(i));
|
||||
FrameBuffer.BindNull();
|
||||
/**/
|
||||
|
||||
@@ -209,12 +244,5 @@ namespace StgSharp
|
||||
/**/
|
||||
}
|
||||
|
||||
protected override void ProcessInput()
|
||||
{
|
||||
if (CheckKey(KeyboardKey.ESCAPE) == KeyStatus.PRESS)
|
||||
{
|
||||
InternalIO.glfwSetWindowShouldClose(CanvasHandle, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
//using StgSharp.Environment.Win32;
|
||||
using StgSharp.Controlling.UsrActivity;
|
||||
using StgSharp.Geometries;
|
||||
using StgSharp.Graphics;
|
||||
using StgSharp.Logic;
|
||||
@@ -18,18 +19,13 @@ namespace StgSharp
|
||||
{
|
||||
}
|
||||
|
||||
public void Beep()
|
||||
protected sealed override void BuildGlobalKeyControl()
|
||||
{
|
||||
if (CurrentFrameCount%60==0)
|
||||
{
|
||||
Console.Beep();
|
||||
}
|
||||
}
|
||||
|
||||
//[RenderActivity(RenderPriority.Pre_1)]
|
||||
public void NoOp()
|
||||
{
|
||||
int a = 1;
|
||||
GlobalKeyAction.Add(
|
||||
new KeyTrigger(KeyboardKey.ESCAPE,KeyStatus.PRESS),
|
||||
new Action(() => {
|
||||
InternalIO.glfwSetWindowShouldClose(this.WindowID, 1);
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,12 +42,12 @@ namespace StgSharp
|
||||
StgSharp.InitGL(4, 6);
|
||||
StgSharp.GlobalSetting.VSyncActivated = false;
|
||||
|
||||
ViewPort vp = new ViewPort(
|
||||
ViewPort viewport = new ViewPort(
|
||||
name: "Hello, Stg#!",
|
||||
size: (800,600),
|
||||
size: (800,800),
|
||||
monitor: IntPtr.Zero
|
||||
);
|
||||
StgSharpDemoForm demoForm = new StgSharpDemoForm(vp,60);
|
||||
StgSharpDemoForm demoForm = new StgSharpDemoForm(vp: viewport,60);
|
||||
|
||||
|
||||
|
||||
@@ -61,15 +57,15 @@ namespace StgSharp
|
||||
//<MainRenderStream>
|
||||
//<ParticleStream>
|
||||
<fboFrame>
|
||||
(v, (1,1,1));
|
||||
(v);
|
||||
|
||||
var rstream = RenderStream.ShareContextWith
|
||||
<fboFrame,ParticleStream>(stream);
|
||||
Console.WriteLine(1);
|
||||
Blueprint blueprint = new Blueprint();
|
||||
|
||||
BlueprintNode node0 = new BlueprintNode("BufferGenerateStream", rstream);
|
||||
BlueprintNode node1 = new BlueprintNode("MainRenderStream",stream);
|
||||
|
||||
node0.AddAfter(blueprint.BeginLayer,
|
||||
"input_1", "input_1");
|
||||
node0.AddBefore(node1,
|
||||
|
||||
Reference in New Issue
Block a user