Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics

Conflicts:
	Code/Tester/MainTest.cpp

Code/OysterGraphics/DllInterfaces/GFXAPI.cpp

@@ -83,7 +83,7 @@ namespace Oyster
 			m->WorldMatrix = Oyster::Math::Float4x4::identity;
 			m->Visible = true;
 
-			m->info = Oyster::Resource::OysterResource::LoadResource(filename.c_str(),Oyster::Graphics::Loading::LoadOBJ);
+			m->info = Oyster::Resource::OysterResource::LoadResource(filename.c_str(),Oyster::Graphics::Loading::LoadDAN);
 
 			Model::ModelInfo* mi = (Model::ModelInfo*)m->info;
 			if(mi->Vertices->GetBufferPointer() == NULL)

Code/OysterGraphics/FileLoader/DanLoader.cpp

@@ -0,0 +1,307 @@
+#include "GeneralLoader.h"
+#include "../Definitions/GraphicalDefinition.h"
+#include "../Model/ModelInfo.h"
+#include "../Core/Core.h"
+#include <fstream>
+#include <string>
+
+#define DANFILEVERSIONMAJOR 1
+#define DANFILEVERSIONMINOR 1
+
+#define FILEHEADERSIZE		8
+#define VERTEXHEADERSIZE	4
+#define VERTEXSIZE			88
+
+
+
+/// 
+enum HeaderType
+{
+	VERTEXHEADER	= 0,	///< 
+	INDEXHEADER		= 1,	///<
+	MATERIALHEADER	= 2,	///<
+	SKELETONHEADER	= 3,	///<
+	ANIMATIONHEADER	= 4		///<
+};
+
+/// 
+struct FileHeader
+{
+	unsigned int versionMajor;	///< 
+	unsigned int versionMinor;	///< 
+
+	///
+	FileHeader(char* data)
+	{
+		char* memPos = data; //
+
+		memcpy(&versionMajor, memPos, sizeof(unsigned int));
+		memPos += 4;
+		memcpy(&versionMinor, memPos, sizeof(unsigned int));
+	}
+};
+
+///
+struct VertexHeader
+{
+	unsigned int numVertices;
+	
+	///
+	VertexHeader(char* data)
+	{
+		memcpy(&numVertices, data, sizeof(unsigned int));
+	}
+};
+
+///
+typedef Oyster::Graphics::Definitions::FinalVertex Vertex;
+
+///
+struct IndexHeader
+{
+	unsigned int numIndices;
+	
+	///
+	IndexHeader(char* data)
+	{
+		memcpy(&numIndices, data, sizeof(unsigned int));
+	}
+};
+
+///
+struct MaterialHeader
+{
+	unsigned int	diffuseMapPathLength;
+	char*			diffuseMapPath;
+
+	unsigned int	normalMapPathLength;
+	char*			normalMapPath;
+	/*
+	///
+	MaterialHeader(char* data)
+	{
+		char* memPos = data; //
+
+		memcpy(&diffuseMapPathLength, memPos, sizeof(unsigned int));
+		memPos += 4;
+
+		diffuseMapPath = new char[diffuseMapPathLength];
+		memcpy(diffuseMapPath, memPos, diffuseMapPathLength);
+		memPos += diffuseMapPathLength;
+
+		memcpy(&normalMapPathLength, memPos, sizeof(unsigned int));
+		memPos += 4;
+
+		normalMapPath = new char[normalMapPathLength];
+		memcpy(normalMapPath, memPos, normalMapPathLength);
+		memPos += normalMapPathLength;
+	}
+	*/
+};
+
+///
+struct SkeletonHeader
+{
+	// do this...
+};
+
+///
+struct AnimationHeader
+{
+	// do this...
+};
+
+struct Frame
+{
+	// do this...
+};
+
+///
+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;
+	wchar_t* wcstring = new wchar_t[origsize];
+    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
+	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.)
+
+				buffer = new char[materialHeader.diffuseMapPathLength];
+				danFile.read(buffer, materialHeader.diffuseMapPathLength);
+				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.)
+
+				buffer = new char[materialHeader.normalMapPathLength];
+				danFile.read(buffer, materialHeader.normalMapPathLength);
+				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;
+}

Code/OysterGraphics/FileLoader/GeneralLoader.h

@@ -29,6 +29,9 @@ namespace Oyster
 
 			void UnloadOBJ(void* loadedData);
 			void LoadOBJ(const wchar_t filename[], Oyster::Resource::CustomData& out);
+
+			void UnloadDAN(void* loadedData);
+			void LoadDAN(const wchar_t filename[], Oyster::Resource::CustomData& out);
 		}
 	}
 }

Code/OysterGraphics/Model/ModelInfo.h

@@ -16,7 +16,7 @@ namespace Oyster
 				std::vector<ID3D11ShaderResourceView*> Material;
 				Core::Buffer *Vertices,*Indecies;
 				bool Indexed;
-				int VertexCount;
+				int VertexCount, IndexCount;
 			};	
 		}
 	}

Code/OysterGraphics/OysterGraphics.vcxproj

@@ -176,6 +176,7 @@
     <ClCompile Include="Core\Init.cpp" />
     <ClCompile Include="Core\PipelineManager.cpp" />
     <ClCompile Include="DllInterfaces\GFXAPI.cpp" />
+    <ClCompile Include="FileLoader\DanLoader.cpp" />
     <ClCompile Include="FileLoader\ObjReader.cpp" />
     <ClCompile Include="FileLoader\ShaderLoader.cpp" />
     <ClCompile Include="FileLoader\ModelLoader.cpp" />

Code/OysterGraphics/Render/Rendering/BasicRender.cpp

@@ -75,7 +75,7 @@ namespace Oyster
 							if(info->Indexed)
 							{
 								info->Indecies->Apply();
-								Oyster::Graphics::Core::deviceContext->DrawIndexed(info->VertexCount,0,0);
+								Oyster::Graphics::Core::deviceContext->DrawIndexed(info->IndexCount,0,0);
 							}
 							else
 							{

Code/OysterGraphics/Render/Resources/Deffered.cpp

@@ -92,7 +92,7 @@ namespace Oyster
 					D3D11_RASTERIZER_DESC rdesc;
 					rdesc.CullMode = D3D11_CULL_BACK;
 					rdesc.FillMode = D3D11_FILL_SOLID;
-					rdesc.FrontCounterClockwise = true;
+					rdesc.FrontCounterClockwise = false;
 					rdesc.DepthBias = 0;
 					rdesc.DepthBiasClamp = 0;
 					rdesc.DepthClipEnable = true;
@@ -230,11 +230,14 @@ namespace Oyster
 					{
 						{ "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
 						{ "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-						{ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 20, D3D11_INPUT_PER_VERTEX_DATA, 0 }
+						{ "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 20, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-
+						{ "TANGENT", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 32, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+						{ "BITANGENT", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 44, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+						{ "BONEINDEX", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 56, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+						{ "BONEWEIGHT", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 72, D3D11_INPUT_PER_VERTEX_DATA, 0 }
 					};
 
-					Shader::CreateInputLayout(indesc,3,GetShader::Vertex(L"Geometry"),GeometryPass.IAStage.Layout);
+					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(ModelData);

Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli

@@ -3,15 +3,16 @@ struct VertexIn
 	float3 pos			: POSITION;
 	float2 UV			: TEXCOORD;
 	float3 normal		: NORMAL;
-	//float3 tangent		: TANGENT;
+	float3 tangent		: TANGENT;
-	//float3 biTangent	: BITANGENT;
+	float3 biTangent	: BITANGENT;
-	//float4 boneIndex	: BONEINDEX;
+	float4 boneIndex	: BONEINDEX;
-	//float4 boneWeight	: BONEWEIGHT;
+	float4 boneWeight	: BONEWEIGHT;
 };
 
 struct VertexOut
 {
 	float4 pos			: SV_POSITION;
+	//float4 ViewPos		: POSITION;
 	float2 UV			: TEXCOORD;
 	float3 normal		: NORMAL;
 	//float3 tangent		: TANGENT;

Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightCalc.hlsli

@@ -21,8 +21,8 @@ DiffSpec LightCalc(PointLight pl, float3 pos, int2 texCoord)
 		output.Specular * 0;
 	if(d > pl.Radius)
 	{
-		output.Diffuse = float3(0,0,0);
+		output.Diffuse = float4(0,0,0,1);
-		output.Specular = float3(0,0,0);
+		output.Specular = float4(0,0,0,1);
 	}
 	return output;  
 }

Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl

@@ -12,13 +12,13 @@
 [numthreads(16, 16, 1)]
 void main( uint3 DTid : SV_DispatchThreadID, uint3 GTid : SV_GroupThreadID )
 {
-	float2 UV = DTid.xy / Pixels;
+	float2 UV = DTid / Pixels;
 	UV.x =	UV.x * 2 - 1;
 	UV.y = 1 - 2 * UV.y;
 	float3 ViewPos = ToVpos(DTid.xy, UV);
 	DiffSpec Shaded;
-	Shaded.Diffuse = float3(0,0,0);
+	Shaded.Diffuse = float4(0,0,0,0);
-	Shaded.Specular = float3(0,0,0);
+	Shaded.Specular = float4(0,0,0,0);
 
 	for(int i = 0; i < Lights; ++i)
 	{

Code/OysterGraphics/Shader/HLSL/Deffered Shaders/SSAO.hlsli

@@ -24,7 +24,7 @@ float GetSSAO(float3 pos, float2 uv, int2 texCoord2, uint2 rndID)
 		float4 ProjOffset = sampled;
 		ProjOffset = mul(Proj, ProjOffset);
 		float4 offset = ProjOffset;
-		float2 UV = offset.xy;
+		float2 UV = offset;
 		offset /= offset.w;
 		offset.xyz = offset.xyz * 0.5f + 0.5f;
 		//extra invert y axis, DX11

Code/Tester/MainTest.cpp

@@ -159,12 +159,10 @@ HRESULT InitDirect3D()
 		return E_FAIL;
 	}
 	
-	m =  Oyster::Graphics::API::CreateModel(L"crate2");
+	m =  Oyster::Graphics::API::CreateModel(L"cube_tri.dan");
-	if(m==NULL)
+	m2 = Oyster::Graphics::API::CreateModel(L"cube_tri.dan");
-		m =  Oyster::Graphics::API::CreateModel(L"christmastree");
-	m2 = Oyster::Graphics::API::CreateModel(L"christmastree");
 	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"christmastree");
+	m3 = Oyster::Graphics::API::CreateModel(L"cube_tri.dan");
 	m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);