From 6b1dd34a72b6a3554509976d6f1a84377e1f915d Mon Sep 17 00:00:00 2001
From: lanariel <lanariel.silver@gmail.com>
Date: Wed, 22 Jan 2014 16:31:33 +0100
Subject: [PATCH 1/2] Working SSAO + Read Animated .dan

---
 Code/OysterGraphics/FileLoader/DanLoader.cpp  | 482 +++++++++++-------
 Code/OysterGraphics/Model/ModelInfo.h         |  23 +-
 .../Render/Rendering/BasicRender.cpp          |   2 +-
 .../Render/Resources/Deffered.cpp             |  39 +-
 .../Render/Resources/Deffered.h               |   9 +-
 .../HLSL/Deffered Shaders/Defines.hlsli       |   4 +-
 .../HLSL/Deffered Shaders/LightPass.hlsl      |   6 +-
 .../HLSL/Deffered Shaders/PostPass.hlsl       |   5 +-
 .../Shader/HLSL/Deffered Shaders/SSAO.hlsli   |  21 +-
 Code/Tester/MainTest.cpp                      |  24 +-
 10 files changed, 387 insertions(+), 228 deletions(-)

diff --git a/Code/OysterGraphics/FileLoader/DanLoader.cpp b/Code/OysterGraphics/FileLoader/DanLoader.cpp
index 73f0c8c8..a0e1e56c 100644
--- a/Code/OysterGraphics/FileLoader/DanLoader.cpp
+++ b/Code/OysterGraphics/FileLoader/DanLoader.cpp
@@ -102,206 +102,320 @@ struct MaterialHeader
 ///
 struct SkeletonHeader
 {
-	// do this...
+	unsigned int numBones;
+	
+	///
+	SkeletonHeader(char* data)
+	{
+		memcpy(&numBones, data, sizeof(unsigned int));
+	}
 };
 
 ///
 struct AnimationHeader
 {
-	// do this...
-};
+	unsigned int numAnims;
 
-struct Frame
-{
-	// do this...
+
+	AnimationHeader(char* data)
+	{
+		memcpy(&numAnims, data, sizeof(unsigned int));
+	}
 };
 
 ///
-void Oyster::Graphics::Loading::UnloadDAN(void* data)
-{
-	Model::ModelInfo* info = (Model::ModelInfo*) data;
-	SAFE_DELETE(info->Vertices);
-	if(info->Indexed)
-	{
-		SAFE_DELETE(info->Indecies);
-	}
-	for(int i =0;i<info->Material.size();++i)
-	{
-		Oyster::Resource::OysterResource::ReleaseResource(info->Material[i]);
-	}
-	delete info;
-}
-
+void Oyster::Graphics::Loading::UnloadDAN(void* data)
+{
+	Model::ModelInfo* info = (Model::ModelInfo*) data;
+	SAFE_DELETE(info->Vertices);
+	if(info->Indexed)
+	{
+		SAFE_DELETE(info->Indecies);
+	}
+	for(int i =0;i<info->Material.size();++i)
+	{
+		Oyster::Resource::OysterResource::ReleaseResource(info->Material[i]);
+	}
+	delete info;
+}
+
 static wchar_t* charToWChar(const char* text)
 {
-    // Convert to a wchar_t*
-    size_t origsize = strlen(text) + 1;
-    size_t convertedChars = 0;
+	// Convert to a wchar_t*
+	size_t origsize = strlen(text) + 1;
+	size_t convertedChars = 0;
 	wchar_t* wcstring = new wchar_t[origsize];
-    mbstowcs_s(&convertedChars, wcstring, origsize, text, _TRUNCATE);
+	mbstowcs_s(&convertedChars, wcstring, origsize, text, _TRUNCATE);
    return wcstring;
-}
-
-///
-void Oyster::Graphics::Loading::LoadDAN(const wchar_t filename[], Oyster::Resource::CustomData& out)
-{
-	// 
-	Oyster::Graphics::Model::ModelInfo* modelInfo = new Oyster::Graphics::Model::ModelInfo();
-	modelInfo->Indexed = false;
-	// Open file in binary mode
+}
+
+static void ReadData(void* Destination, std::ifstream& file,  int size)
+{
+	char* buffer = new char[size];
+	file.read(buffer,size);
+	memcpy(Destination,buffer,size);
+	delete[] buffer;
+}
+
+///
+void Oyster::Graphics::Loading::LoadDAN(const wchar_t filename[], Oyster::Resource::CustomData& out)
+{
+	// 
+	Oyster::Graphics::Model::ModelInfo* modelInfo = new Oyster::Graphics::Model::ModelInfo();
+	modelInfo->Indexed = false;
+	// Open file in binary mode
 	std::ifstream danFile;
-	danFile.open(filename, std::ios::binary);
-	if (!danFile.is_open())
-		return;
-
-	// Read file header
-	char* buffer = new char[sizeof(FileHeader)];
-	danFile.read(buffer, sizeof(FileHeader));
-	FileHeader fileHeader(buffer);
-	delete[] buffer; // ( note: may crash here.)
-
-	// If problem with compatability then close file and return from method
-	if (fileHeader.versionMajor != DANFILEVERSIONMAJOR)
-	{
-		danFile.close();
-		return;
-	}
-
-	// Read the .dan-file
-	while (!danFile.eof())
-	{
-		// read header type
-		unsigned int headerType;
-		buffer = new char[4];
-		danFile.read(buffer, 4);
-		memcpy(&headerType, buffer, 4);
-		//delete[] buffer; // ( note: may crash here.)
-
-		// handle header type
-		switch ((HeaderType)headerType)
-		{
-			// vertex header
-			case HeaderType::VERTEXHEADER:
-			{
-				// Fetch vertex header, number of vertices
-				buffer = new char[4];
-				danFile.read(buffer, 4);
-				VertexHeader vertexHeader(buffer);
-				delete[] buffer; // ( note: may crash here.)
-
-				// Fetch all vertices
-				Vertex* vertices = new Vertex[vertexHeader.numVertices];
-				unsigned int bufferSize = VERTEXSIZE * vertexHeader.numVertices;
-				buffer = new char[bufferSize];
-				danFile.read(buffer, bufferSize);
-				memcpy(vertices, buffer, bufferSize);
-				delete[] buffer; // ( note: may crash here.)
-
-				// Do the deed
-				Oyster::Graphics::Core::Buffer*						vertexBuffer = new Oyster::Graphics::Core::Buffer();
-				Oyster::Graphics::Core::Buffer::BUFFER_INIT_DESC	bufferInitDesc;
-				bufferInitDesc.ElementSize	= sizeof(Vertex);
-				bufferInitDesc.InitData		= vertices;
-				bufferInitDesc.NumElements	= vertexHeader.numVertices;
-				bufferInitDesc.Type			= Oyster::Graphics::Core::Buffer::BUFFER_TYPE::VERTEX_BUFFER;
-				bufferInitDesc.Usage		= Oyster::Graphics::Core::Buffer::BUFFER_USAGE::BUFFER_DEFAULT;
-				vertexBuffer->Init(bufferInitDesc);
-				modelInfo->VertexCount = vertexHeader.numVertices;
-				modelInfo->Vertices = vertexBuffer;
-
-				delete[] vertices; // ( note: may crash here.)
-
-				break;
-			}
-			case HeaderType::INDEXHEADER:
-			{
-				// Fetch vertex header, number of vertices
-				buffer = new char[4];
-				danFile.read(buffer, 4);
-				IndexHeader indexHeader(buffer);
-				delete[] buffer; // ( note: may crash here.)
-
-				// Fetch all indices
-				unsigned int* indices = new unsigned int[indexHeader.numIndices];
-				unsigned int bufferSize = sizeof(unsigned int) * indexHeader.numIndices;
-				buffer = new char[bufferSize];
-				danFile.read(buffer, bufferSize);
-				memcpy(indices, buffer, bufferSize);
-				delete[] buffer; // ( note: may crash here.)
-
-				// Do the deed
-				Oyster::Graphics::Core::Buffer*						indexBuffer = new Oyster::Graphics::Core::Buffer();
-				Oyster::Graphics::Core::Buffer::BUFFER_INIT_DESC	bufferInitDesc;
-				bufferInitDesc.ElementSize	= sizeof(unsigned int);
-				bufferInitDesc.InitData		= indices;
-				bufferInitDesc.NumElements	= indexHeader.numIndices;
-				bufferInitDesc.Type			= Oyster::Graphics::Core::Buffer::BUFFER_TYPE::INDEX_BUFFER;
-				bufferInitDesc.Usage		= Oyster::Graphics::Core::Buffer::BUFFER_USAGE::BUFFER_DEFAULT;
-				indexBuffer->Init(bufferInitDesc);
-				modelInfo->IndexCount = indexHeader.numIndices;
-				modelInfo->Indecies = indexBuffer;
-				modelInfo->Indexed = true;
-
-				delete[] indices; // ( note: may crash here.)
-
-				break;
-			}
-			// material header
-			case HeaderType::MATERIALHEADER:
-			{
-				// Fetch material header, 2 texture path strings
-				MaterialHeader materialHeader;
-				buffer = new char[4];
-				danFile.read(buffer, 4);
-				memcpy(&materialHeader.diffuseMapPathLength, buffer, 4);
-				delete[] buffer; // ( note: may crash here.)
+	danFile.open(filename, std::ios::binary);
+	if (!danFile.is_open())
+		return;
 
-				buffer = new char[materialHeader.diffuseMapPathLength];
-				danFile.read(buffer, materialHeader.diffuseMapPathLength);
+	// Read file header
+	char* buffer = new char[sizeof(FileHeader)];
+	danFile.read(buffer, sizeof(FileHeader));
+	FileHeader fileHeader(buffer);
+	delete[] buffer; // ( note: may crash here.)
+
+	// If problem with compatability then close file and return from method
+	if (fileHeader.versionMajor != DANFILEVERSIONMAJOR)
+	{
+		danFile.close();
+		return;
+	}
+
+	// Read the .dan-file
+	while (!danFile.eof())
+	{
+		// read header type
+		unsigned int headerType;
+		ReadData(&headerType,danFile,4);
+
+		// handle header type
+		switch ((HeaderType)headerType)
+		{
+			// vertex header
+			case HeaderType::VERTEXHEADER:
+			{
+				// Fetch vertex header, number of vertices
+				buffer = new char[4];
+				danFile.read(buffer, 4);
+				VertexHeader vertexHeader(buffer);
+				delete[] buffer; // ( note: may crash here.)
+
+				// Fetch all vertices
+				unsigned int bufferSize = VERTEXSIZE * vertexHeader.numVertices;
+				buffer = new char[bufferSize];
+				danFile.read(buffer, bufferSize);
+
+				// Do the deed
+				Oyster::Graphics::Core::Buffer*						vertexBuffer = new Oyster::Graphics::Core::Buffer();
+				Oyster::Graphics::Core::Buffer::BUFFER_INIT_DESC	bufferInitDesc;
+				bufferInitDesc.ElementSize	= sizeof(Vertex);
+				bufferInitDesc.InitData		= buffer;
+				bufferInitDesc.NumElements	= vertexHeader.numVertices;
+				bufferInitDesc.Type			= Oyster::Graphics::Core::Buffer::BUFFER_TYPE::VERTEX_BUFFER;
+				bufferInitDesc.Usage		= Oyster::Graphics::Core::Buffer::BUFFER_USAGE::BUFFER_DEFAULT;
+				vertexBuffer->Init(bufferInitDesc);
+				modelInfo->VertexCount = vertexHeader.numVertices;
+				modelInfo->Vertices = vertexBuffer;
+
+				
+				delete[] buffer; // ( note: may crash here.)
+
+				break;
+			}
+			case HeaderType::INDEXHEADER:
+			{
+				// Fetch vertex header, number of vertices
+				buffer = new char[4];
+				danFile.read(buffer, 4);
+				IndexHeader indexHeader(buffer);
+				delete[] buffer; // ( note: may crash here.)
+
+				// Fetch all indices
+				unsigned int* indices = new unsigned int[indexHeader.numIndices];
+				unsigned int bufferSize = sizeof(unsigned int) * indexHeader.numIndices;
+
+				
+				ReadData(indices,danFile,bufferSize);
+
+				// Do the deed
+				Oyster::Graphics::Core::Buffer*						indexBuffer = new Oyster::Graphics::Core::Buffer();
+				Oyster::Graphics::Core::Buffer::BUFFER_INIT_DESC	bufferInitDesc;
+				bufferInitDesc.ElementSize	= sizeof(unsigned int);
+				bufferInitDesc.InitData		= indices;
+				bufferInitDesc.NumElements	= indexHeader.numIndices;
+				bufferInitDesc.Type			= Oyster::Graphics::Core::Buffer::BUFFER_TYPE::INDEX_BUFFER;
+				bufferInitDesc.Usage		= Oyster::Graphics::Core::Buffer::BUFFER_USAGE::BUFFER_DEFAULT;
+				indexBuffer->Init(bufferInitDesc);
+				modelInfo->IndexCount = indexHeader.numIndices;
+				modelInfo->Indecies = indexBuffer;
+				modelInfo->Indexed = true;
+
+				delete[] indices; // ( note: may crash here.)
+
+				break;
+			}
+			// material header
+			case HeaderType::MATERIALHEADER:
+			{
+				// Fetch material header, 2 texture path strings
+				MaterialHeader materialHeader;
+
+				//read difuse map name length
+				ReadData(&materialHeader.diffuseMapPathLength,danFile,4);
+				
+				//read diffuse map name
 				materialHeader.diffuseMapPath = new char[materialHeader.diffuseMapPathLength+1];
-				memcpy(materialHeader.diffuseMapPath, buffer, materialHeader.diffuseMapPathLength);
-				materialHeader.diffuseMapPath[materialHeader.diffuseMapPathLength] = 0;
-				delete[] buffer; // ( note: may crash here.)
-				
-				buffer = new char[4];
-				danFile.read(buffer, 4);
-				memcpy(&materialHeader.normalMapPathLength, buffer, 4);
-				delete[] buffer; // ( note: may crash here.)
+				ReadData(materialHeader.diffuseMapPath,danFile,materialHeader.diffuseMapPathLength);
+				//null terminate
+				materialHeader.diffuseMapPath[materialHeader.diffuseMapPathLength] = 0;
+				
+				//read normal map name length
+				ReadData(&materialHeader.normalMapPathLength,danFile,4);
 
-				buffer = new char[materialHeader.normalMapPathLength];
-				danFile.read(buffer, materialHeader.normalMapPathLength);
+				//read difuse map name
 				materialHeader.normalMapPath = new char[materialHeader.normalMapPathLength + 1];
-				memcpy(materialHeader.normalMapPath, buffer, materialHeader.normalMapPathLength);
-				materialHeader.normalMapPath[materialHeader.normalMapPathLength] = 0;
-				delete[] buffer; // ( note: may crash here.)
-
-				// 
-				ID3D11ShaderResourceView* diffuseMap = (ID3D11ShaderResourceView*)Oyster::Resource::OysterResource::LoadResource(charToWChar(materialHeader.diffuseMapPath), Oyster::Graphics::Loading::LoadTexture);
-				ID3D11ShaderResourceView* normalMap  = (ID3D11ShaderResourceView*)Oyster::Resource::OysterResource::LoadResource(charToWChar(materialHeader.normalMapPath),  Oyster::Graphics::Loading::LoadTexture);
-				modelInfo->Material.push_back(diffuseMap);
-				modelInfo->Material.push_back(normalMap);
-
-				break;
-			}
-			// skeleton header
-			case HeaderType::SKELETONHEADER:
-			{
-				// not implemented...
-				break;
-			}
-			// animation header
-			case HeaderType::ANIMATIONHEADER:
-			{
-				// not implemented...
-				break;
-			}
-		}
-	}
-
-	// close file
-	danFile.close();
-
-	// Set modelinfo as output data
-	out.loadedData = modelInfo;
-	out.resourceUnloadFnc = Oyster::Graphics::Loading::UnloadDAN;
+				ReadData(materialHeader.normalMapPath,danFile,materialHeader.normalMapPathLength);
+				materialHeader.normalMapPath[materialHeader.normalMapPathLength] = 0;
+
+				//load diffuse map 
+				wchar_t* path = charToWChar(materialHeader.diffuseMapPath);
+				ID3D11ShaderResourceView* diffuseMap = (ID3D11ShaderResourceView*)Oyster::Resource::OysterResource::LoadResource(path, Oyster::Graphics::Loading::LoadTexture);
+				delete[] path;
+
+				//load normal map
+				path = charToWChar(materialHeader.normalMapPath);
+				ID3D11ShaderResourceView* normalMap  = (ID3D11ShaderResourceView*)Oyster::Resource::OysterResource::LoadResource(path,  Oyster::Graphics::Loading::LoadTexture);
+				delete[] path;
+
+				//add to model
+				modelInfo->Material.push_back(diffuseMap);
+				modelInfo->Material.push_back(normalMap);
+
+				//clean up
+				delete[] materialHeader.diffuseMapPath;
+				delete[] materialHeader.normalMapPath;
+
+				break;
+			}
+
+			// skeleton header
+			case HeaderType::SKELETONHEADER:
+			{
+				// Fetch Skeleton header, number of Bones
+				buffer = new char[4];
+				danFile.read(buffer, 4);
+				SkeletonHeader skeletonHeader(buffer);
+				delete[] buffer; // ( note: may crash here.)
+
+				//array for bone data
+				Oyster::Math::Matrix* bones = new Oyster::Math::Matrix[skeletonHeader.numBones*2];
+				
+				//read bones
+				ReadData(bones,danFile,skeletonHeader.numBones * 2 * sizeof(Oyster::Math::Matrix));
+
+				//init Graphics data
+				Oyster::Graphics::Core::Buffer* skeleton = new Oyster::Graphics::Core::Buffer();
+				Oyster::Graphics::Core::Buffer::BUFFER_INIT_DESC initDesc;
+				initDesc.ElementSize = sizeof(Oyster::Math::Matrix);
+				initDesc.InitData = bones;
+				initDesc.NumElements = skeletonHeader.numBones * 2;
+				initDesc.Type = Oyster::Graphics::Core::Buffer::BUFFER_TYPE::CONSTANT_BUFFER_VS;
+				initDesc.Usage = Oyster::Graphics::Core::Buffer::BUFFER_USAGE::BUFFER_USAGE_IMMUTABLE;
+
+				skeleton->Init(initDesc);
+
+				modelInfo->Skeleton = skeleton;
+
+				//read skeleton Hiarchy
+				
+				int* parents = new int[skeletonHeader.numBones];
+				ReadData(parents,danFile,skeletonHeader.numBones * sizeof(int));
+				
+				//store hiarchy
+				Oyster::Graphics::Model::Bone* Bones = new Oyster::Graphics::Model::Bone[skeletonHeader.numBones];
+				for(int i = 0; i < skeletonHeader.numBones; ++i)
+				{
+					Bones[i].Parent = parents[i];
+					Bones[i].Transform = bones[i];
+				}
+
+				modelInfo->BoneCount = skeletonHeader.numBones;
+				modelInfo->bones = Bones;
+
+				break;
+			}
+			// animation header
+			case HeaderType::ANIMATIONHEADER:
+			{
+				//get num anims
+				buffer = new char[4];
+				danFile.read(buffer, 4);
+				AnimationHeader animationHeader(buffer);
+				delete[] buffer;
+
+				Oyster::Graphics::Model::Animation* anims = new Oyster::Graphics::Model::Animation[animationHeader.numAnims];
+				for(int a = 0; a < animationHeader.numAnims; ++a)
+				{
+					//read name of animation
+					int nameLength;
+
+					
+					ReadData(&nameLength,danFile,4);
+
+					char* name = new char[nameLength + 1];
+					ReadData(name,danFile,nameLength);
+					name[nameLength] = 0;
+
+					wchar_t* wName = charToWChar(name);
+					anims[a].name = std::wstring(wName);
+					delete[] wName;
+
+					Oyster::Graphics::Model::Animation A = anims[a];
+
+					//read nr of bones in animation
+					ReadData(&A.Bones,danFile,4);
+
+					//create Frame array and Bone part of KeyFrameArray;
+					A.Frames = new int[A.Bones];
+					A.Keyframes = new Oyster::Graphics::Model::Frame*[A.Bones];
+					
+					//loop per bone and gather data
+					for(int b = 0; b < A.Bones; ++b)
+					{
+						//read nr of frames per bone
+						ReadData(&A.Frames[b],danFile,4);
+
+						//create frame matrix
+						A.Keyframes[b] = new Oyster::Graphics::Model::Frame[A.Frames[b]];
+
+						//read bone index
+						int boneIndex;
+						ReadData(&boneIndex,danFile,4);
+
+						for(int f = 0; f < A.Frames[b]; ++f)
+						{
+							//write index of bone
+							A.Keyframes[b][f].bone.Parent = boneIndex;
+
+							//read bone transform
+							ReadData(&A.Keyframes[b][f].bone.Transform,danFile,sizeof(Oyster::Math::Matrix));
+
+							
+							ReadData(&A.Keyframes[b][f].time,danFile,sizeof(double));
+						}
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
+	// close file
+	danFile.close();
+
+	// Set modelinfo as output data
+	out.loadedData = modelInfo;
+	out.resourceUnloadFnc = Oyster::Graphics::Loading::UnloadDAN;
 }
\ No newline at end of file
diff --git a/Code/OysterGraphics/Model/ModelInfo.h b/Code/OysterGraphics/Model/ModelInfo.h
index 9dcef562..9afa9e21 100644
--- a/Code/OysterGraphics/Model/ModelInfo.h
+++ b/Code/OysterGraphics/Model/ModelInfo.h
@@ -11,12 +11,31 @@ namespace Oyster
 	{
 		namespace Model
 		{
+			struct Bone
+			{
+				Math::Float4x4 Transform;
+				int Parent;
+			};
+			struct Frame
+			{
+				Bone bone;
+				double time;
+			};
+			struct Animation
+			{
+				std::wstring name;
+				int Bones;
+				int* Frames; //! Bone as index
+				Frame** Keyframes; //! @brief [Bone][Frame]
+			};
 			struct ModelInfo
 			{
 				std::vector<ID3D11ShaderResourceView*> Material;
-				Core::Buffer *Vertices,*Indecies;
+				Core::Buffer *Vertices,*Indecies,*Skeleton;
 				bool Indexed;
-				int VertexCount, IndexCount;
+				int VertexCount, IndexCount, BoneCount, AnimationCount;
+				Bone* bones;
+				Animation* Animations;
 			};	
 		}
 	}
diff --git a/Code/OysterGraphics/Render/Rendering/BasicRender.cpp b/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
index 0a5a275c..1e76bc61 100644
--- a/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
+++ b/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
@@ -18,7 +18,7 @@ namespace Oyster
 				void Basic::NewFrame(Oyster::Math::Float4x4 View, Oyster::Math::Float4x4 Projection, Definitions::Pointlight* Lights, int numLights)
 				{
 					Preparations::Basic::ClearBackBuffer(Oyster::Math::Float4(1,0,0,1));
-					Preparations::Basic::ClearRTV(Resources::Deffered::GBufferRTV,Resources::Deffered::GBufferSize,Math::Float4(1,0,0,1));
+					Preparations::Basic::ClearRTV(Resources::Deffered::GBufferRTV,Resources::Deffered::GBufferSize,Math::Float4(0,0,0,1));
 					Core::PipelineManager::SetRenderPass(Graphics::Render::Resources::Deffered::GeometryPass);
 
 					Definitions::VP vp;
diff --git a/Code/OysterGraphics/Render/Resources/Deffered.cpp b/Code/OysterGraphics/Render/Resources/Deffered.cpp
index f606d57e..f9a837a2 100644
--- a/Code/OysterGraphics/Render/Resources/Deffered.cpp
+++ b/Code/OysterGraphics/Render/Resources/Deffered.cpp
@@ -12,7 +12,7 @@ const std::wstring PathToHLSL = L"..\\..\\Code\\OysterGraphics\\Shader\\HLSL\\De
 const std::wstring PathToCSO = L"..\\Content\\Shaders\\";
 
 const int KernelSize = 10;
-const int SampleSpread = 8;
+const int SampleSpread = 16;
 
 namespace Oyster
 {
@@ -156,6 +156,7 @@ namespace Oyster
 
 					Core::Init::CreateLinkedShaderResourceFromStructuredBuffer(&b,&PointLightView,NULL);
 					srand((unsigned int)time(0));
+
 					//SSAO
 					Math::Vector3 kernel[KernelSize];
 					Math::Vector3 random[SampleSpread];
@@ -186,13 +187,12 @@ namespace Oyster
 						{
 							random[i] = Oyster::Math::Vector3(
 								(float)rand() / (RAND_MAX + 1) * (1 - -1)+ -1,
-								(float)rand() / (RAND_MAX + 1) * (1 - -1)+ -1,
+								/*(float)rand() / (RAND_MAX + 1) * (1 - -1)+ -1,*/
+								1.0f,
 								0.0f);
 						}
 						random[i].Normalize();
 					}
-					//kernel[0] = Math::Vector3(0,1,1);
-					//kernel[0].Normalize();
 
 					D3D11_TEXTURE1D_DESC T1desc;
 					T1desc.Width = KernelSize;
@@ -208,17 +208,32 @@ namespace Oyster
 
 					D3D11_SUBRESOURCE_DATA rnd;
 					rnd.pSysMem = random;
+					rnd.SysMemPitch = sqrt(SampleSpread) * sizeof(Oyster::Math::Vector3);
 
-					ID3D11Texture1D *pTexture1[2];
+					ID3D11Texture1D *pTexture1;
 
-					 Core::device->CreateTexture1D( &T1desc, &sphere, &pTexture1[0] );
-					 Core::device->CreateShaderResourceView( pTexture1[0], 0, &SSAOKernel );
-					pTexture1[0]->Release();
+					 Core::device->CreateTexture1D( &T1desc, &sphere, &pTexture1 );
+					 Core::device->CreateShaderResourceView( pTexture1, 0, &SSAOKernel );
+					pTexture1->Release();
 
-					T1desc.Width = SampleSpread;
-					Core::device->CreateTexture1D( &T1desc, &rnd, &pTexture1[1] );
-					Core::device->CreateShaderResourceView( (pTexture1[1]), 0, &SSAORandom );
-					pTexture1[1]->Release();
+					D3D11_TEXTURE2D_DESC T2desc;
+					T2desc.Width = KernelSize;
+					T2desc.MipLevels = T2desc.ArraySize = 1;
+					T2desc.Format = DXGI_FORMAT_R32G32B32_FLOAT;
+					T2desc.Usage = D3D11_USAGE_DEFAULT;
+					T2desc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+					T2desc.CPUAccessFlags = 0;
+					T2desc.MiscFlags = 0;
+					T2desc.Height = sqrt(SampleSpread);
+					T2desc.Width = SampleSpread/sqrt(SampleSpread);
+					T2desc.SampleDesc.Quality = 0;
+					T2desc.SampleDesc.Count = 1;
+
+					ID3D11Texture2D *pTexture2;
+
+					Core::device->CreateTexture2D( &T2desc, &rnd, &pTexture2 );
+					Core::device->CreateShaderResourceView( (pTexture2), 0, &SSAORandom );
+					pTexture2->Release();
 
 					////Create ShaderEffects
 
diff --git a/Code/OysterGraphics/Render/Resources/Deffered.h b/Code/OysterGraphics/Render/Resources/Deffered.h
index c4559cab..9d8065e0 100644
--- a/Code/OysterGraphics/Render/Resources/Deffered.h
+++ b/Code/OysterGraphics/Render/Resources/Deffered.h
@@ -18,12 +18,15 @@ namespace Oyster
 					static const int LBufferSize = 3;
 					static const int MaxLightSize = 100;
 					//! GBuffers
-					//! 0 = Diffuse + SpecKoeff
-					//! 1 = Normal + Glow
+					//! 0 = Diffuse + Glow
+					//! 1 = Normal + Spec
 					static ID3D11RenderTargetView* GBufferRTV[GBufferSize];
 					static ID3D11ShaderResourceView* GBufferSRV[GBufferSize];
 
-					
+					//! LBuffer
+					//! 0 = Diffuse
+					//! 1 = Specular
+					//! 2 = SSAO
 					static ID3D11UnorderedAccessView* LBufferUAV[LBufferSize];
 					static ID3D11ShaderResourceView* LBufferSRV[LBufferSize];
 
diff --git a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/Defines.hlsli b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/Defines.hlsli
index 9096045d..1f1061d1 100644
--- a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/Defines.hlsli	
+++ b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/Defines.hlsli	
@@ -32,10 +32,10 @@ Texture2D DepthTexture					: register(t2);
 StructuredBuffer<PointLight> Points		: register(t3);
 
 Texture1D SSAOKernel					: register(t4);
-Texture1D SSAORand						: register(t5);
+Texture2D SSAORand						: register(t5);
 
 RWTexture2D<float4> Diffuse				: register(u0);
 RWTexture2D<float4> Specular			: register(u1);
-RWTexture2D<float> Ambient				: register(u2);
+RWTexture2D<float4> Ambient				: register(u2);
 
 #endif
\ No newline at end of file
diff --git a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl
index 98b2887e..f7dbb4a1 100644
--- a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl	
+++ b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl	
@@ -31,10 +31,10 @@ void main( uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID )
 	Specular[DTid.xy] = float4(Shaded.Specular, 1);
 
 	
-	if((DTid.x + DTid.y) %4 == 0 )
+	if(DTid.x & 1 && DTid.y & 1 )
 	{
-		float AmbValue = GetSSAO(ViewPos, UV, DTid.xy, GTid.xy);
-		Ambient[DTid.xy/4] = AmbValue;
+		float AmbValue = GetSSAO(ViewPos, UV, DTid.xy, GTid.xy/2);
+		Ambient[DTid.xy/2] = AmbValue;
 	}
 
 }
\ No newline at end of file
diff --git a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl
index 1c52e5bf..d029535b 100644
--- a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl	
+++ b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/PostPass.hlsl	
@@ -7,6 +7,7 @@ RWTexture2D<float4> Output;
 [numthreads(16, 16, 1)]
 void main( uint3 DTid : SV_DispatchThreadID )
 {
-	//Output[DTid.xy] = Diffuse[DTid.xy] + Specular[DTid.xy] + Diffuse[DTid.xy] * Ambient[DTid.xy/4].w;// + float4(Ambient[DTid.xy/4].xyz,1); GLOW
-	Output[DTid.xy] = Diffuse[DTid.xy];
+	//Output[DTid.xy] = Diffuse[DTid.xy] + Specular[DTid.xy] + Diffuse[DTid.xy] * Ambient[DTid.xy/2].w;// + float4(Ambient[DTid.xy/4].xyz,1); GLOW
+	Output[DTid.xy] = Ambient[DTid.xy/2];
+	//Output[DTid.xy] = Diffuse[DTid.xy] + Specular[DTid.xy];
 }
\ No newline at end of file
diff --git a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/SSAO.hlsli b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/SSAO.hlsli
index 32f84f90..d642c0ec 100644
--- a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/SSAO.hlsli	
+++ b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/SSAO.hlsli	
@@ -1,27 +1,30 @@
 #include "Defines.hlsli"
 #include "PosManipulation.hlsli"
 
-static float Radius =5;
+static float Radius = 100;
 
 float GetSSAO(float3 pos, float2 uv, int2 texCoord2, uint2 rndID)
 {
 	
 	float occlusion = 0.0f;
 	//create sample coordinate system
-	float4 rnd = float4( SSAORand[(rndID.x + rndID.y) % SSAORand.Length.x].xyz, 0.0f );
+	float4 rnd = float4( SSAORand[int2(rndID.x % (SSAORand.Length.x),  rndID.y % (SSAORand.Length.y))].xyz, 0.0f );
 	rnd = normalize(rnd);
-	float3 normal = NormalSpec[uv].xyz;
-	float4 tangent = float4( normalize(rnd.xyz - (normal * dot(rnd.xyz, normal))), 0.0f );
-	float4 biTangent = float4( cross(tangent.xyz, normal), 0.0f );
+	float3 normal = NormalSpec[texCoord2].xyz;
+	float3 tangent = float3( normalize(rnd.xyz - (normal * dot(rnd.xyz, normal))));
+	float3 biTangent = float3( cross(tangent.xyz, normal));
 
-	float4x4 tbn = float4x4(tangent, biTangent, float4(normal,0), float4(pos*Radius,1));
+	float3x3 tbn = float3x3(tangent, biTangent, normal);
 
 	for( uint i = 0; i < SSAOKernel.Length.x; ++i )
 	{
+		//int i = 0;
 		//take sample from localspace to viewspace
-		float4 sampled = mul(tbn, float4(SSAOKernel[i].xyz,1));
+
+		float3 sampled = mul(tbn, SSAOKernel[i].xyz);
+		sampled = sampled * Radius + pos;
 		//project sample to get uv.xy
-		float4 ProjOffset = sampled;
+		float4 ProjOffset = float4(sampled,1);
 		ProjOffset = mul(Proj, ProjOffset);
 		float4 offset = ProjOffset;
 		float2 UV = offset;
@@ -39,7 +42,7 @@ float GetSSAO(float3 pos, float2 uv, int2 texCoord2, uint2 rndID)
 
 		//compare to depth from sample
 		float rangeCheck = (abs(pos.z - sampleDepth) < Radius) ? 1.0f : 0.0f;
-		occlusion += (sampleDepth >= sampled.z ? 1.0f : 0.0f) * rangeCheck;
+		occlusion += (sampleDepth <= sampled.z ? 1.0f : 0.0f) * rangeCheck;
 	}
 	occlusion /= (float)(SSAOKernel.Length.x);
 	occlusion = 1.0f - occlusion;
diff --git a/Code/Tester/MainTest.cpp b/Code/Tester/MainTest.cpp
index d25a9adc..eb5b241e 100644
--- a/Code/Tester/MainTest.cpp
+++ b/Code/Tester/MainTest.cpp
@@ -121,7 +121,7 @@ HRESULT InitWindow( HINSTANCE hInstance, int nCmdShow )
 
 	// Adjust and create window
 	g_hInst = hInstance; 
-	RECT rc = { 0, 0, 1024, 768 };
+	RECT rc = { 0, 0, 1280, 720 };
 	AdjustWindowRect( &rc, WS_OVERLAPPEDWINDOW, FALSE );
 	
 	if(!(g_hWnd = CreateWindow(
@@ -159,25 +159,25 @@ HRESULT InitDirect3D()
 		return E_FAIL;
 	}
 	
-	m =  Oyster::Graphics::API::CreateModel(L"cube_tri.dan");
-	m2 = Oyster::Graphics::API::CreateModel(L"cube_tri.dan");
+	m =  Oyster::Graphics::API::CreateModel(L"untitled.dan");
+	m2 = Oyster::Graphics::API::CreateModel(L"knee_noAnimation.dan");
 	m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
-	m3 = Oyster::Graphics::API::CreateModel(L"cube_tri.dan");
+	m3 = Oyster::Graphics::API::CreateModel(L"box_2.dan");
 	m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
 	
 
-	P = Oyster::Math3D::ProjectionMatrix_Perspective(Oyster::Math::pi/2,1024.0f/768.0f,.1f,100);
+	P = Oyster::Math3D::ProjectionMatrix_Perspective(Oyster::Math::pi/2,1280.0f/720.0f,.1f,10000);
 	Oyster::Graphics::API::SetProjection(P);
 
-	V = Oyster::Math3D::OrientationMatrix_LookAtDirection(Oyster::Math::Float3(0,0,-1),Oyster::Math::Float3(0,1,0),Oyster::Math::Float3(0,0,15.4f));
+	V = Oyster::Math3D::OrientationMatrix_LookAtDirection(Oyster::Math::Float3(0,0,-1),Oyster::Math::Float3(0,1,0),Oyster::Math::Float3(0,200,500.4f));
 	V = V.GetInverse();
 	
 
 	Oyster::Graphics::Definitions::Pointlight pl;
 	pl.Color = Oyster::Math::Float3(1,1,1);
 	pl.Bright = 1;
-	pl.Pos = Oyster::Math::Float3(0,5,5.4f);
-	pl.Radius = 15;
+	pl.Pos = Oyster::Math::Float3(0,-20.0f,30.4f);
+	pl.Radius = 90;
 
 	Oyster::Graphics::API::AddLight(pl);
 
@@ -188,9 +188,13 @@ float angle = 0;
 HRESULT Update(float deltaTime)
 {
 
-	angle += Oyster::Math::pi/8 * deltaTime;
-	m->WorldMatrix =  Oyster::Math3D::RotationMatrix_AxisY(angle);
+	angle += Oyster::Math::pi/16 * deltaTime;
+	m->WorldMatrix =  Oyster::Math3D::RotationMatrix_AxisY(angle) * Oyster::Math3D::RotationMatrix_AxisX(-Oyster::Math::pi/2);
 	m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(1,0,0)*-angle,Oyster::Math::Float3(0,-4,0),Oyster::Math::Float3::null);
+	//Oyster::Math::Matrix ma = Oyster::Math::Matrix::identity;
+	//ma *= 5;
+	//ma.m44 = 1;
+	//m2->WorldMatrix = m2->WorldMatrix *ma;
 	m3->WorldMatrix =  Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(1,0,0)*-0,Oyster::Math::Float3(3,4,-1*angle),Oyster::Math::Float3::null);
 	return S_OK;
 }

From 15625ac5d29c0e4cc13ef10d68dd8b9931bc2108 Mon Sep 17 00:00:00 2001
From: lanariel <lanariel.silver@gmail.com>
Date: Mon, 27 Jan 2014 14:24:13 +0100
Subject: [PATCH 2/2] Basic Animation (NOT STABLE)

---
 Code/DanBias.sln                              | 80 ++++++++++---------
 .../Definitions/GraphicalDefinition.h         | 13 +--
 Code/OysterGraphics/DllInterfaces/GFXAPI.cpp  |  3 +-
 Code/OysterGraphics/FileLoader/DanLoader.cpp  | 65 ++++++---------
 Code/OysterGraphics/Model/Model.h             |  8 +-
 Code/OysterGraphics/Model/ModelInfo.h         |  4 +-
 .../Render/Rendering/BasicRender.cpp          | 75 +++++++++++++++--
 .../Render/Resources/Deffered.cpp             | 11 +--
 .../Render/Resources/Deffered.h               |  2 +-
 .../HLSL/Deffered Shaders/GBufferHeader.hlsli |  8 +-
 .../Deffered Shaders/VertexGatherData.hlsl    |  4 +
 Code/Tester/MainTest.cpp                      | 25 +++---
 Code/Tester/Tester.vcxproj                    |  5 +-
 13 files changed, 179 insertions(+), 124 deletions(-)

diff --git a/Code/DanBias.sln b/Code/DanBias.sln
index 2e047aee..7182fe89 100644
--- a/Code/DanBias.sln
+++ b/Code/DanBias.sln
@@ -41,26 +41,26 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Mixed Platforms.Build.0 = Release|x64
 		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|Win32.Build.0 = Debug|Win32
-		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x64.ActiveCfg = Debug|x64
-		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x64.Build.0 = Debug|x64
-		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x64.ActiveCfg = Release|x64
+		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Debug|x64.Build.0 = Release|x64
+		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Mixed Platforms.Build.0 = Release|x64
 		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Win32.ActiveCfg = Release|Win32
 		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|Win32.Build.0 = Release|Win32
 		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|x64.ActiveCfg = Release|x64
 		{0EC83E64-230E-48EF-B08C-6AC9651B4F82}.Release|x64.Build.0 = Release|x64
-		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Mixed Platforms.Build.0 = Release|x64
 		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|Win32.Build.0 = Debug|Win32
-		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.ActiveCfg = Debug|x64
-		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.Build.0 = Debug|x64
-		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.ActiveCfg = Release|x64
+		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Debug|x64.Build.0 = Release|x64
+		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Mixed Platforms.Build.0 = Release|x64
 		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Win32.ActiveCfg = Release|Win32
 		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|Win32.Build.0 = Release|Win32
 		{F10CBC03-9809-4CBA-95D8-327C287B18EE}.Release|x64.ActiveCfg = Release|x64
@@ -113,50 +113,50 @@ Global
 		{7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|Win32.Build.0 = Release|Win32
 		{7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x64.ActiveCfg = Release|x64
 		{7E3990D2-3D94-465C-B58D-64A74B3ECF9B}.Release|x64.Build.0 = Release|x64
-		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Mixed Platforms.Build.0 = Release|x64
 		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|Win32.Build.0 = Debug|Win32
-		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.ActiveCfg = Debug|x64
-		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.Build.0 = Debug|x64
-		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.ActiveCfg = Release|x64
+		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Debug|x64.Build.0 = Release|x64
+		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Mixed Platforms.Build.0 = Release|x64
 		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Win32.ActiveCfg = Release|Win32
 		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|Win32.Build.0 = Release|Win32
 		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x64.ActiveCfg = Release|x64
 		{2EC4DDED-8F75-4C86-A10B-E1E8EB29F3EE}.Release|x64.Build.0 = Release|x64
-		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|Mixed Platforms.Build.0 = Release|x64
 		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|Win32.Build.0 = Debug|Win32
-		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|x64.ActiveCfg = Debug|x64
-		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|x64.Build.0 = Debug|x64
-		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|x64.ActiveCfg = Release|x64
+		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Debug|x64.Build.0 = Release|x64
+		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|Mixed Platforms.Build.0 = Release|x64
 		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|Win32.ActiveCfg = Release|Win32
 		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|Win32.Build.0 = Release|Win32
 		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|x64.ActiveCfg = Release|x64
 		{838B25C2-D19E-49FE-8CB0-9A977CA3C7E8}.Release|x64.Build.0 = Release|x64
-		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|Mixed Platforms.Build.0 = Release|x64
 		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|Win32.Build.0 = Debug|Win32
-		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|x64.ActiveCfg = Debug|x64
-		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|x64.Build.0 = Debug|x64
-		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|x64.ActiveCfg = Release|x64
+		{6A066806-F43F-4B31-A4E3-57179674F460}.Debug|x64.Build.0 = Release|x64
+		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|Mixed Platforms.Build.0 = Release|x64
 		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|Win32.ActiveCfg = Release|Win32
 		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|Win32.Build.0 = Release|Win32
 		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|x64.ActiveCfg = Release|x64
 		{6A066806-F43F-4B31-A4E3-57179674F460}.Release|x64.Build.0 = Release|x64
-		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Mixed Platforms.ActiveCfg = Release|x64
+		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Mixed Platforms.Build.0 = Release|x64
 		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|Win32.Build.0 = Debug|Win32
-		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x64.ActiveCfg = Debug|x64
-		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x64.Build.0 = Debug|x64
-		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x64.ActiveCfg = Release|x64
+		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Debug|x64.Build.0 = Release|x64
+		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Mixed Platforms.Build.0 = Release|x64
 		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Win32.ActiveCfg = Release|Win32
 		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Win32.Build.0 = Release|Win32
 		{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x64.ActiveCfg = Release|x64
@@ -183,16 +183,18 @@ Global
 		{104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Win32.ActiveCfg = Release|Win32
 		{104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|Win32.Build.0 = Release|Win32
 		{104FA3E9-94D9-4E1D-A941-28A03BC8A095}.Release|x64.ActiveCfg = Release|Win32
-		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|Mixed Platforms.ActiveCfg = Release|Win32
+		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|Mixed Platforms.Build.0 = Release|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|Win32.Build.0 = Debug|Win32
-		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|x64.ActiveCfg = Debug|x64
+		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|x64.ActiveCfg = Release|Win32
+		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Debug|x64.Build.0 = Release|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Release|Mixed Platforms.ActiveCfg = Release|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Release|Win32.ActiveCfg = Release|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Release|Win32.Build.0 = Release|Win32
 		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Release|x64.ActiveCfg = Release|Win32
+		{1B3BEA4C-CF75-438A-9693-60FB8444BBF3}.Release|x64.Build.0 = Release|Win32
 		{2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{2A1BC987-AF42-4500-802D-89CD32FC1309}.Debug|Win32.ActiveCfg = Debug|Win32
diff --git a/Code/OysterGraphics/Definitions/GraphicalDefinition.h b/Code/OysterGraphics/Definitions/GraphicalDefinition.h
index d6529c48..d7dbc9f0 100644
--- a/Code/OysterGraphics/Definitions/GraphicalDefinition.h
+++ b/Code/OysterGraphics/Definitions/GraphicalDefinition.h
@@ -14,12 +14,6 @@ namespace Oyster
 				Oyster::Math::Float3 normal;
 			};
 
-			struct VP
-			{
-				Oyster::Math::Matrix V;
-				Oyster::Math::Matrix P;
-			};
-
 			struct PerModel
 			{
 				Math::Matrix WV;
@@ -55,6 +49,13 @@ namespace Oyster
 				float Bright;
 			};
 
+			struct AnimationData
+			{
+				int Animated;
+				Math::Float3 Pad;
+				Math::Matrix animatedData[10];
+			};
+
 		}
 	}
 }
\ No newline at end of file
diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
index 0e38eeb2..196c7f8d 100644
--- a/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
+++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
@@ -82,8 +82,9 @@ namespace Oyster
 			Model::Model* m = new Model::Model();
 			m->WorldMatrix = Oyster::Math::Float4x4::identity;
 			m->Visible = true;
+			m->AnimationPlaying = -1;
 
-			m->info = Oyster::Resource::OysterResource::LoadResource(filename.c_str(),Oyster::Graphics::Loading::LoadDAN);
+			m->info = (Model::ModelInfo*)Oyster::Resource::OysterResource::LoadResource(filename.c_str(),Oyster::Graphics::Loading::LoadDAN);
 
 			Model::ModelInfo* mi = (Model::ModelInfo*)m->info;
 			if(mi->Vertices->GetBufferPointer() == NULL)
diff --git a/Code/OysterGraphics/FileLoader/DanLoader.cpp b/Code/OysterGraphics/FileLoader/DanLoader.cpp
index a0e1e56c..84676e5b 100644
--- a/Code/OysterGraphics/FileLoader/DanLoader.cpp
+++ b/Code/OysterGraphics/FileLoader/DanLoader.cpp
@@ -163,6 +163,7 @@ void Oyster::Graphics::Loading::LoadDAN(const wchar_t filename[], Oyster::Resour
 	// 
 	Oyster::Graphics::Model::ModelInfo* modelInfo = new Oyster::Graphics::Model::ModelInfo();
 	modelInfo->Indexed = false;
+	modelInfo->Animated = false;
 	// Open file in binary mode
 	std::ifstream danFile;
 	danFile.open(filename, std::ios::binary);
@@ -309,39 +310,16 @@ void Oyster::Graphics::Loading::LoadDAN(const wchar_t filename[], Oyster::Resour
 				delete[] buffer; // ( note: may crash here.)
 
 				//array for bone data
-				Oyster::Math::Matrix* bones = new Oyster::Math::Matrix[skeletonHeader.numBones*2];
+				Oyster::Graphics::Model::Bone* bones = new Oyster::Graphics::Model::Bone[skeletonHeader.numBones];
 				
 				//read bones
-				ReadData(bones,danFile,skeletonHeader.numBones * 2 * sizeof(Oyster::Math::Matrix));
+				ReadData(bones,danFile,skeletonHeader.numBones * sizeof(Oyster::Graphics::Model::Bone));
 
-				//init Graphics data
-				Oyster::Graphics::Core::Buffer* skeleton = new Oyster::Graphics::Core::Buffer();
-				Oyster::Graphics::Core::Buffer::BUFFER_INIT_DESC initDesc;
-				initDesc.ElementSize = sizeof(Oyster::Math::Matrix);
-				initDesc.InitData = bones;
-				initDesc.NumElements = skeletonHeader.numBones * 2;
-				initDesc.Type = Oyster::Graphics::Core::Buffer::BUFFER_TYPE::CONSTANT_BUFFER_VS;
-				initDesc.Usage = Oyster::Graphics::Core::Buffer::BUFFER_USAGE::BUFFER_USAGE_IMMUTABLE;
-
-				skeleton->Init(initDesc);
-
-				modelInfo->Skeleton = skeleton;
 
 				//read skeleton Hiarchy
-				
-				int* parents = new int[skeletonHeader.numBones];
-				ReadData(parents,danFile,skeletonHeader.numBones * sizeof(int));
-				
-				//store hiarchy
-				Oyster::Graphics::Model::Bone* Bones = new Oyster::Graphics::Model::Bone[skeletonHeader.numBones];
-				for(int i = 0; i < skeletonHeader.numBones; ++i)
-				{
-					Bones[i].Parent = parents[i];
-					Bones[i].Transform = bones[i];
-				}
 
 				modelInfo->BoneCount = skeletonHeader.numBones;
-				modelInfo->bones = Bones;
+				modelInfo->bones = bones;
 
 				break;
 			}
@@ -371,41 +349,44 @@ void Oyster::Graphics::Loading::LoadDAN(const wchar_t filename[], Oyster::Resour
 					anims[a].name = std::wstring(wName);
 					delete[] wName;
 
-					Oyster::Graphics::Model::Animation A = anims[a];
-
 					//read nr of bones in animation
-					ReadData(&A.Bones,danFile,4);
+					ReadData(&anims[a].Bones,danFile,4);
 
 					//create Frame array and Bone part of KeyFrameArray;
-					A.Frames = new int[A.Bones];
-					A.Keyframes = new Oyster::Graphics::Model::Frame*[A.Bones];
+					anims[a].Frames = new int[anims[a].Bones];
+					anims[a].Keyframes = new Oyster::Graphics::Model::Frame*[anims[a].Bones];
 					
 					//loop per bone and gather data
-					for(int b = 0; b < A.Bones; ++b)
+					for(int b = 0; b < anims[a].Bones; ++b)
 					{
-						//read nr of frames per bone
-						ReadData(&A.Frames[b],danFile,4);
-
-						//create frame matrix
-						A.Keyframes[b] = new Oyster::Graphics::Model::Frame[A.Frames[b]];
-
+						
 						//read bone index
 						int boneIndex;
 						ReadData(&boneIndex,danFile,4);
 
-						for(int f = 0; f < A.Frames[b]; ++f)
+						//read nr of frames per bone
+						ReadData(&anims[a].Frames[b],danFile,4);
+
+						//create frame matrix
+						anims[a].Keyframes[b] = new Oyster::Graphics::Model::Frame[anims[a].Frames[b]];
+
+
+						for(int f = 0; f < anims[a].Frames[b]; ++f)
 						{
 							//write index of bone
-							A.Keyframes[b][f].bone.Parent = boneIndex;
+							anims[a].Keyframes[b][f].bone.Parent = boneIndex;
 
 							//read bone transform
-							ReadData(&A.Keyframes[b][f].bone.Transform,danFile,sizeof(Oyster::Math::Matrix));
+							ReadData(&anims[a].Keyframes[b][f].bone.Transform,danFile,sizeof(Oyster::Math::Matrix));
 
 							
-							ReadData(&A.Keyframes[b][f].time,danFile,sizeof(double));
+							ReadData(&anims[a].Keyframes[b][f].time,danFile,sizeof(double));
 						}
 					}
 				}
+				modelInfo->AnimationCount = animationHeader.numAnims;
+				modelInfo->Animations = anims;
+				modelInfo->Animated = true;
 
 				break;
 			}
diff --git a/Code/OysterGraphics/Model/Model.h b/Code/OysterGraphics/Model/Model.h
index 0103b143..f4639c74 100644
--- a/Code/OysterGraphics/Model/Model.h
+++ b/Code/OysterGraphics/Model/Model.h
@@ -9,12 +9,14 @@ namespace Oyster
 	{
 		namespace Model
 		{
+			struct ModelInfo;
 			struct Model
 			{
-				//! do not Edit, linked to render data
-				void* info;
+				ModelInfo* info;
 				Oyster::Math::Float4x4 WorldMatrix;
-				bool Visible;
+				bool Visible, LoopAnimation;
+				int AnimationPlaying;
+				float AnimationTime;
 			};
 		}
 		
diff --git a/Code/OysterGraphics/Model/ModelInfo.h b/Code/OysterGraphics/Model/ModelInfo.h
index 9afa9e21..27efe0bb 100644
--- a/Code/OysterGraphics/Model/ModelInfo.h
+++ b/Code/OysterGraphics/Model/ModelInfo.h
@@ -31,8 +31,8 @@ namespace Oyster
 			struct ModelInfo
 			{
 				std::vector<ID3D11ShaderResourceView*> Material;
-				Core::Buffer *Vertices,*Indecies,*Skeleton;
-				bool Indexed;
+				Core::Buffer *Vertices,*Indecies;
+				bool Indexed, Animated;
 				int VertexCount, IndexCount, BoneCount, AnimationCount;
 				Bone* bones;
 				Animation* Animations;
diff --git a/Code/OysterGraphics/Render/Rendering/BasicRender.cpp b/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
index 1e76bc61..c1ab6024 100644
--- a/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
+++ b/Code/OysterGraphics/Render/Rendering/BasicRender.cpp
@@ -21,13 +21,7 @@ namespace Oyster
 					Preparations::Basic::ClearRTV(Resources::Deffered::GBufferRTV,Resources::Deffered::GBufferSize,Math::Float4(0,0,0,1));
 					Core::PipelineManager::SetRenderPass(Graphics::Render::Resources::Deffered::GeometryPass);
 
-					Definitions::VP vp;
-					vp.V = View;
-					vp.P = Projection;
-
-					void* data = Resources::Deffered::VPData.Map();
-					memcpy(data, &vp, sizeof(Definitions::VP));
-					Resources::Deffered::VPData.Unmap();
+					void* data;
 
 					Definitions::LightConstants lc;
 					lc.InvProj =  Projection.GetInverse();
@@ -61,10 +55,73 @@ namespace Oyster
 							void* data  = Resources::Deffered::ModelData.Map();
 							memcpy(data,&(pm),sizeof(pm));
 							Resources::Deffered::ModelData.Unmap();
-
 							
 							Model::ModelInfo* info = (Model::ModelInfo*)models[i].info;
 
+							
+
+							Definitions::AnimationData am;
+							if(info->Animated && models[i].AnimationPlaying != -1)
+							{
+								
+								Definitions::AnimationData am2;
+								//write default data
+								for (int b = 0; b < info->BoneCount; b++)
+								{
+									am2.animatedData[b] = info->bones[b].Transform;
+								}
+								//loop bones in animation
+								am.Animated = 1;
+								
+
+								for(int x = 0; x < info->Animations[models[i].AnimationPlaying].Bones; ++x)
+								{
+									Model::Frame Prev, Next;
+									//loop frame per bone
+									for(int y = 0; y < info->Animations[models[i].AnimationPlaying].Frames[x]; ++y)
+									{
+										///TODO replace with binary search?
+										Model::Frame f = info->Animations[models[i].AnimationPlaying].Keyframes[x][y];
+										
+										//if we hit frame
+										if(models[i].AnimationTime == f.time)
+										{
+											Prev = f;
+											Next = f;
+											break;
+										}
+
+										//if time is larger than frame time, store frames
+										if(models[i].AnimationTime < f.time)
+										{
+											Next = f;
+											Prev = info->Animations[models[i].AnimationPlaying].Keyframes[x][y-1];
+											break;
+										}
+									}
+
+
+									//calculate interpolated bone position
+									
+									//rebase model time to between prev and next
+									float interpoation =(models[i].AnimationTime - Prev.time) / (Next.time - Prev.time);
+
+									//interpolate
+									Math::Matrix Interpolated = Prev.bone.Transform;
+
+									//write magic to animated data
+									am2.animatedData[Prev.bone.Parent] =  Interpolated * am2.animatedData[info->bones[Prev.bone.Parent].Parent];
+									//sneaky write do correct data buffer
+									am.animatedData[x] = am2.animatedData[Prev.bone.Parent].GetInverse() * info->bones[Prev.bone.Parent].Transform;
+								}
+							}
+							else
+								am.Animated = 0;
+
+							data = Resources::Deffered::AnimationData.Map();
+							memcpy(data,&am,sizeof(Definitions::AnimationData));
+							Resources::Deffered::AnimationData.Unmap();
+
 							if(info->Material.size())
 							{
 								Core::deviceContext->PSSetShaderResources(0,(UINT)info->Material.size(),&(info->Material[0]));
@@ -84,6 +141,8 @@ namespace Oyster
 						}
 					}				
 				}
+
+
 				void Basic::EndFrame()
 				{
 					Core::PipelineManager::SetRenderPass(Resources::Deffered::LightPass);
diff --git a/Code/OysterGraphics/Render/Resources/Deffered.cpp b/Code/OysterGraphics/Render/Resources/Deffered.cpp
index f9a837a2..361a94dd 100644
--- a/Code/OysterGraphics/Render/Resources/Deffered.cpp
+++ b/Code/OysterGraphics/Render/Resources/Deffered.cpp
@@ -34,7 +34,7 @@ namespace Oyster
 				Shader::RenderPass Deffered::PostPass;
 
 				Buffer Deffered::ModelData = Buffer();
-				Buffer Deffered::VPData = Buffer();
+				Buffer Deffered::AnimationData = Buffer();
 				Buffer Deffered::LightConstantsData = Buffer();
 
 				Buffer Deffered::PointLightsData = Buffer();
@@ -74,8 +74,9 @@ namespace Oyster
 
 					ModelData.Init(desc);
 
-					desc.NumElements = 2;
-					VPData.Init(desc);
+					desc.NumElements = 1;
+					desc.ElementSize = sizeof(Definitions::AnimationData);
+					AnimationData.Init(desc);
 
 					desc.ElementSize = sizeof(Definitions::LightConstants);
 					desc.NumElements = 1;
@@ -254,7 +255,7 @@ namespace Oyster
 
 					Shader::CreateInputLayout(indesc,7,GetShader::Vertex(L"Geometry"),GeometryPass.IAStage.Layout);
 					GeometryPass.IAStage.Topology = D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-					GeometryPass.CBuffers.Vertex.push_back(VPData);
+					GeometryPass.CBuffers.Vertex.push_back(AnimationData);
 					GeometryPass.CBuffers.Vertex.push_back(ModelData);
 					GeometryPass.RenderStates.Rasterizer = rs;
 					GeometryPass.RenderStates.SampleCount = 1;
@@ -296,7 +297,7 @@ namespace Oyster
 				void Deffered::Clean()
 				{
 					Resources::Deffered::ModelData.~Buffer();
-					Resources::Deffered::VPData.~Buffer();
+					Resources::Deffered::AnimationData.~Buffer();
 					Resources::Deffered::LightConstantsData.~Buffer();
 					Resources::Deffered::PointLightsData.~Buffer();
 					SAFE_RELEASE(Resources::Deffered::PointLightView);
diff --git a/Code/OysterGraphics/Render/Resources/Deffered.h b/Code/OysterGraphics/Render/Resources/Deffered.h
index 9d8065e0..025da28b 100644
--- a/Code/OysterGraphics/Render/Resources/Deffered.h
+++ b/Code/OysterGraphics/Render/Resources/Deffered.h
@@ -36,7 +36,7 @@ namespace Oyster
 
 
 					static Core::Buffer ModelData;
-					static Core::Buffer VPData;
+					static Core::Buffer AnimationData;
 
 					static Core::Buffer LightConstantsData;
 
diff --git a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
index 18cac11d..95012a3b 100644
--- a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli	
+++ b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli	
@@ -30,11 +30,11 @@ Texture2D Normal		: register(t1);
 
 SamplerState S1 : register(s0);
 
-cbuffer PerFrame : register(b0)
+cbuffer Animation : register(b0)
 {
-	matrix View;
-	float4x4 Projection;
-	matrix VP;
+	int Animated;
+	float3 Pad;
+	float4x4 BoneAnimation[10];
 }
 
 cbuffer PerModel : register(b1)
diff --git a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl
index 8a361ccf..09312dbc 100644
--- a/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl	
+++ b/Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl	
@@ -3,6 +3,10 @@
 VertexOut main( VertexIn input )
 {
 	VertexOut output;
+	input.pos = mul(BoneAnimation[input.boneIndex.x], input.pos) * Animated + input.pos * int(1-Animated);
+		//float4x4 m = matrix(float4(1,0,0,0),float4(0,1,0,0), float4(0,0,1,0), float4(0,0,0,1));
+		//input.pos = mul(BoneAnimation[0], float4(input.pos,1));
+		//input.pos = mul(m, float4(input.pos,1));
 	output.pos = mul(WVP, float4(input.pos,1));
 	output.normal = mul(WV, float4(input.normal,0)).xyz;
 	output.UV = input.UV;
diff --git a/Code/Tester/MainTest.cpp b/Code/Tester/MainTest.cpp
index eb5b241e..3b4d94fe 100644
--- a/Code/Tester/MainTest.cpp
+++ b/Code/Tester/MainTest.cpp
@@ -162,8 +162,10 @@ HRESULT InitDirect3D()
 	m =  Oyster::Graphics::API::CreateModel(L"untitled.dan");
 	m2 = Oyster::Graphics::API::CreateModel(L"knee_noAnimation.dan");
 	m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
-	m3 = Oyster::Graphics::API::CreateModel(L"box_2.dan");
-	m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
+	m2->AnimationPlaying = 0;
+	m2->AnimationTime = 0.0f;
+	//m3 = Oyster::Graphics::API::CreateModel(L"box_2.dan");
+	//m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
 	
 
 	P = Oyster::Math3D::ProjectionMatrix_Perspective(Oyster::Math::pi/2,1280.0f/720.0f,.1f,10000);
@@ -189,13 +191,14 @@ HRESULT Update(float deltaTime)
 {
 
 	angle += Oyster::Math::pi/16 * deltaTime;
-	m->WorldMatrix =  Oyster::Math3D::RotationMatrix_AxisY(angle) * Oyster::Math3D::RotationMatrix_AxisX(-Oyster::Math::pi/2);
-	m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(1,0,0)*-angle,Oyster::Math::Float3(0,-4,0),Oyster::Math::Float3::null);
-	//Oyster::Math::Matrix ma = Oyster::Math::Matrix::identity;
-	//ma *= 5;
-	//ma.m44 = 1;
-	//m2->WorldMatrix = m2->WorldMatrix *ma;
-	m3->WorldMatrix =  Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(1,0,0)*-0,Oyster::Math::Float3(3,4,-1*angle),Oyster::Math::Float3::null);
+	//m->WorldMatrix =  Oyster::Math3D::RotationMatrix_AxisY(angle) * Oyster::Math3D::RotationMatrix_AxisX(-Oyster::Math::pi/2);
+	m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(0,1,0)*-Oyster::Math::pi/4,Oyster::Math::Float3(0,-4,0),Oyster::Math::Float3::null);
+	Oyster::Math::Matrix ma = Oyster::Math::Matrix::identity;
+	ma *= 50;
+	ma.m44 = 1;
+	m2->WorldMatrix = m2->WorldMatrix *  ma;
+	m2->AnimationTime += deltaTime * 0.5f;
+	//m3->WorldMatrix =  Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3(1,0,0)*-0,Oyster::Math::Float3(3,4,-1*angle),Oyster::Math::Float3::null);
 	return S_OK;
 }
 
@@ -204,9 +207,9 @@ HRESULT Render(float deltaTime)
 	Oyster::Graphics::API::SetView(V);
 	Oyster::Graphics::API::NewFrame();
 
-	Oyster::Graphics::API::RenderModel(*m);
+	//Oyster::Graphics::API::RenderModel(*m);
 	Oyster::Graphics::API::RenderModel(*m2);
-	Oyster::Graphics::API::RenderModel(*m3);
+	//Oyster::Graphics::API::RenderModel(*m3);
 
 	Oyster::Graphics::API::EndFrame();
 
diff --git a/Code/Tester/Tester.vcxproj b/Code/Tester/Tester.vcxproj
index 2f10fdc5..a4749cab 100644
--- a/Code/Tester/Tester.vcxproj
+++ b/Code/Tester/Tester.vcxproj
@@ -113,7 +113,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName)D.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>OysterGraphics_x86D.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName)D.dll;</DelayLoadDLLs>
     </Link>
     <ProjectReference>
       <LinkLibraryDependencies>
@@ -159,7 +159,7 @@
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <PreventDllBinding>true</PreventDllBinding>
-      <DelayLoadDLLs>OysterGraphics_x86.dll;</DelayLoadDLLs>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName).dll;</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -182,6 +182,7 @@
       <AdditionalDependencies>OysterGraphics_$(PlatformShortName).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)..\Bin\DLL;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <PreventDllBinding>true</PreventDllBinding>
+      <DelayLoadDLLs>OysterGraphics_$(PlatformShortName).dll;</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>