me/Diamond
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GLObject implements IDisposable

Browse Source
This commit is contained in:
David Allemang
2017-02-26 00:33:29 -05:00
parent b30f79acda
commit ce3b5cce6c
6 changed files with 102 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
hexworld/HexRender.cs
View File

@@ -15,19 +15,19 @@ namespace hexworld
{
public partial class HexRender : GameWindow
{
private Program pgm;
private Program _pgm;
// todo: generate texture atlas
// or at least embed sub-uvs and materials into json
private Texture grass;
private Texture _grass;
private Texture stone;
private Texture _stone;
private Matrix4 view;
private Matrix4 proj;
private Matrix4 _view;
private Matrix4 _proj;
private VBO<Tile> tileVbo;
private VBO<Vertex> cubeVbo;
private VBO<Tile> _tileVbo;
private VBO<Vertex> _cubeVbo;
public HexRender(int width, int height)
: base(width, height, new GraphicsMode(32, 24, 0, 0))
@@ -38,23 +38,23 @@ namespace hexworld
Y = (DisplayDevice.Default.Height - Height) / 2;
}
private double t;
private double _t;
protected override void OnUpdateFrame(FrameEventArgs e)
{
base.OnUpdateFrame(e);
t += e.Time;
_t += e.Time;
view = Matrix4.LookAt(10 * Vector3.One, Vector3.Zero, Vector3.UnitZ);
proj = Matrix4.CreateOrthographic(Width / 100f, Height / 100f, -100, 100);
_view = Matrix4.LookAt(10 * Vector3.One, Vector3.Zero, Vector3.UnitZ);
_proj = Matrix4.CreateOrthographic(Width / 100f, Height / 100f, -100, 100);
for (var i = 0; i < 16; i++)
{
var ti = tiles[i];
tiles[i].Position.Z = (float) (Math.Sin((t + ti.Position.X - ti.Position.Y / 1.5) / 1.5) * .25);
tiles[i].Position.Z = (float) (Math.Sin((_t + ti.Position.X - ti.Position.Y / 1.5) / 1.5) * .25);
}
tileVbo.Bind();
_tileVbo.Bind();
GL.BufferSubData(BufferTarget.ArrayBuffer, (IntPtr) (0), (IntPtr) (16 * 3 * sizeof(float)), tiles);
VBO.Unbind();
}
@@ -63,44 +63,59 @@ namespace hexworld
{
base.OnLoad(e);
cubeVbo = new VBO<Vertex>();
cubeVbo.Data(cubeVerts, BufferUsageHint.StaticDraw);
_cubeVbo = new VBO<Vertex>();
_cubeVbo.Data(cubeVerts, BufferUsageHint.StaticDraw);
tileVbo = new VBO<Tile>();
tileVbo.Data(tiles, BufferUsageHint.DynamicDraw);
_tileVbo = new VBO<Tile>();
_tileVbo.Data(tiles, BufferUsageHint.DynamicDraw);
var vs = Shader.FromFile("s.vs.glsl", ShaderType.VertexShader);
var fs = Shader.FromFile("s.fs.glsl", ShaderType.FragmentShader);
pgm = Program.FromShaders(vs, fs);
if (!vs.Compiled | !fs.Compiled)
using (var vs = Shader.FromFile("s.vs.glsl", ShaderType.VertexShader))
using (var fs = Shader.FromFile("s.fs.glsl", ShaderType.FragmentShader))
{
Console.Out.WriteLine("Failed to compile shaders:");
if (!vs.Compiled)
Console.Out.WriteLine("Vertex Shader:\n" + vs.Log.Trim());
if (!fs.Compiled)
Console.Out.WriteLine("Fragment Shader:\n" + fs.Log.Trim());
Console.Out.WriteLine("Press any key to exit.");
Console.ReadKey();
Exit();
return;
_pgm = Program.FromShaders(vs, fs);
if (!vs.Compiled | !fs.Compiled)
{
Console.Out.WriteLine("Failed to compile shaders:");
if (!vs.Compiled)
Console.Out.WriteLine("Vertex Shader:\n" + vs.Log.Trim());
if (!fs.Compiled)
Console.Out.WriteLine("Fragment Shader:\n" + fs.Log.Trim());
Console.Out.WriteLine("Press any key to exit.");
Console.ReadKey();
Exit();
return;
}
}
if (!pgm.LinkStatus)
if (!_pgm.LinkStatus)
{
Console.Out.WriteLine("Failed to link program:");
Console.Out.WriteLine(pgm.Log.Trim());
Console.Out.WriteLine(_pgm.Log.Trim());
Console.Out.WriteLine("Press any key to exit.");
Console.ReadKey();
Exit();
return;
}
cubeVbo.AttribPointers(pgm);
tileVbo.AttribPointers(pgm);
_cubeVbo.AttribPointers(_pgm);
_tileVbo.AttribPointers(_pgm);
grass = Texture.FromBitmap(new Bitmap("grass.png"));
stone = Texture.FromBitmap(new Bitmap("stone.png"));
_grass = Texture.FromBitmap(new Bitmap("grass.png"));
_stone = Texture.FromBitmap(new Bitmap("stone.png"));
}
protected override void OnClosed(EventArgs e)
{
base.OnClosed(e);
_pgm.Dispose();
_grass.Dispose();
_stone.Dispose();
_tileVbo.Dispose();
_cubeVbo.Dispose();
}
protected override void OnRenderFrame(FrameEventArgs e)
@@ -119,25 +134,25 @@ namespace hexworld
GL.Enable(EnableCap.CullFace);
GL.CullFace(CullFaceMode.Back);
pgm.Use();
pgm.EnableAllAttribArrays();
_pgm.Use();
_pgm.EnableAllAttribArrays();
grass.Bind(0);
stone.Bind(1);
_grass.Bind(0);
_stone.Bind(1);
GL.Uniform1(pgm.GetUniform("tex"), 0);
GL.UniformMatrix4(pgm.GetUniform("view"), false, ref view);
GL.UniformMatrix4(pgm.GetUniform("proj"), false, ref proj);
GL.Uniform1(_pgm.GetUniform("tex"), 0);
GL.UniformMatrix4(_pgm.GetUniform("view"), false, ref _view);
GL.UniformMatrix4(_pgm.GetUniform("proj"), false, ref _proj);
GL.DrawArraysInstancedBaseInstance(PrimitiveType.Triangles, 0, 36, 16, 0);
GL.Uniform1(pgm.GetUniform("tex"), 1);
GL.UniformMatrix4(pgm.GetUniform("view"), false, ref view);
GL.UniformMatrix4(pgm.GetUniform("proj"), false, ref proj);
GL.Uniform1(_pgm.GetUniform("tex"), 1);
GL.UniformMatrix4(_pgm.GetUniform("view"), false, ref _view);
GL.UniformMatrix4(_pgm.GetUniform("proj"), false, ref _proj);
GL.DrawArraysInstancedBaseInstance(PrimitiveType.Triangles, 0, 36, 5, 16);
pgm.DisableAllAttribArrays();
_pgm.DisableAllAttribArrays();
SwapBuffers();
}

18
hexworld/Util/GLObject.cs
View File

@@ -7,7 +7,7 @@ using OpenTK.Graphics.OpenGL4;
namespace hexworld.Util
{
public abstract class GLObject
public abstract class GLObject : IDisposable
{
public uint Id { get; protected set; }
@@ -16,6 +16,22 @@ namespace hexworld.Util
Id = id;
}
protected abstract void Delete();
private bool _disposed = false;
public void Dispose()
{
if (_disposed) return;
_disposed = true;
Delete();
GC.SuppressFinalize(this);
}
~GLObject()
{
Dispose();
}
public static explicit operator uint(GLObject o) => o.Id;
public static explicit operator int(GLObject o) => (int) o.Id;
}

5
hexworld/Util/Program.cs
View File

@@ -17,6 +17,11 @@ namespace hexworld.Util
{
}
protected override void Delete()
{
GL.DeleteProgram(Id);
}
public void Attach(Shader shader) => GL.AttachShader(Id, shader.Id);
public bool LinkStatus

8
hexworld/Util/Shader.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -39,6 +40,11 @@ namespace hexworld.Util
Type = type;
}
protected override void Delete()
{
GL.DeleteShader(Id);
}
public bool Compile()
{
GL.CompileShader(Id);

5
hexworld/Util/Texture.cs
View File

@@ -22,6 +22,11 @@ namespace hexworld.Util
Target = target;
}
protected override void Delete()
{
GL.DeleteTexture(Id);
}
public void Bind()
{
GL.BindTexture(Target, Id);

5
hexworld/Util/VBO.cs
View File

@@ -23,6 +23,11 @@ namespace hexworld.Util
{
}
protected override void Delete()
{
GL.DeleteBuffer(Id);
}
public void Bind()
{
GL.BindBuffer(BufferTarget.ArrayBuffer, Id);