Removed unneeded usings

Diamond/Buffers/GLBuffer.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 using OpenTK.Graphics.OpenGL4;
 
 namespace Diamond.Buffers

Diamond/Buffers/SubArray.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Drawing.Drawing2D;
 using System.Linq;
-using OpenTK.Graphics.ES20;
 
 namespace Diamond.Buffers
 {

Diamond/Buffers/VertexDataAttribute.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Diamond.Buffers
 {

Diamond/Diamond.csproj

@@ -30,6 +30,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="OpenTK, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
       <HintPath>..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll</HintPath>
     </Reference>
@@ -48,6 +51,7 @@
     <Compile Include="Buffers\SubArray.cs" />
     <Compile Include="Buffers\VertexDataAttribute.cs" />
     <Compile Include="GLObject.cs" />
+    <Compile Include="Mesh.cs" />
     <Compile Include="Shaders\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Shaders\Shader.cs" />

Diamond/GLObject.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using OpenTK.Graphics;
-using OpenTK.Graphics.OpenGL;
 
 namespace Diamond
 {

Diamond/Mesh.cs

@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
-using System.Threading.Tasks;
 using Diamond.Buffers;
-using Diamond.Shaders;
 using Newtonsoft.Json;
 using OpenTK.Graphics.OpenGL4;
 
-namespace hexworld
+namespace Diamond
 {
     public class Mesh<T> where T : struct
     {
@@ -67,6 +62,7 @@ namespace hexworld
             return new Mesh<T>(vertices);
         }
 
+        //todo add fromObj
 
         public static T[] Join<T>(params Mesh<T>[] meshes) where T : struct => Join((IEnumerable<Mesh<T>>) meshes);
 

Diamond/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

Diamond/Shaders/Program.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
+using System.Collections.Generic;
 using System.Text;
 using Diamond.Buffers;
 using OpenTK.Graphics.OpenGL4;

Diamond/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
   <package id="OpenTK" version="2.0.0" targetFramework="net452" />
 </packages>

hexworld/Driver.cs

@@ -1,15 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Diamond.Buffers;
-using Newtonsoft.Json;
-using OpenTK;
-
-namespace hexworld
+namespace hexworld
 {
     public class Driver
     {

hexworld/HexRender.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
+using Diamond;
 using Diamond.Buffers;
 using Diamond.Shaders;
 using Diamond.Textures;

hexworld/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

hexworld/hexworld.csproj

@@ -51,7 +51,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Mesh.cs" />
     <Compile Include="Tile.cs" />
     <Compile Include="Vertex.cs" />
     <Compile Include="HexRender.cs" />
@@ -86,6 +85,7 @@
     <None Include="res\data_tile_grass.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="res\sides.obj" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="res\grass.png">