modify code to draw cube

StudyDx/Graphics.cpp

@@ -116,6 +116,7 @@ void Graphics::DrawTestTriangle(float angle, float x, float y)
 		{
 			float x;
 			float y;
+			float z;
 		} pos;
 		struct
 		{
@@ -125,19 +126,26 @@ void Graphics::DrawTestTriangle(float angle, float x, float y)
 		} color;
 	};
 
-	// create vertex buffer (1 2d triangle at center of screen)
+	// create vertex buffer (8 vertices for one cube)
 	const Vertex vertices[] =
 	{
-		// center
-		{ 0.0f, 0.5f, 1.0f, 0.0f, 0.0f },
-		{ 0.5f, -0.5f, 0.0f, 1.0f, 0.0f },
-		{ -0.5f, -0.5f, 0.0f, 0.0f, 1.0f },
-		// left top
-		{ -0.3f, 0.3f, 0.0f, 1.0f, 0.0f },
-		// right top
-		{ 0.3f, 0.3f, 0.0f, 0.0f, 1.0f },
-		// center bottom
-		{ 0.0f, -0.8f, 1.0f, 0.0f, 0.0f },
+		// left bottom back
+		{ -1.0f, -1.0f, -1.0f, 1.0f, 0.0f, 0.0f },
+		// right bottom back
+		{ 1.0f, -1.0f, -1.0f, 0.0f, 1.0f, 0.0f },
+		// left top back
+		{ -1.0f, 1.0f, -1.0f, 0.0f, 0.0f, 1.0f },
+		// right top back
+		{ 1.0f, 1.0f, -1.0f, 1.0f, 1.0f, 0.0f },
+
+		// left bottom front
+		{ -1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 1.0f },
+		// right bottom front
+		{ 1.0f, -1.0f, 1.0f, 0.0f, 1.0f, 1.0f },
+		// left top front
+		{ -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f },
+		// right top front
+		{ 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f },
 	};
 	wrl::ComPtr<ID3D11Buffer> pVertexBuffer;
 	D3D11_BUFFER_DESC bd = {};
@@ -159,10 +167,18 @@ void Graphics::DrawTestTriangle(float angle, float x, float y)
 	// Create index buffer
 	const unsigned short indices[] =
 	{
-		0, 1, 2,
-		0, 2, 3,
-		0, 4, 1,
-		2, 1, 5,
+		// back surface
+		0, 2, 1,	2, 3, 1,
+		// right surface
+		1, 3, 5,    3, 7, 5,
+		// top surface
+		2, 6, 3,	3, 6, 7,
+		// front surface
+		4, 5, 7,	4, 7, 6,
+		// left surface
+		0, 4, 2,	2, 4, 6,
+		// bottom surface
+		0, 1, 4,	1, 5, 4,
 	};
 	wrl::ComPtr<ID3D11Buffer> pIndexBuffer;
 	D3D11_BUFFER_DESC ibd = {};
@@ -194,10 +210,14 @@ void Graphics::DrawTestTriangle(float angle, float x, float y)
 		dx::XMMatrixTranspose(
 			// rotate Z axis
 			dx::XMMatrixRotationZ(-angle)
-			// scale to avoid distortion
-			* dx::XMMatrixScaling(3.0f / 4.0f, 1.0f, 1.0f)
+			// rotate X axis
+			* dx::XMMatrixRotationX(-angle)
+			// rotate Y axis
+			* dx::XMMatrixRotationY(-angle)
 			// attach the image to mouse
-			* dx::XMMatrixTranslation( x, y, 0.0f )
+			* dx::XMMatrixTranslation( x, y, 4.0f )
+			// projection
+			* dx::XMMatrixPerspectiveLH( 1.0f, heightWidthRatio, 0.5f, 10.0f)
 		)
 	};
 	wrl::ComPtr<ID3D11Buffer> pConstantBuffer;
@@ -237,8 +257,8 @@ void Graphics::DrawTestTriangle(float angle, float x, float y)
 	wrl::ComPtr<ID3D11InputLayout> pInputLayout;
 	const D3D11_INPUT_ELEMENT_DESC ied[] =
 	{
-		{ "Position",0,DXGI_FORMAT_R32G32_FLOAT,0,0,D3D11_INPUT_PER_VERTEX_DATA,0 },
-		{ "Color",0,DXGI_FORMAT_R32G32B32_FLOAT,0,8,D3D11_INPUT_PER_VERTEX_DATA,0 },
+		{ "Position",0,DXGI_FORMAT_R32G32B32_FLOAT,0,0,D3D11_INPUT_PER_VERTEX_DATA,0 },
+		{ "Color",0,DXGI_FORMAT_R32G32B32_FLOAT,0,12,D3D11_INPUT_PER_VERTEX_DATA,0 },
 	};
 	GFX_THROW_INFO(pDevice->CreateInputLayout(
 		ied, (UINT)std::size(ied),

StudyDx/VertexShader.hlsl

@@ -9,10 +9,10 @@ cbuffer CBuf
 	matrix transform;
 };
 
-VSOut main( float2 pos : Position, float3 color : Color )
+VSOut main( float3 pos : Position, float3 color : Color )
 {
 	VSOut vso;
-	vso.pos = mul( float4(pos.x, pos.y, 0.0f, 1.0f), transform );
+	vso.pos = mul( float4(pos, 1.0f), transform );
 	vso.color = color;
 
 	return vso;