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

Changed type names to be more appropriate

Browse Source
This commit is contained in:
David Allemang
2017-03-01 02:45:27 -05:00
parent 3de77f9ad6
commit 4d69119f40
13 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Diamond/Buffers/GLBuffer.cs → Diamond/Buffers/Buffer.cs
View File

@@ -8,11 +8,11 @@ using OpenTK.Graphics.OpenGL4;
namespace Diamond.Buffers
{
public class GLBuffer<T> : GLObject where T : struct
public class Buffer<T> : GLObject where T : struct
{
private readonly GLBufferWrapper _buffer;
private readonly BufferWrap _buffer;
private readonly VertexDataInfo _vdi;
internal override GLWrapper Wrapper => _buffer;
internal override Wrapper Wrapper => _buffer;
private readonly int _size;
@@ -24,7 +24,7 @@ namespace Diamond.Buffers
set => _buffer.Usage = value;
}
internal GLBuffer(GLBufferWrapper buffer, string name)
internal Buffer(BufferWrap buffer, string name)
{
_buffer = buffer;
Name = name;
@@ -63,18 +63,18 @@ namespace Diamond.Buffers
{
internal static readonly Logger Logger = LogManager.GetCurrentClassLogger();
public static GLBuffer<T> Empty<T>(BufferTarget target, BufferUsageHint usage = BufferUsageHint.StaticDraw,
public static Buffer<T> Empty<T>(BufferTarget target, BufferUsageHint usage = BufferUsageHint.StaticDraw,
string name = null) where T : struct
{
var wrapper = new GLBufferWrapper(target, usage);
var service = new GLBuffer<T>(wrapper, name);
var wrapper = new BufferWrap(target, usage);
var service = new Buffer<T>(wrapper, name);
Logger.Debug("Created {0}", service);
return service;
}
public static GLBuffer<T> FromData<T>(T[] data, BufferTarget target,
public static Buffer<T> FromData<T>(T[] data, BufferTarget target,
BufferUsageHint usage = BufferUsageHint.StaticDraw,
string name = null) where T : struct
{

12
Diamond/Diamond.csproj
View File

@@ -51,15 +51,15 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Buffers\GLBuffer.cs" />
<Compile Include="Wrappers\GLBufferWrapper.cs" />
<Compile Include="Buffers\Buffer.cs" />
<Compile Include="Wrappers\BufferWrap.cs" />
<Compile Include="GLObject.cs" />
<Compile Include="Wrappers\ProgramWrapper.cs" />
<Compile Include="Wrappers\ShaderWrapper.cs" />
<Compile Include="Wrappers\TextureWrapper.cs" />
<Compile Include="Wrappers\ProgramWrap.cs" />
<Compile Include="Wrappers\ShaderWrap.cs" />
<Compile Include="Wrappers\TextureWrap.cs" />
<Compile Include="Util\SubArray.cs" />
<Compile Include="Buffers\VertexDataAttribute.cs" />
<Compile Include="Wrappers\GLWrapper.cs" />
<Compile Include="Wrappers\Wrapper.cs" />
<Compile Include="Level\TileData.cs" />
<Compile Include="Util\Mesh.cs" />
<Compile Include="Util\ObjVertex.cs" />

2
Diamond/GLObject.cs
View File

@@ -12,7 +12,7 @@ namespace Diamond
public string Name { get; protected set; } = "GLObject";
internal abstract GLWrapper Wrapper { get; }
internal abstract Wrapper Wrapper { get; }
public int Id => Wrapper.Id;
protected virtual void Dispose(bool disposing)

4
Diamond/NLog.config
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLogger.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLogger.xsd NLogger.xsd"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLogger.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLoggerLevel="Off" internalLoggerFile="c:\temp\nlog-internal.log">
@@ -9,7 +9,7 @@
<variable name="Layout" value="[${level}] ${logger}: ${message}" />
<targets>
<target xsi:type="File" name="file" fileName="${basedir}/Logger/${shortdate}.log"
<target xsi:type="File" name="file" fileName="$Log/${shortdate}.log"
layout="${Layout}"/>
<target xsi:type="Debugger" name="debug" layout="${Layout}"/>
</targets>

10
Diamond/Shaders/Program.cs
View File

@@ -10,8 +10,8 @@ namespace Diamond.Shaders
{
internal static readonly Logger Logger = LogManager.GetCurrentClassLogger();
internal ProgramWrapper _program;
internal override GLWrapper Wrapper => _program;
internal ProgramWrap _program;
internal override Wrapper Wrapper => _program;
public static Program Current { get; private set; }
@@ -19,7 +19,7 @@ namespace Diamond.Shaders
private readonly Dictionary<string, int> _uniforms = new Dictionary<string, int>();
private readonly Dictionary<string, int> _attributes = new Dictionary<string, int>();
internal Program(ProgramWrapper program, string name)
internal Program(ProgramWrap program, string name)
{
_program = program;
Name = name;
@@ -74,7 +74,7 @@ namespace Diamond.Shaders
private void Attach(Shader shader)
{
_shaders.Add(shader);
_program.Attach((ShaderWrapper) shader.Wrapper);
_program.Attach((ShaderWrap) shader.Wrapper);
}
public override string ToString() => $"Program \'{Name}\' ({Id})";
@@ -100,7 +100,7 @@ namespace Diamond.Shaders
return null;
}
var wrapper = new ProgramWrapper();
var wrapper = new ProgramWrap();
var service = new Program(wrapper, name);
Logger.Debug("Created {0}", service);

8
Diamond/Shaders/Shader.cs
View File

@@ -10,13 +10,13 @@ namespace Diamond.Shaders
{
internal static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly ShaderWrapper _shader;
internal override GLWrapper Wrapper => _shader;
private readonly ShaderWrap _shader;
internal override Wrapper Wrapper => _shader;
public string Source { get; }
public ShaderType Type { get; }
internal Shader(ShaderWrapper shader, string source, ShaderType type, string name)
internal Shader(ShaderWrap shader, string source, ShaderType type, string name)
{
_shader = shader;
Source = source;
@@ -38,7 +38,7 @@ namespace Diamond.Shaders
public static Shader FromSource(string source, ShaderType type, string name = "Shader")
{
var wrapper = new ShaderWrapper(type);
var wrapper = new ShaderWrap(type);
var service = new Shader(wrapper, source, type, name);
Logger.Debug("Created {0}", service);

8
Diamond/Textures/Texture.cs
View File

@@ -11,10 +11,10 @@ namespace Diamond.Textures
{
internal static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly TextureWrapper _texture;
internal override GLWrapper Wrapper => _texture;
private readonly TextureWrap _texture;
internal override Wrapper Wrapper => _texture;
internal Texture(TextureWrapper wrapper, string name)
internal Texture(TextureWrap wrapper, string name)
{
_texture = wrapper;
Name = name;
@@ -29,7 +29,7 @@ namespace Diamond.Textures
public static Texture FromBitmap(Bitmap bmp, string name = null)
{
var wrapper= new TextureWrapper(TextureTarget.Texture2D);
var wrapper= new TextureWrap(TextureTarget.Texture2D);
var service = new Texture(wrapper, null);
Logger.Debug("Created texture {0}", service);

4
Diamond/Wrappers/GLBufferWrapper.cs → Diamond/Wrappers/BufferWrap.cs
View File

@@ -3,12 +3,12 @@ using OpenTK.Graphics.OpenGL4;
namespace Diamond.Wrappers
{
internal class GLBufferWrapper : GLWrapper
internal class BufferWrap : Wrapper
{
public BufferTarget Target { get; }
public BufferUsageHint Usage { get; set; }
internal GLBufferWrapper(BufferTarget target, BufferUsageHint usage)
internal BufferWrap(BufferTarget target, BufferUsageHint usage)
{
Id = GL.GenBuffer();
Target = target;

6
Diamond/Wrappers/ProgramWrapper.cs → Diamond/Wrappers/ProgramWrap.cs
View File

@@ -3,9 +3,9 @@ using OpenTK.Graphics.OpenGL4;
namespace Diamond.Wrappers
{
internal class ProgramWrapper : GLWrapper
internal class ProgramWrap : Wrapper
{
internal ProgramWrapper()
internal ProgramWrap()
{
Id = GL.CreateProgram();
}
@@ -23,7 +23,7 @@ namespace Diamond.Wrappers
public void Link() => GL.LinkProgram(Id);
public string InfoLog => GL.GetProgramInfoLog(Id).Trim();
public void Attach(ShaderWrapper shader) => GL.AttachShader(Id, shader.Id);
public void Attach(ShaderWrap shader) => GL.AttachShader(Id, shader.Id);
public void Use() => GL.UseProgram(Id);

4
Diamond/Wrappers/ShaderWrapper.cs → Diamond/Wrappers/ShaderWrap.cs
View File

@@ -3,9 +3,9 @@ using OpenTK.Graphics.OpenGL4;
namespace Diamond.Wrappers
{
internal sealed class ShaderWrapper : GLWrapper
internal sealed class ShaderWrap : Wrapper
{
internal ShaderWrapper(ShaderType shaderType)
internal ShaderWrap(ShaderType shaderType)
{
Id = GL.CreateShader(shaderType);
ShaderType = shaderType;

4
Diamond/Wrappers/TextureWrapper.cs → Diamond/Wrappers/TextureWrap.cs
View File

@@ -3,9 +3,9 @@ using OpenTK.Graphics.OpenGL4;
namespace Diamond.Wrappers
{
internal class TextureWrapper : GLWrapper
internal class TextureWrap : Wrapper
{
internal TextureWrapper(TextureTarget target)
internal TextureWrap(TextureTarget target)
{
Id = GL.GenTexture();
Target = target;

8
Diamond/Wrappers/GLWrapper.cs → Diamond/Wrappers/Wrapper.cs
View File

@@ -4,15 +4,15 @@ using OpenTK.Graphics;
namespace Diamond.Wrappers
{
internal abstract class GLWrapper : IDisposable
internal abstract class Wrapper : IDisposable
{
private static Logger Logger = LogManager.GetCurrentClassLogger();
private static readonly Logger Logger = LogManager.GetLogger("OpenGL Wrapper");
public int Id { get; protected set; }
public override string ToString() => $"{GetType().Name} {Id}";
public static explicit operator int(GLWrapper o) => o.Id;
public static explicit operator int(Wrapper o) => o.Id;
#region IDisposable
@@ -43,7 +43,7 @@ namespace Diamond.Wrappers
GC.SuppressFinalize(this);
}
~GLWrapper()
~Wrapper()
{
Dispose(false);
}

6
hexworld/HexRender.cs
View File

@@ -1,7 +1,6 @@
using System;
using System.IO;
using System.Linq;
using Diamond;
using Diamond.Buffers;
using Diamond.Level;
using Diamond.Shaders;
@@ -25,8 +24,8 @@ namespace hexworld
private Texture _doorTex;
private Texture _grassTex;
private GLBuffer<ObjVertex> _meshBuffer;
private GLBuffer<TileData> _tileBuffer;
private Buffer<ObjVertex> _meshBuffer;
private Buffer<TileData> _tileBuffer;
protected override void OnClosed(EventArgs e)
{
@@ -53,7 +52,6 @@ namespace hexworld
#endregion
public HexRender(int width, int height)
: base(width, height, new GraphicsMode(32, 24, 0, 0))
{