diff --git a/Diamond/Buffers/GLBuffer.cs b/Diamond/Buffers/GLBuffer.cs
index d0de5d1..1b0b9da 100644
--- a/Diamond/Buffers/GLBuffer.cs
+++ b/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
diff --git a/Diamond/Buffers/SubArray.cs b/Diamond/Buffers/SubArray.cs
index 05228b8..b793884 100644
--- a/Diamond/Buffers/SubArray.cs
+++ b/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
{
diff --git a/Diamond/Buffers/VertexDataAttribute.cs b/Diamond/Buffers/VertexDataAttribute.cs
index de0d010..a12c109 100644
--- a/Diamond/Buffers/VertexDataAttribute.cs
+++ b/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
{
diff --git a/Diamond/Diamond.csproj b/Diamond/Diamond.csproj
index e1c428f..df4ecf8 100644
--- a/Diamond/Diamond.csproj
+++ b/Diamond/Diamond.csproj
@@ -30,6 +30,9 @@
4
+
+ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
+
..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll
@@ -48,6 +51,7 @@
+
diff --git a/Diamond/GLObject.cs b/Diamond/GLObject.cs
index ab3d62a..d8fb81f 100644
--- a/Diamond/GLObject.cs
+++ b/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
{
diff --git a/hexworld/Mesh.cs b/Diamond/Mesh.cs
similarity index 91%
rename from hexworld/Mesh.cs
rename to Diamond/Mesh.cs
index 5459da9..68af24b 100644
--- a/hexworld/Mesh.cs
+++ b/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 where T : struct
{
@@ -67,6 +62,7 @@ namespace hexworld
return new Mesh(vertices);
}
+ //todo add fromObj
public static T[] Join(params Mesh[] meshes) where T : struct => Join((IEnumerable>) meshes);
diff --git a/Diamond/Properties/AssemblyInfo.cs b/Diamond/Properties/AssemblyInfo.cs
index 4d0cd71..b613032 100644
--- a/Diamond/Properties/AssemblyInfo.cs
+++ b/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
diff --git a/Diamond/Shaders/Program.cs b/Diamond/Shaders/Program.cs
index 92f0831..bf51710 100644
--- a/Diamond/Shaders/Program.cs
+++ b/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;
diff --git a/Diamond/packages.config b/Diamond/packages.config
index 74325d8..dfa0316 100644
--- a/Diamond/packages.config
+++ b/Diamond/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file
diff --git a/hexworld/Driver.cs b/hexworld/Driver.cs
index dc52878..d65bf39 100644
--- a/hexworld/Driver.cs
+++ b/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
{
diff --git a/hexworld/HexRender.cs b/hexworld/HexRender.cs
index 0709a42..bcf4b98 100644
--- a/hexworld/HexRender.cs
+++ b/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;
diff --git a/hexworld/Properties/AssemblyInfo.cs b/hexworld/Properties/AssemblyInfo.cs
index df4a9be..64023ef 100644
--- a/hexworld/Properties/AssemblyInfo.cs
+++ b/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
diff --git a/hexworld/hexworld.csproj b/hexworld/hexworld.csproj
index 2d33d93..eb97775 100644
--- a/hexworld/hexworld.csproj
+++ b/hexworld/hexworld.csproj
@@ -51,7 +51,6 @@
-
@@ -86,6 +85,7 @@
Always
+