diff --git a/Diamond/Buffers/Buffer.cs b/Diamond/Buffers/Buffer.cs index 3f8b037..28142c2 100644 --- a/Diamond/Buffers/Buffer.cs +++ b/Diamond/Buffers/Buffer.cs @@ -3,7 +3,6 @@ using System.Runtime.InteropServices; using Diamond.Shaders; using Diamond.Util; using Diamond.Wrappers; -using NLog; using OpenTK.Graphics.OpenGL4; namespace Diamond.Buffers diff --git a/Diamond/GLObject.cs b/Diamond/GLObject.cs index e520130..79ba886 100644 --- a/Diamond/GLObject.cs +++ b/Diamond/GLObject.cs @@ -1,5 +1,4 @@ using System; -using Diamond.Wrappers; using NLog; namespace Diamond diff --git a/Diamond/Render/Camera.cs b/Diamond/Render/Camera.cs index d41dae3..b33716b 100644 --- a/Diamond/Render/Camera.cs +++ b/Diamond/Render/Camera.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using OpenTK; +using OpenTK; namespace Diamond.Render { diff --git a/Diamond/Render/RenderGroup.cs b/Diamond/Render/RenderGroup.cs index 0c250d8..4a40e26 100644 --- a/Diamond/Render/RenderGroup.cs +++ b/Diamond/Render/RenderGroup.cs @@ -1,7 +1,5 @@ -using Diamond.Buffers; -using Diamond.Shaders; +using Diamond.Shaders; using Diamond.Textures; -using Diamond.Util; using OpenTK.Graphics.OpenGL4; namespace Diamond.Render diff --git a/Diamond/Shaders/Program.cs b/Diamond/Shaders/Program.cs index cec6a77..86f990e 100644 --- a/Diamond/Shaders/Program.cs +++ b/Diamond/Shaders/Program.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.Linq; using Diamond.Wrappers; -using NLog; using OpenTK.Graphics.OpenGL4; namespace Diamond.Shaders diff --git a/Diamond/Shaders/Shader.cs b/Diamond/Shaders/Shader.cs index d872b01..81f96e7 100644 --- a/Diamond/Shaders/Shader.cs +++ b/Diamond/Shaders/Shader.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using System.IO; using Diamond.Wrappers; -using NLog; using OpenTK.Graphics.OpenGL4; namespace Diamond.Shaders diff --git a/Diamond/Textures/Texture.cs b/Diamond/Textures/Texture.cs index 43ac59d..869554c 100644 --- a/Diamond/Textures/Texture.cs +++ b/Diamond/Textures/Texture.cs @@ -2,7 +2,6 @@ using System.Drawing.Imaging; using System.IO; using Diamond.Wrappers; -using NLog; using OpenTK.Graphics.OpenGL4; using PixelFormat = OpenTK.Graphics.OpenGL4.PixelFormat; diff --git a/Diamond/Util/SubArray.cs b/Diamond/Util/SubArray.cs index 066a3a9..6f3cb79 100644 --- a/Diamond/Util/SubArray.cs +++ b/Diamond/Util/SubArray.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; namespace Diamond.Util { diff --git a/Diamond/Wrappers/BufferWrap.cs b/Diamond/Wrappers/BufferWrap.cs index a508b0d..ba924d5 100644 --- a/Diamond/Wrappers/BufferWrap.cs +++ b/Diamond/Wrappers/BufferWrap.cs @@ -37,6 +37,10 @@ namespace Diamond.Wrappers #endregion + #endregion + + #region Methods + /// /// Binds this buffer (glBindBuffer) /// @@ -51,7 +55,7 @@ namespace Diamond.Wrappers public void Data(int size, T[] data) where T : struct { Bind(); - GL.BufferData(Target, (IntPtr) (size * data.Length), data, Usage); + GL.BufferData(Target, (IntPtr)(size * data.Length), data, Usage); } /// @@ -65,7 +69,7 @@ namespace Diamond.Wrappers public void SubData(int size, int offset, int count, T[] data) where T : struct { Bind(); - GL.BufferSubData(Target, (IntPtr) (offset * size), (IntPtr) (count * size), data); + GL.BufferSubData(Target, (IntPtr)(offset * size), (IntPtr)(count * size), data); } #endregion diff --git a/hexworld/HexRender.cs b/hexworld/HexRender.cs index 9e6e3b7..c1dc8ab 100644 --- a/hexworld/HexRender.cs +++ b/hexworld/HexRender.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Diamond.Buffers; using Diamond.Render; using Diamond.Shaders; using Diamond.Textures; @@ -11,7 +10,6 @@ using Newtonsoft.Json.Linq; using OpenTK; using OpenTK.Graphics; using OpenTK.Graphics.OpenGL4; -using Buffer = Diamond.Buffers.Buffer; namespace hexworld {