pyramid and cylinder independent meshes

hw3d/Cylinder.cpp

@@ -16,23 +16,12 @@ Cylinder::Cylinder( Graphics& gfx,std::mt19937& rng,
 
 	if( !IsStaticInitialized() )
 	{
-		struct Vertex
-		{
-			dx::XMFLOAT3 pos;
-			dx::XMFLOAT3 n;
-		};
-		auto model = Prism::MakeTesselatedIndependentCapNormals<Vertex>( tdist( rng ) );
-
-		AddStaticBind( std::make_unique<VertexBuffer>( gfx,model.vertices ) );
-
 		auto pvs = std::make_unique<VertexShader>( gfx,L"PhongVS.cso" );
 		auto pvsbc = pvs->GetBytecode();
 		AddStaticBind( std::move( pvs ) );
 
 		AddStaticBind( std::make_unique<PixelShader>( gfx,L"IndexedPhongPS.cso" ) );
 
-		AddStaticIndexBuffer( std::make_unique<IndexBuffer>( gfx,model.indices ) );
-
 		const std::vector<D3D11_INPUT_ELEMENT_DESC> ied =
 		{
 			{ "Position",0,DXGI_FORMAT_R32G32B32_FLOAT,0,0,D3D11_INPUT_PER_VERTEX_DATA,0 },
@@ -57,10 +46,15 @@ Cylinder::Cylinder( Graphics& gfx,std::mt19937& rng,
 		} matConst;
 		AddStaticBind( std::make_unique<PixelConstantBuffer<PSMaterialConstant>>( gfx,matConst,1u ) );
 	}
-	else
+
+	struct Vertex
 	{
-		SetIndexFromStatic();
-	}
+		dx::XMFLOAT3 pos;
+		dx::XMFLOAT3 n;
+	};
+	const auto model = Prism::MakeTesselatedIndependentCapNormals<Vertex>( tdist( rng ) );
+	AddBind( std::make_unique<VertexBuffer>( gfx,model.vertices ) );
+	AddIndexBuffer( std::make_unique<IndexBuffer>( gfx,model.indices ) );
 
 	AddBind( std::make_unique<TransformCbuf>( gfx,*this ) );
 }

hw3d/Pyramid.cpp

@@ -18,39 +18,12 @@ Pyramid::Pyramid( Graphics& gfx,std::mt19937& rng,
 
 	if( !IsStaticInitialized() )
 	{
-		struct Vertex
-		{
-			dx::XMFLOAT3 pos;
-			dx::XMFLOAT3 n;
-			std::array<char,4> color;
-			char padding;
-		};
-		const auto tesselation = tdist( rng );
-		auto model = Cone::MakeTesselatedIndependentFaces<Vertex>( tesselation );
-		// set vertex colors for mesh (tip red blending to blue base)
-		for( auto& v : model.vertices )
-		{
-			v.color = { (char)10,(char)10,(char)255 };
-		}
-		for( int i = 0; i < tesselation; i++ )
-		{
-			model.vertices[i * 3].color = { (char)255,(char)10,(char)10 };
-		}
-		// squash mesh a bit in the z direction
-		model.Transform( dx::XMMatrixScaling( 1.0f,1.0f,0.7f ) );
-		// add normals
-		model.SetNormalsIndependentFlat();
-
-		AddStaticBind( std::make_unique<VertexBuffer>( gfx,model.vertices ) );
-
 		auto pvs = std::make_unique<VertexShader>( gfx,L"BlendedPhongVS.cso" );
 		auto pvsbc = pvs->GetBytecode();
 		AddStaticBind( std::move( pvs ) );
 
 		AddStaticBind( std::make_unique<PixelShader>( gfx,L"BlendedPhongPS.cso" ) );
 
-		AddStaticIndexBuffer( std::make_unique<IndexBuffer>( gfx,model.indices ) );
-
 		const std::vector<D3D11_INPUT_ELEMENT_DESC> ied =
 		{
 			{ "Position",0,DXGI_FORMAT_R32G32B32_FLOAT,0,0,D3D11_INPUT_PER_VERTEX_DATA,0 },
@@ -69,10 +42,32 @@ Pyramid::Pyramid( Graphics& gfx,std::mt19937& rng,
 		} colorConst;
 		AddStaticBind( std::make_unique<PixelConstantBuffer<PSMaterialConstant>>( gfx,colorConst,1u ) );
 	}
-	else
+
+	struct Vertex
 	{
-		SetIndexFromStatic();
+		dx::XMFLOAT3 pos;
+		dx::XMFLOAT3 n;
+		std::array<char,4> color;
+		char padding;
+	};
+	const auto tesselation = tdist( rng );
+	auto model = Cone::MakeTesselatedIndependentFaces<Vertex>( tesselation );
+	// set vertex colors for mesh (tip red blending to blue base)
+	for( auto& v : model.vertices )
+	{
+		v.color = { (char)10,(char)10,(char)255 };
+	}
+	for( int i = 0; i < tesselation; i++ )
+	{
+		model.vertices[i * 3].color = { (char)255,(char)10,(char)10 };
 	}
+	// squash mesh a bit in the z direction
+	model.Transform( dx::XMMatrixScaling( 1.0f,1.0f,0.7f ) );
+	// add normals
+	model.SetNormalsIndependentFlat();
+
+	AddBind( std::make_unique<VertexBuffer>( gfx,model.vertices ) );
+	AddIndexBuffer( std::make_unique<IndexBuffer>( gfx,model.indices ) );
 
 	AddBind( std::make_unique<TransformCbuf>( gfx,*this ) );
 }