Removed most files, began rewriting program, shader, globject

hexworld/HexRender.cs

@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Diamond.Render;
 using Diamond.Shaders;
-using Diamond.Textures;
 using Diamond.Util;
 using Newtonsoft.Json.Linq;
 using OpenTK;
@@ -15,142 +13,31 @@ namespace hexworld
 {
     public class HexRender : GameWindow
     {
-        #region Fields
-
-        #region Disposables
-
-        private Program _texPgm;
-
-        private Texture _doorTex;
-        private Texture _grassTex;
-        private Texture _stoneTex;
-
-        private Dictionary<string, VertexBuffer<ObjVertex>> _meshVbos;
-        private VertexBuffer<TileData>[] _tileVbos;
-
-        protected override void OnClosed(EventArgs e)
-        {
-            _texPgm?.Dispose();
-
-            _doorTex?.Dispose();
-            _grassTex?.Dispose();
-            _stoneTex?.Dispose();
-
-            foreach (var vbo in _meshVbos.Values)
-                vbo?.Dispose();
-
-            foreach (var vbo in _tileVbos)
-                vbo?.Dispose();
-        }
-
-        #endregion
-
-        private List<RenderGroup<TileData, ObjVertex>> _renderGroups;
-
-        private Camera _camera;
-
-        private double _time;
-
-        #endregion
-
         public HexRender(int width, int height)
             : base(width, height, new GraphicsMode(32, 24, 0, 0))
         {
             Width = width;
-            Height = Height;
+            Height = height;
             X = (DisplayDevice.Default.Width - Width) / 2;
             Y = (DisplayDevice.Default.Height - Height) / 2;
         }
 
+        private Program _pgm;
+
+        /// <inheritdoc />
+        protected override void OnUnload(EventArgs e)
+        {
+            base.OnUnload(e);
+
+            _pgm.Dispose();
+        }
+
+        /// <inheritdoc />
         protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
 
-            _texPgm = Program.FromFiles("res/obj.vs.glsl", "res/obj.fs.glsl");
-
-            _doorTex = Texture.FromFile("res/door.png");
-            _grassTex = Texture.FromFile("res/grass.png");
-            _stoneTex = Texture.FromFile("res/stone.png");
-
-            var dir = "res";
-
-            var json = JObject.Parse(File.ReadAllText("res/level.json"));
-
-            var allTiles = json["tiles"]
-                .GroupBy(ti => ti["tex"])
-                .Select(g => g
-                    .Select(ti => ti["pos"])
-                    .Select(pos => pos.ToObject<Vector3>())
-                    .Select(pos => new TileData(pos))
-                    .ToArray())
-                .Select(arr => new SubArray<TileData>(arr))
-                .ToArray();
-
-            _tileVbos = VertexBuffer.FromArrays(allTiles, 0, "tiles");
-
-            var vertexBuffers = json["models"]
-                .Select(path => (string) path)
-                .Select(path => Path.Combine(dir, path))
-                .Select(VertexBuffer.FromWavefront)
-                .SelectMany(meshes => meshes)
-                .ToArray();
-
-            _meshVbos = vertexBuffers.ToDictionary(vbo => vbo.Name, vbo => vbo);
-
-            _camera = new Camera();
-
-            _renderGroups = new List<RenderGroup<TileData, ObjVertex>>
-            {
-                new RenderGroup<TileData, ObjVertex>()
-                {
-                    Vertices = _meshVbos["Cube"],
-                    Instance = _tileVbos[0],
-                    Program = _texPgm,
-                    Texture = _stoneTex,
-                    Camera = _camera,
-                },
-                new RenderGroup<TileData, ObjVertex>()
-                {
-                    Vertices = _meshVbos["Cube"],
-                    Instance = _tileVbos[1],
-                    Program = _texPgm,
-                    Texture = _grassTex,
-                    Camera = _camera,
-                }
-            };
-        }
-
-        protected override void OnUpdateFrame(FrameEventArgs e)
-        {
-            base.OnUpdateFrame(e);
-
-            _time += e.Time;
-
-            _camera.View = Matrix4.CreateRotationZ((float) _time / 3) *
-                           Matrix4.LookAt(10 * Vector3.One, Vector3.Zero, Vector3.UnitZ);
-            _camera.Projection = Matrix4.CreateOrthographic(Width / 100f, Height / 100f, -100, 100);
-        }
-
-        protected override void OnRenderFrame(FrameEventArgs e)
-        {
-            base.OnRenderFrame(e);
-
-            GL.Viewport(ClientRectangle);
-
-            GL.ClearColor(0.2392157F, 0.5607843F, 0.9960784F, 1f);
-            GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit);
-
-            GL.Enable(EnableCap.DepthTest);
-            GL.DepthFunc(DepthFunction.Lequal);
-            GL.Enable(EnableCap.Blend);
-            GL.BlendFunc(BlendingFactorSrc.SrcAlpha, BlendingFactorDest.OneMinusSrcAlpha);
-
-            foreach (var renderGroup in _renderGroups)
-            {
-                renderGroup.Draw();
-            }
-
-            SwapBuffers();
+            _pgm = Program.FromFiles("res/obj.fs.glsl", "res/obj.vs.glsl");
         }
     }
 }