hw3d/Plane.h

+#pragma once
+
+#include <optional>
+#include "Vertex.h"
+#include "IndexedTriangleList.h"
+#include <DirectXMath.h>
+#include "ChiliMath.h"
+#include <array>
+
+class Plane
+{
+public:
+	static IndexedTriangleList MakeTesselatedTextured( Dvtx::VertexLayout layout,int divisions_x,int divisions_y )
+	{
+		namespace dx = DirectX;
+		assert( divisions_x >= 1 );
+		assert( divisions_y >= 1 );
+
+		constexpr float width = 2.0f;
+		constexpr float height = 2.0f;
+		const int nVertices_x = divisions_x + 1;
+		const int nVertices_y = divisions_y + 1;
+		Dvtx::VertexBuffer vb{ std::move( layout ) };
+
+		{
+			const float side_x = width / 2.0f;
+			const float side_y = height / 2.0f;
+			const float divisionSize_x = width / float( divisions_x );
+			const float divisionSize_y = height / float( divisions_y );
+			const float divisionSize_x_tc = 1.0f / float( divisions_x );
+			const float divisionSize_y_tc = 1.0f / float( divisions_y );
+
+			for( int y = 0,i = 0; y < nVertices_y; y++ )
+			{
+				const float y_pos = float( y ) * divisionSize_y - side_y;
+				const float y_pos_tc = 1.0f - float( y ) * divisionSize_y_tc;
+				for( int x = 0; x < nVertices_x; x++,i++ )
+				{
+					const float x_pos = float( x ) * divisionSize_x - side_x;
+					const float x_pos_tc = float( x ) * divisionSize_x_tc;
+					vb.EmplaceBack(
+						dx::XMFLOAT3{ x_pos,y_pos,0.0f },
+						dx::XMFLOAT3{ 0.0f,0.0f,-1.0f },
+						dx::XMFLOAT2{ x_pos_tc,y_pos_tc }
+					);
+				}
+			}
+		}
+
+		std::vector<unsigned short> indices;
+		indices.reserve( sq( divisions_x * divisions_y ) * 6 );
+		{
+			const auto vxy2i = [nVertices_x]( size_t x,size_t y )
+			{
+				return (unsigned short)(y * nVertices_x + x);
+			};
+			for( size_t y = 0; y < divisions_y; y++ )
+			{
+				for( size_t x = 0; x < divisions_x; x++ )
+				{
+					const std::array<unsigned short,4> indexArray =
+					{ vxy2i( x,y ),vxy2i( x + 1,y ),vxy2i( x,y + 1 ),vxy2i( x + 1,y + 1 ) };
+					indices.push_back( indexArray[0] );
+					indices.push_back( indexArray[2] );
+					indices.push_back( indexArray[1] );
+					indices.push_back( indexArray[1] );
+					indices.push_back( indexArray[2] );
+					indices.push_back( indexArray[3] );
+				}
+			}
+		}
+
+		return{ std::move( vb ),std::move( indices ) };
+	}
+	static IndexedTriangleList Make()
+	{
+		using Dvtx::VertexLayout;
+		VertexLayout vl;
+		vl.Append( VertexLayout::Position3D );
+		vl.Append( VertexLayout::Normal );
+		vl.Append( VertexLayout::Texture2D );
+
+		return MakeTesselatedTextured( std::move( vl ),1,1 );
+	}
+};

hw3d/PointLight.cpp

@@ -39,7 +39,7 @@ void PointLight::SpawnControlWindow() noexcept
 void PointLight::Reset() noexcept
 {
 	cbData = {
-		{ 1.5f,14.0f,-4.5f },
+		{ 0.0f,4.0f,-4.5f },
 		{ 0.05f,0.05f,0.05f },
 		{ 1.0f,1.0f,1.0f },
 		1.0f,

hw3d/SolidPS.hlsl

-cbuffer CBuf
+cbuffer CBuf : register(b1)
 {
 	float4 color;
 };

hw3d/SolidSphere.cpp

@@ -27,7 +27,7 @@ SolidSphere::SolidSphere( Graphics& gfx,float radius )
 		dx::XMFLOAT3 color = { 1.0f,1.0f,1.0f };
 		float padding;
 	} colorConst;
-	AddBind( PixelConstantBuffer<PSColorConstant>::Resolve( gfx,colorConst ) );
+	AddBind( PixelConstantBuffer<PSColorConstant>::Resolve( gfx,colorConst,1u ) );
 
 	AddBind( InputLayout::Resolve( gfx,model.vertices.GetLayout(),pvsbc ) );
 

hw3d/TestCube.cpp

+#include "TestCube.h"
+#include "Cube.h"
+#include "BindableCommon.h"
+#include "TransformCbufDoubleboi.h"
+#include "imgui/imgui.h"
+
+TestCube::TestCube( Graphics& gfx,float size )
+{
+	using namespace Bind;
+	namespace dx = DirectX;
+
+	auto model = Cube::MakeIndependentTextured();
+	model.Transform( dx::XMMatrixScaling( size,size,size ) );
+	model.SetNormalsIndependentFlat();
+	const auto geometryTag = "$cube." + std::to_string( size );
+	AddBind( VertexBuffer::Resolve( gfx,geometryTag,model.vertices ) );
+	AddBind( IndexBuffer::Resolve( gfx,geometryTag,model.indices ) );
+
+	AddBind( Texture::Resolve( gfx,"Images\\brickwall.jpg" ) );
+	AddBind( Texture::Resolve( gfx,"Images\\brickwall_normal.jpg",1u ) );
+
+	auto pvs = VertexShader::Resolve( gfx,"PhongVS.cso" );
+	auto pvsbc = pvs->GetBytecode();
+	AddBind( std::move( pvs ) );
+
+	AddBind( PixelShader::Resolve( gfx,"PhongPSNormalMap.cso" ) );
+
+	AddBind( PixelConstantBuffer<PSMaterialConstant>::Resolve( gfx,pmc,1u ) );
+
+	AddBind( InputLayout::Resolve( gfx,model.vertices.GetLayout(),pvsbc ) );
+
+	AddBind( Topology::Resolve( gfx,D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST ) );
+
+	AddBind( std::make_shared<TransformCbufDoubleboi>( gfx,*this,0u,2u ) );
+}
+
+void TestCube::SetPos( DirectX::XMFLOAT3 pos ) noexcept
+{
+	this->pos = pos;
+}
+
+void TestCube::SetRotation( float roll,float pitch,float yaw ) noexcept
+{
+	this->roll = roll;
+	this->pitch = pitch;
+	this->yaw = yaw;
+}
+
+DirectX::XMMATRIX TestCube::GetTransformXM() const noexcept
+{
+	return DirectX::XMMatrixRotationRollPitchYaw( roll,pitch,yaw ) *
+		DirectX::XMMatrixTranslation( pos.x,pos.y,pos.z );
+}
+
+void TestCube::SpawnControlWindow( Graphics& gfx ) noexcept
+{
+	if( ImGui::Begin( "Cube" ) )
+	{
+		ImGui::Text( "Position" );
+		ImGui::SliderFloat( "X",&pos.x,-80.0f,80.0f,"%.1f" );
+		ImGui::SliderFloat( "Y",&pos.y,-80.0f,80.0f,"%.1f" );
+		ImGui::SliderFloat( "Z",&pos.z,-80.0f,80.0f,"%.1f" );
+		ImGui::Text( "Orientation" );
+		ImGui::SliderAngle( "Roll",&roll,-180.0f,180.0f );
+		ImGui::SliderAngle( "Pitch",&pitch,-180.0f,180.0f );
+		ImGui::SliderAngle( "Yaw",&yaw,-180.0f,180.0f );
+		ImGui::Text( "Shading" );
+		bool changed0 = ImGui::SliderFloat( "Spec. Int.",&pmc.specularIntensity,0.0f,1.0f );
+		bool changed1 = ImGui::SliderFloat( "Spec. Power",&pmc.specularPower,0.0f,100.0f );
+		bool checkState = pmc.normalMappingEnabled == TRUE;
+		bool changed2 = ImGui::Checkbox( "Enable Normal Map",&checkState );
+		pmc.normalMappingEnabled = checkState ? TRUE : FALSE;
+		if( changed0 || changed1 || changed2 )
+		{
+			QueryBindable<Bind::PixelConstantBuffer<PSMaterialConstant>>()->Update( gfx,pmc );
+		}
+	}
+	ImGui::End();
+}

hw3d/TestCube.h

+#pragma once
+#include "Drawable.h"
+
+class TestCube : public Drawable
+{
+public:
+	TestCube( Graphics& gfx,float size );
+	void SetPos( DirectX::XMFLOAT3 pos ) noexcept;
+	void SetRotation( float roll,float pitch,float yaw ) noexcept;
+	DirectX::XMMATRIX GetTransformXM() const noexcept override;
+	void SpawnControlWindow( Graphics& gfx ) noexcept;
+private:
+	struct PSMaterialConstant
+	{
+		float specularIntensity = 0.1f;
+		float specularPower = 20.0f;
+		BOOL normalMappingEnabled = TRUE;
+		float padding[1];
+	} pmc;
+	DirectX::XMFLOAT3 pos = { 1.0f,1.0f,1.0f };
+	float roll = 0.0f;
+	float pitch = 0.0f;
+	float yaw = 0.0f;
+};
\ No newline at end of file

hw3d/TestPlane.cpp

+#include "TestPlane.h"
+#include "Plane.h"
+#include "BindableCommon.h"
+#include "imgui/imgui.h"
+#include "TransformCbufDoubleboi.h"
+
+TestPlane::TestPlane( Graphics& gfx,float size )
+{
+	using namespace Bind;
+	namespace dx = DirectX;
+
+	auto model = Plane::Make();
+	model.Transform( dx::XMMatrixScaling( size,size,1.0f ) );
+	const auto geometryTag = "$plane." + std::to_string( size );
+	AddBind( VertexBuffer::Resolve( gfx,geometryTag,model.vertices ) );
+	AddBind( IndexBuffer::Resolve( gfx,geometryTag,model.indices ) );
+
+	AddBind( Texture::Resolve( gfx,"Images\\brickwall.jpg" ) );
+	AddBind( Texture::Resolve( gfx,"Images\\brickwall_normal.jpg",1u ) );
+
+	auto pvs = VertexShader::Resolve( gfx,"PhongVS.cso" );
+	auto pvsbc = pvs->GetBytecode();
+	AddBind( std::move( pvs ) );
+
+	AddBind( PixelShader::Resolve( gfx,"PhongPSNormalMapObject.cso" ) );
+
+	AddBind( PixelConstantBuffer<PSMaterialConstant>::Resolve( gfx,pmc,1u ) );
+
+	AddBind( InputLayout::Resolve( gfx,model.vertices.GetLayout(),pvsbc ) );
+
+	AddBind( Topology::Resolve( gfx,D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST ) );
+
+	AddBind( std::make_shared<TransformCbufDoubleboi>( gfx,*this,0u,2u ) );
+}
+
+void TestPlane::SetPos( DirectX::XMFLOAT3 pos ) noexcept
+{
+	this->pos = pos;
+}
+
+void TestPlane::SetRotation( float roll,float pitch,float yaw ) noexcept
+{
+	this->roll = roll;
+	this->pitch = pitch;
+	this->yaw = yaw;
+}
+
+DirectX::XMMATRIX TestPlane::GetTransformXM() const noexcept
+{
+	return DirectX::XMMatrixRotationRollPitchYaw( roll,pitch,yaw ) *
+		DirectX::XMMatrixTranslation( pos.x,pos.y,pos.z );
+}
+
+void TestPlane::SpawnControlWindow( Graphics& gfx ) noexcept
+{
+	if( ImGui::Begin( "Plane" ) )
+	{
+		ImGui::Text( "Position" );
+		ImGui::SliderFloat( "X",&pos.x,-80.0f,80.0f,"%.1f" );
+		ImGui::SliderFloat( "Y",&pos.y,-80.0f,80.0f,"%.1f" );
+		ImGui::SliderFloat( "Z",&pos.z,-80.0f,80.0f,"%.1f" );
+		ImGui::Text( "Orientation" );
+		ImGui::SliderAngle( "Roll",&roll,-180.0f,180.0f );
+		ImGui::SliderAngle( "Pitch",&pitch,-180.0f,180.0f );
+		ImGui::SliderAngle( "Yaw",&yaw,-180.0f,180.0f );
+		ImGui::Text( "Shading" );
+		bool changed0 = ImGui::SliderFloat( "Spec. Int.",&pmc.specularIntensity,0.0f,1.0f );
+		bool changed1 = ImGui::SliderFloat( "Spec. Power",&pmc.specularPower,0.0f,100.0f );
+		bool checkState = pmc.normalMappingEnabled == TRUE;
+		bool changed2 = ImGui::Checkbox( "Enable Normal Map",&checkState );
+		pmc.normalMappingEnabled = checkState ? TRUE : FALSE;
+		if( changed0 || changed1 || changed2 )
+		{
+			QueryBindable<Bind::PixelConstantBuffer<PSMaterialConstant>>()->Update( gfx,pmc );
+		}
+	}
+	ImGui::End();
+}

hw3d/TestPlane.h

+#pragma once
+#include "Drawable.h"
+
+class TestPlane : public Drawable
+{
+public:
+	TestPlane( Graphics& gfx,float size );
+	void SetPos( DirectX::XMFLOAT3 pos ) noexcept;
+	void SetRotation( float roll,float pitch,float yaw ) noexcept;
+	DirectX::XMMATRIX GetTransformXM() const noexcept override;
+	void SpawnControlWindow( Graphics& gfx ) noexcept;
+private:
+	struct PSMaterialConstant
+	{
+		float specularIntensity = 0.18f;
+		float specularPower = 18.0f;
+		BOOL normalMappingEnabled = TRUE;
+		float padding[1];
+	} pmc;
+	DirectX::XMFLOAT3 pos = { 0.0f,0.0f,0.0f };
+	float roll = 0.0f;
+	float pitch = 0.0f;
+	float yaw = 0.0f;
+};
\ No newline at end of file

hw3d/TransformCbuf.cpp

@@ -13,18 +13,26 @@ namespace Bind
 	}
 
 	void TransformCbuf::Bind( Graphics& gfx ) noexcept
+	{
+		UpdateBindImpl( gfx,GetTransforms( gfx ) );
+	}
+
+	void TransformCbuf::UpdateBindImpl( Graphics& gfx,const Transforms& tf ) noexcept
+	{
+		pVcbuf->Update( gfx,tf );
+		pVcbuf->Bind( gfx );
+	}
+
+	TransformCbuf::Transforms TransformCbuf::GetTransforms( Graphics& gfx ) noexcept
 	{
 		const auto modelView = parent.GetTransformXM() * gfx.GetCamera();
-		const Transforms tf =
-		{
+		return {
 			DirectX::XMMatrixTranspose( modelView ),
 			DirectX::XMMatrixTranspose(
 				modelView *
 				gfx.GetProjection()
 			)
 		};
-		pVcbuf->Update( gfx,tf );
-		pVcbuf->Bind( gfx );
 	}
 
 	std::unique_ptr<VertexConstantBuffer<TransformCbuf::Transforms>> TransformCbuf::pVcbuf;

hw3d/TransformCbuf.h

@@ -7,15 +7,18 @@ namespace Bind
 {
 	class TransformCbuf : public Bindable
 	{
-	private:
+	protected:
 		struct Transforms
 		{
+			DirectX::XMMATRIX modelView;
 			DirectX::XMMATRIX modelViewProj;
-			DirectX::XMMATRIX model;
 		};
 	public:
 		TransformCbuf( Graphics& gfx,const Drawable& parent,UINT slot = 0u );
 		void Bind( Graphics& gfx ) noexcept override;
+	protected:
+		void UpdateBindImpl( Graphics& gfx,const Transforms& tf ) noexcept;
+		Transforms GetTransforms( Graphics& gfx ) noexcept;
 	private:
 		static std::unique_ptr<VertexConstantBuffer<Transforms>> pVcbuf;
 		const Drawable& parent;

hw3d/TransformCbufDoubleboi.cpp

+#include "TransformCbufDoubleboi.h"
+
+namespace Bind
+{
+	TransformCbufDoubleboi::TransformCbufDoubleboi( Graphics& gfx,const Drawable& parent,UINT slotV,UINT slotP )
+		:
+		TransformCbuf( gfx,parent,slotV )
+	{
+		if( !pPcbuf )
+		{
+			pPcbuf = std::make_unique<PixelConstantBuffer<Transforms>>( gfx,slotP );
+		}
+	}
+
+	void Bind::TransformCbufDoubleboi::Bind( Graphics& gfx ) noexcept
+	{
+		const auto tf = GetTransforms( gfx );
+		TransformCbuf::UpdateBindImpl( gfx,tf );
+		UpdateBindImpl( gfx,tf );
+	}
+
+	void TransformCbufDoubleboi::UpdateBindImpl( Graphics& gfx,const Transforms& tf ) noexcept
+	{
+		pPcbuf->Update( gfx,tf );
+		pPcbuf->Bind( gfx );
+	}
+
+	std::unique_ptr<PixelConstantBuffer<TransformCbuf::Transforms>> TransformCbufDoubleboi::pPcbuf;
+}
\ No newline at end of file

hw3d/TransformCbufDoubleboi.h

+#pragma once
+#include "TransformCbuf.h"
+
+namespace Bind
+{
+	class TransformCbufDoubleboi : public TransformCbuf
+	{
+	public:
+		TransformCbufDoubleboi( Graphics& gfx,const Drawable& parent,UINT slotV = 0u,UINT slotP = 0u );
+		void Bind( Graphics& gfx ) noexcept override;
+	protected:
+		void UpdateBindImpl( Graphics& gfx,const Transforms& tf ) noexcept;
+	private:
+		static std::unique_ptr<PixelConstantBuffer<Transforms>> pPcbuf;
+	};
+}
\ No newline at end of file

hw3d/Vertex.cpp

@@ -71,6 +71,10 @@ namespace Dvtx
 			return sizeof( Map<Texture2D>::SysType );
 		case Normal:
 			return sizeof( Map<Normal>::SysType );
+		case Tangent:
+			return sizeof( Map<Tangent>::SysType );
+		case Bitangent:
+			return sizeof( Map<Bitangent>::SysType );
 		case Float3Color:
 			return sizeof( Map<Float3Color>::SysType );
 		case Float4Color:
@@ -97,6 +101,10 @@ namespace Dvtx
 			return Map<Texture2D>::code;
 		case Normal:
 			return Map<Normal>::code;
+		case Tangent:
+			return Map<Tangent>::code;
+		case Bitangent:
+			return Map<Bitangent>::code;
 		case Float3Color:
 			return Map<Float3Color>::code;
 		case Float4Color:
@@ -119,6 +127,10 @@ namespace Dvtx
 			return GenerateDesc<Texture2D>( GetOffset() );
 		case Normal:
 			return GenerateDesc<Normal>( GetOffset() );
+		case Tangent:
+			return GenerateDesc<Tangent>( GetOffset() );
+		case Bitangent:
+			return GenerateDesc<Bitangent>( GetOffset() );
 		case Float3Color:
 			return GenerateDesc<Float3Color>( GetOffset() );
 		case Float4Color:
@@ -146,10 +158,20 @@ namespace Dvtx
 
 
 	// VertexBuffer
-	VertexBuffer::VertexBuffer( VertexLayout layout ) noxnd
+	VertexBuffer::VertexBuffer( VertexLayout layout,size_t size ) noxnd
 		:
 		layout( std::move( layout ) )
-	{}
+	{
+		Resize( size );
+	}
+	void VertexBuffer::Resize( size_t newSize ) noxnd
+	{
+		const auto size = Size();
+		if( size < newSize )
+		{
+			buffer.resize( buffer.size() + layout.Size() * (newSize - size) );
+		}
+	}
 	const char* VertexBuffer::GetData() const noxnd
 	{
 		return buffer.data();

hw3d/Vertex.h

@@ -16,6 +16,8 @@ namespace Dvtx
 			Position3D,
 			Texture2D,
 			Normal,
+			Tangent,
+			Bitangent,
 			Float3Color,
 			Float4Color,
 			BGRAColor,
@@ -50,6 +52,20 @@ namespace Dvtx
 			static constexpr const char* semantic = "Normal";
 			static constexpr const char* code = "N";
 		};
+		template<> struct Map<Tangent>
+		{
+			using SysType = DirectX::XMFLOAT3;
+			static constexpr DXGI_FORMAT dxgiFormat = DXGI_FORMAT_R32G32B32_FLOAT;
+			static constexpr const char* semantic = "Tangent";
+			static constexpr const char* code = "Nt";
+		};
+		template<> struct Map<Bitangent>
+		{
+			using SysType = DirectX::XMFLOAT3;
+			static constexpr DXGI_FORMAT dxgiFormat = DXGI_FORMAT_R32G32B32_FLOAT;
+			static constexpr const char* semantic = "Bitangent";
+			static constexpr const char* code = "Nb";
+		};
 		template<> struct Map<Float3Color>
 		{
 			using SysType = DirectX::XMFLOAT3;
@@ -146,6 +162,12 @@ namespace Dvtx
 			case VertexLayout::Normal:
 				SetAttribute<VertexLayout::Normal>( pAttribute,std::forward<T>( val ) );
 				break;
+			case VertexLayout::Tangent:
+				SetAttribute<VertexLayout::Tangent>( pAttribute,std::forward<T>( val ) );
+				break;
+			case VertexLayout::Bitangent:
+				SetAttribute<VertexLayout::Bitangent>( pAttribute,std::forward<T>( val ) );
+				break;
 			case VertexLayout::Float3Color:
 				SetAttribute<VertexLayout::Float3Color>( pAttribute,std::forward<T>( val ) );
 				break;
@@ -204,9 +226,10 @@ namespace Dvtx
 	class VertexBuffer
 	{
 	public:
-		VertexBuffer( VertexLayout layout ) noxnd;
+		VertexBuffer( VertexLayout layout,size_t size = 0u ) noxnd;
 		const char* GetData() const noxnd;
 		const VertexLayout& GetLayout() const noexcept;
+		void Resize( size_t newSize ) noxnd;
 		size_t Size() const noxnd;
 		size_t SizeBytes() const noxnd;
 		template<typename ...Params>

hw3d/hw3d.vcxproj

@@ -112,15 +112,27 @@
     <ClCompile Include="InputLayout.cpp" />
     <ClCompile Include="Keyboard.cpp" />
     <ClCompile Include="Mesh.cpp" />
+    <FxCompile Include="PhongPSNormalMapObject.hlsl">
+      <FileType>Document</FileType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
+    </FxCompile>
     <ClCompile Include="PointLight.cpp" />
     <ClCompile Include="Mouse.cpp" />
     <ClCompile Include="PixelShader.cpp" />
     <ClCompile Include="Sampler.cpp" />
     <ClCompile Include="SolidSphere.cpp" />
     <ClCompile Include="Surface.cpp" />
+    <ClCompile Include="TestCube.cpp" />
+    <ClCompile Include="TestPlane.cpp" />
     <ClCompile Include="Texture.cpp" />
     <ClCompile Include="Topology.cpp" />
     <ClCompile Include="TransformCbuf.cpp" />
+    <ClCompile Include="TransformCbufDoubleboi.cpp" />
     <ClCompile Include="Vertex.cpp" />
     <ClCompile Include="VertexBuffer.cpp" />
     <ClCompile Include="VertexShader.cpp" />
@@ -141,6 +153,8 @@
     <ClInclude Include="Color.h" />
     <ClInclude Include="ConditionalNoexcept.h" />
     <ClInclude Include="ConstantBuffers.h" />
+    <ClInclude Include="Cube.h" />
+    <ClInclude Include="TestCube.h" />
     <ClInclude Include="Drawable.h" />
     <ClInclude Include="dxerr.h" />
     <ClInclude Include="DxgiInfoManager.h" />
@@ -161,6 +175,7 @@
     <ClInclude Include="InputLayout.h" />
     <ClInclude Include="Keyboard.h" />
     <ClInclude Include="Mesh.h" />
+    <ClInclude Include="Plane.h" />
     <ClInclude Include="PointLight.h" />
     <ClInclude Include="Mouse.h" />
     <ClInclude Include="PixelShader.h" />
@@ -169,9 +184,11 @@
     <ClInclude Include="SolidSphere.h" />
     <ClInclude Include="Sphere.h" />
     <ClInclude Include="Surface.h" />
+    <ClInclude Include="TestPlane.h" />
     <ClInclude Include="Texture.h" />
     <ClInclude Include="Topology.h" />
     <ClInclude Include="TransformCbuf.h" />
+    <ClInclude Include="TransformCbufDoubleboi.h" />
     <ClInclude Include="Vertex.h" />
     <ClInclude Include="VertexBuffer.h" />
     <ClInclude Include="VertexShader.h" />
@@ -191,7 +208,7 @@
     <None Include="DXTrace.inl" />
   </ItemGroup>
   <ItemGroup>
-    <FxCompile Include="PhongPSSpecMap.hlsl">
+    <FxCompile Include="PhongPSNormalMap.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
@@ -199,6 +216,22 @@
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
     </FxCompile>
+    <FxCompile Include="PhongPSSpecNormalMap.hlsl">
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
+    <FxCompile Include="PhongVSNormalMap.hlsl">
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+    </FxCompile>
     <FxCompile Include="SolidPS.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>

hw3d/hw3d.vcxproj.filters

@@ -150,6 +150,15 @@
     <ClCompile Include="Mesh.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="TestPlane.cpp">
+      <Filter>Source Files\Drawable</Filter>
+    </ClCompile>
+    <ClCompile Include="TransformCbufDoubleboi.cpp">
+      <Filter>Source Files\Bindable</Filter>
+    </ClCompile>
+    <ClCompile Include="TestCube.cpp">
+      <Filter>Source Files\Drawable</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="WindowsMessageMap.h">
@@ -299,6 +308,21 @@
     <ClInclude Include="BindableCodex.h">
       <Filter>Header Files\Bindable</Filter>
     </ClInclude>
+    <ClInclude Include="Plane.h">
+      <Filter>Header Files\Geometry</Filter>
+    </ClInclude>
+    <ClInclude Include="TestPlane.h">
+      <Filter>Header Files\Drawable</Filter>
+    </ClInclude>
+    <ClInclude Include="TransformCbufDoubleboi.h">
+      <Filter>Header Files\Bindable</Filter>
+    </ClInclude>
+    <ClInclude Include="Cube.h">
+      <Filter>Header Files\Geometry</Filter>
+    </ClInclude>
+    <ClInclude Include="TestCube.h">
+      <Filter>Header Files\Drawable</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="hw3d.rc">
@@ -334,7 +358,16 @@
     <FxCompile Include="SolidVS.hlsl">
       <Filter>Shader</Filter>
     </FxCompile>
-    <FxCompile Include="PhongPSSpecMap.hlsl">
+    <FxCompile Include="PhongPSNormalMap.hlsl">
+      <Filter>Shader</Filter>
+    </FxCompile>
+    <FxCompile Include="PhongVSNormalMap.hlsl">
+      <Filter>Shader</Filter>
+    </FxCompile>
+    <FxCompile Include="PhongPSSpecNormalMap.hlsl">
+      <Filter>Shader</Filter>
+    </FxCompile>
+    <FxCompile Include="PhongPSNormalMapObject.hlsl">
       <Filter>Shader</Filter>
     </FxCompile>
   </ItemGroup>