neintonine/smrendererv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BloomEffect fixed _source, fixed basic.glsl

Browse source
This commit is contained in:
Michel Fedde 2021-03-15 18:18:51 +01:00
parent 5bb690e45f
commit 03d99ea28e
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SMCode/SM.Base/PostEffects/BloomEffect.cs
View file

@ -78,8 +78,12 @@ namespace SM.Base.PostEffects
} }
} }
protected override void InitProcess() protected override void InitProcess()
{ {
_source = Pipeline.MainFramebuffer;
_source.ColorAttachments["color"].PixelInformation = PixelInformation.RGBA_HDR; _source.ColorAttachments["color"].PixelInformation = PixelInformation.RGBA_HDR;
_bloomBuffer1 = new Framebuffer(Pipeline.ConnectedWindow, _textureScale); _bloomBuffer1 = new Framebuffer(Pipeline.ConnectedWindow, _textureScale);

2
SMCode/SM.Base/Window/RenderPipeline.cs
View file

@ -15,7 +15,7 @@ namespace SM.Base.Windows
public List<Framebuffer> Framebuffers { get; } = new List<Framebuffer>(); public List<Framebuffer> Framebuffers { get; } = new List<Framebuffer>();
public virtual MaterialShader DefaultShader { get; protected set; } public virtual MaterialShader DefaultShader { get; protected set; } = SMRenderer.DefaultMaterialShader;
public virtual Material DefaultMaterial { get; protected set; } public virtual Material DefaultMaterial { get; protected set; }
public bool IsInitialized { get; set; } public bool IsInitialized { get; set; }

4
SMCode/SM2D/Shader/ShaderFiles/basic.glsl
View file

@ -9,8 +9,6 @@ uniform sampler2D Texture;
layout(location = 0) out vec4 color; layout(location = 0) out vec4 color;
void main() { void main() {
color = vec4(v_TexCoords, 0, 1);
return;
color = v_Color * Tint; color = v_Color * Tint;
if (UseTexture) color = texture(Texture, v_TexCoords); if (UseTexture) color *= texture(Texture, v_TexCoords);
} }

2
SM_TEST/TestRenderPipeline.cs
View file

@ -16,7 +16,7 @@ namespace SM_TEST
public override void Initialization() public override void Initialization()
{ {
_bloom = new BloomEffect(1); _bloom = new BloomEffect(hdr: true);
MainFramebuffer = CreateWindowFramebuffer(); MainFramebuffer = CreateWindowFramebuffer();