#MERGE
This commit is contained in:
commit
31777faa11
107 changed files with 1146 additions and 803 deletions
|
|
@ -1,9 +1,8 @@
|
|||
using System;
|
||||
using OpenTK;
|
||||
using OpenTK;
|
||||
using OpenTK.Graphics;
|
||||
using OpenTK.Input;
|
||||
using SM.Base;
|
||||
using SM.Base.Windows;
|
||||
using SM.Base.Window;
|
||||
using SM.Game.Controls;
|
||||
using SM2D;
|
||||
using SM2D.Drawing;
|
||||
|
|
@ -58,7 +57,7 @@ namespace SM_TEST
|
|||
DrawText text = new DrawText(font, "Test Text");
|
||||
text.Transform.Position.Set(50, 0);
|
||||
text.Transform.Size.Set(2);
|
||||
scene.Objects.Add(text);
|
||||
scene.HUD.Add(text);
|
||||
|
||||
//particles.Trigger();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
|
|
|
|||
|
|
@ -45,12 +45,6 @@
|
|||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
using System.Collections.Generic;
|
||||
using OpenTK.Graphics.OpenGL4;
|
||||
using SM.Base;
|
||||
using SM.Base;
|
||||
using SM.Base.Drawing;
|
||||
using OpenTK.Graphics.OpenGL4;
|
||||
using SM.Base.PostEffects;
|
||||
using SM.Base.Windows;
|
||||
using SM.Base.Window;
|
||||
using SM.OGL.Framebuffer;
|
||||
using SM2D.Scene;
|
||||
|
||||
namespace SM_TEST
|
||||
{
|
||||
public class TestRenderPipeline : RenderPipeline
|
||||
{
|
||||
private BloomEffect _bloom;
|
||||
private Framebuffer _postBuffer;
|
||||
|
||||
public override void Initialization()
|
||||
{
|
||||
_bloom = new BloomEffect(hdr: true)
|
||||
|
||||
MainFramebuffer = CreateWindowFramebuffer(0);
|
||||
|
||||
_postBuffer = CreateWindowFramebuffer();
|
||||
Framebuffers.Add(_postBuffer);
|
||||
_bloom = new BloomEffect(MainFramebuffer, hdr: true, .5f)
|
||||
{
|
||||
Threshold = .5f,
|
||||
};
|
||||
|
||||
MainFramebuffer = CreateWindowFramebuffer();
|
||||
|
||||
_bloom.Initilize(this);
|
||||
base.Initialization();
|
||||
|
|
@ -32,11 +32,11 @@ namespace SM_TEST
|
|||
MainFramebuffer.Activate(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
|
||||
context.Scene.DrawBackground(context);
|
||||
context.Scene.DrawMainObjects(context);
|
||||
|
||||
context.Scene.DrawHUD(context);
|
||||
|
||||
Framebuffer.Screen.Activate(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
|
||||
_bloom.Draw(context);
|
||||
|
||||
context.Scene.DrawHUD(context);
|
||||
context.Scene.DrawDebug(context);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue