From bd0daf363d11e051bab7b2ba5a7501f4fb009274 Mon Sep 17 00:00:00 2001
From: lanariel <lanariel.silver@gmail.com>
Date: Fri, 21 Feb 2014 11:49:24 +0100
Subject: [PATCH] start with Instanced

---
 Code/Game/GameClient/GameClientState/GameState.cpp  |  2 +-
 .../Definitions/GraphicalDefinition.h               |  7 +++++++
 Code/OysterGraphics/DllInterfaces/GFXAPI.cpp        | 13 +++++++++++++
 Code/OysterGraphics/DllInterfaces/GFXAPI.h          |  4 ++++
 Code/OysterGraphics/Render/Resources.cpp            |  2 ++
 Code/OysterGraphics/Render/Resources.h              | 10 ++++++++++
 6 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Code/Game/GameClient/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp
index bf436d65..624eca17 100644
--- a/Code/Game/GameClient/GameClientState/GameState.cpp
+++ b/Code/Game/GameClient/GameClientState/GameState.cpp
@@ -90,7 +90,7 @@ bool GameState::Init( SharedStateContent &shared )
 	this->privData->camera.SetPerspectiveProjection( Utility::Value::Radian(90.0f), aspectRatio, 0.1f, 1000.0f );
 	Graphics::API::SetProjection( this->privData->camera.GetProjectionMatrix() );
 	gfxOp.AmbientValue = 0.5f;
-	gfxOp.GlobalGlowTint = Math::Float3(2,1,1);
+	gfxOp.GlobalGlowTint = Math::Float3(1,1,1);
 	gfxOp.GlobalTint = Math::Float3(1,1,1);
 	Graphics::API::SetOptions(gfxOp);
 
diff --git a/Code/OysterGraphics/Definitions/GraphicalDefinition.h b/Code/OysterGraphics/Definitions/GraphicalDefinition.h
index f6a6431c..9d7d4301 100644
--- a/Code/OysterGraphics/Definitions/GraphicalDefinition.h
+++ b/Code/OysterGraphics/Definitions/GraphicalDefinition.h
@@ -90,6 +90,13 @@ namespace Oyster
 				Math::Float3 GlowTint;
 				Math::Float PAD2;
 			};
+
+			struct RenderInstanceData
+			{
+				Math::Matrix WV;
+				Math::Matrix WVP;
+				TintData td;
+			};
 		}
 	}
 }
\ No newline at end of file
diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
index 8f01bea4..61bd30e6 100644
--- a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
+++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
@@ -19,6 +19,7 @@ namespace Oyster
 			Math::Float4x4 Projection;
 			std::vector<Definitions::Pointlight> Lights;
 			float deltaTime;
+			int MostModel;
 #ifdef _DEBUG
 			Model::Model* cube;
 			Model::Model* sphere;
@@ -133,6 +134,16 @@ namespace Oyster
 			return API::Sucsess;
 		}
 
+		void API::BeginLoadingModels()
+		{
+		}
+
+		void API::EndLoadingModels()
+		{
+			//TODO finalize instance buffers and create rendering map;
+			
+		}
+
 		//returns null for invalid filenames
 		Model::Model* API::CreateModel(std::wstring filename)
 		{
@@ -144,6 +155,8 @@ namespace Oyster
 			m->GlowTint = Math::Float3(1);
 			m->info = (Model::ModelInfo*)Core::loader.LoadResource((Core::modelPath + filename).c_str(),Oyster::Graphics::Loading::LoadDAN, Oyster::Graphics::Loading::UnloadDAN);
 
+			Core::loader
+
 			Model::ModelInfo* mi = (Model::ModelInfo*)m->info;
 			if(!mi || mi->Vertices->GetBufferPointer() == NULL)
 			{
diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.h b/Code/OysterGraphics/DllInterfaces/GFXAPI.h
index 795f649a..7f338cce 100644
--- a/Code/OysterGraphics/DllInterfaces/GFXAPI.h
+++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.h
@@ -42,6 +42,10 @@ namespace Oyster
 
 			static State Init(HWND Window, bool MSAA_Quality, bool Fullscreen, Option options);
 
+			static void BeginLoadingModels();
+
+			static void EndLoadingModels();
+
 			static State ReloadShaders();
 
 			//should be called after rendered normal models, before GUI or Text rendering
diff --git a/Code/OysterGraphics/Render/Resources.cpp b/Code/OysterGraphics/Render/Resources.cpp
index 2e693472..4c203cf9 100644
--- a/Code/OysterGraphics/Render/Resources.cpp
+++ b/Code/OysterGraphics/Render/Resources.cpp
@@ -63,6 +63,8 @@ namespace Oyster
 
 				ID3D11ShaderResourceView* Resources::Gui::Text::Font = NULL;
 				ID3D11DepthStencilView* Resources::Gui::depth = NULL;
+
+				std::map<Model::ModelInfo*, Resources::ModelDataWrapper*> Resources::RenderData = std::map<Model::ModelInfo*, Resources::ModelDataWrapper*>();
 #pragma endregion
 
 
diff --git a/Code/OysterGraphics/Render/Resources.h b/Code/OysterGraphics/Render/Resources.h
index 665ab8dc..6ad756eb 100644
--- a/Code/OysterGraphics/Render/Resources.h
+++ b/Code/OysterGraphics/Render/Resources.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "../Core/Core.h"
+#include "../Model/ModelInfo.h"
+#include "../Definitions/GraphicalDefinition.h"
 
 namespace Oyster
 {
@@ -11,6 +13,14 @@ namespace Oyster
 				class Resources
 				{
 				public:
+					struct ModelDataWrapper
+					{
+						Definitions::RenderInstanceData* rid;
+						int Models;
+					};
+
+					
+					static std::map<Model::ModelInfo*, ModelDataWrapper*> RenderData;
 					
 					static const int GBufferSize = 3;
 					static const int LBufferSize = 3;