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

Switch manual shader dispose to using statement

Browse Source
This commit is contained in:
David Allemang
2017-03-11 15:21:13 -05:00
parent 93d138623d
commit 2b48366c0a
1 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
hexworld/HexRender.cs
View File

@@ -33,44 +33,42 @@ namespace hexworld
{ {
base.OnLoad(e); base.OnLoad(e);
var vs = Shader.FromFile("res/direct.vs.glsl"); using (var vs = Shader.FromFile("res/direct.vs.glsl"))
var red = Shader.FromFile("res/red.fs.glsl"); using (var red = Shader.FromFile("res/red.fs.glsl"))
var white = Shader.FromFile("res/white.fs.glsl"); using (var white = Shader.FromFile("res/white.fs.glsl"))
_whitePgm = Program.FromShaders(vs, red);
_redPgm = Program.FromShaders(vs, white);
_triVbo = Buffer.FromData(new float[]
{ {
-.8f, -.8f, _whitePgm = Program.FromShaders(vs, red);
+.8f, -.8f, _redPgm = Program.FromShaders(vs, white);
+.0f, +.8f
});
_triVao = GL.GenVertexArray();
GL.BindVertexArray(_triVao);
Program.Current = _redPgm;
Buffer.ArrayBuffer = _triVbo;
GL.EnableVertexAttribArray(0);
GL.VertexAttribPointer(0, 2, VertexAttribPointerType.Float, false, 0, 0);
_recVbo = Buffer.FromData(new float[] _triVbo = Buffer.FromData(new float[]
{ {
-.9f, -.5f, -.8f, -.8f,
+.9f, -.5f, +.8f, -.8f,
+.9f, +.5f, +.0f, +.8f
+.9f, +.5f, });
-.9f, +.5f, _triVao = GL.GenVertexArray();
-.9f, -.5f, GL.BindVertexArray(_triVao);
}); Program.Current = _redPgm;
_recVao = GL.GenVertexArray(); Buffer.ArrayBuffer = _triVbo;
GL.BindVertexArray(_recVao); GL.EnableVertexAttribArray(0);
Program.Current = _whitePgm; GL.VertexAttribPointer(0, 2, VertexAttribPointerType.Float, false, 0, 0);
Buffer.ArrayBuffer = _recVbo;
GL.EnableVertexAttribArray(0);
GL.VertexAttribPointer(0, 2, VertexAttribPointerType.Float, false, 0, 0);
vs?.Dispose(); _recVbo = Buffer.FromData(new float[]
red?.Dispose(); {
white?.Dispose(); -.9f, -.5f,
+.9f, -.5f,
+.9f, +.5f,
+.9f, +.5f,
-.9f, +.5f,
-.9f, -.5f,
});
_recVao = GL.GenVertexArray();
GL.BindVertexArray(_recVao);
Program.Current = _whitePgm;
Buffer.ArrayBuffer = _recVbo;
GL.EnableVertexAttribArray(0);
GL.VertexAttribPointer(0, 2, VertexAttribPointerType.Float, false, 0, 0);
}
} }
/// <inheritdoc /> /// <inheritdoc />