From abed0157ec0430b4335e95966b06468b656c3983 Mon Sep 17 00:00:00 2001
From: lanariel <lanariel.silver@gmail.com>
Date: Fri, 22 Nov 2013 15:18:52 +0100
Subject: [PATCH] Do fix during weekend; Non stable

---
 Code/OysterGraphics/DllInterfaces/SimpleInterface.h | 6 ++++--
 Code/OysterGraphics/FileLoader/ObjReader.cpp        | 1 +
 Code/OysterGraphics/Model/Model.h                   | 3 +--
 Code/OysterGraphics/OysterGraphics.vcxproj          | 1 +
 Code/OysterGraphics/OysterGraphics.vcxproj.filters  | 3 +++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Code/OysterGraphics/DllInterfaces/SimpleInterface.h b/Code/OysterGraphics/DllInterfaces/SimpleInterface.h
index f576350d..8475b6f7 100644
--- a/Code/OysterGraphics/DllInterfaces/SimpleInterface.h
+++ b/Code/OysterGraphics/DllInterfaces/SimpleInterface.h
@@ -1,5 +1,7 @@
 #pragma once
+#include <string>
 #include "..\Model\Model.h"
+#include "OysterMath.h"
 
 
 class SimpleInterface
@@ -16,11 +18,11 @@ public:
 
 	State Init(HWND Window, bool MSAA_Quality, bool Fullscreen);
 	//! @brief from Oyster::Math Float4x4, expects corect methods
-	static void NewFrame(float View[16], float Projection[16]);
+	static void NewFrame(Oyster::Math::Float4x4 View, Oyster::Math::Float4x4 Projection);
 	static void RenderScene(Oyster::Graphics::Render::Model* models, int count);
 	static void EndFrame();
 
-	static Oyster::Graphics::Render::Model* CreateModel();
+	static Oyster::Graphics::Render::Model* CreateModel(std::wstring filename);
 
 	static State SetOptions(Option);
 	
diff --git a/Code/OysterGraphics/FileLoader/ObjReader.cpp b/Code/OysterGraphics/FileLoader/ObjReader.cpp
index b8ca24ae..4077a7dc 100644
--- a/Code/OysterGraphics/FileLoader/ObjReader.cpp
+++ b/Code/OysterGraphics/FileLoader/ObjReader.cpp
@@ -1,5 +1,6 @@
 #include "OBJReader.h"
 #include "..\Definitions\GraphicalDefinition.h"
+#include "..\Core\Buffer.h"
 #include <sstream>
 #include <fstream>
 
diff --git a/Code/OysterGraphics/Model/Model.h b/Code/OysterGraphics/Model/Model.h
index 381104ac..df8f82b8 100644
--- a/Code/OysterGraphics/Model/Model.h
+++ b/Code/OysterGraphics/Model/Model.h
@@ -14,8 +14,7 @@ namespace Oyster
 			struct Model
 			{
 				
-				typedef unsigned long long ModelData;
-				ModelData info;
+				void* const info;
 				//ModelInfo* info;
 				void* data;
 				int size;
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj b/Code/OysterGraphics/OysterGraphics.vcxproj
index 4c4b8646..da7aceae 100644
--- a/Code/OysterGraphics/OysterGraphics.vcxproj
+++ b/Code/OysterGraphics/OysterGraphics.vcxproj
@@ -154,6 +154,7 @@
     <ClInclude Include="Core\Buffer.h" />
     <ClInclude Include="Core\Core.h" />
     <ClInclude Include="Core\CoreIncludes.h" />
+    <ClInclude Include="DllInterfaces\SimpleInterface.h" />
     <ClInclude Include="FileLoader\ObjReader.h" />
     <ClInclude Include="Model\Model.h" />
     <ClInclude Include="Model\ModelInfo.h" />
diff --git a/Code/OysterGraphics/OysterGraphics.vcxproj.filters b/Code/OysterGraphics/OysterGraphics.vcxproj.filters
index c93b6439..2fcc4beb 100644
--- a/Code/OysterGraphics/OysterGraphics.vcxproj.filters
+++ b/Code/OysterGraphics/OysterGraphics.vcxproj.filters
@@ -71,6 +71,9 @@
     <ClInclude Include="FileLoader\ObjReader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="DllInterfaces\SimpleInterface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <FxCompile Include="Shader\HLSL\SimpleDebug\DebugVertex.hlsl" />