cylinder all fixed up

hw3d/Box.cpp

@@ -55,10 +55,10 @@ Box::Box( Graphics& gfx,
 	
 	struct PSMaterialConstant
 	{
-		alignas(16) dx::XMFLOAT3 color;
+		dx::XMFLOAT3 color;
 		float specularIntensity = 0.6f;
 		float specularPower = 30.0f;
-		float padding[2];
+		float padding[3];
 	} colorConst;
 	colorConst.color = material;
 	AddBind( std::make_unique<PixelConstantBuffer<PSMaterialConstant>>( gfx,colorConst,1u ) );

hw3d/Cylinder.cpp

@@ -44,7 +44,7 @@ Cylinder::Cylinder( Graphics& gfx,std::mt19937& rng,
 			   
 		struct PSMaterialConstant
 		{
-			alignas(16) dx::XMFLOAT3A colors[6] = {
+			dx::XMFLOAT3A colors[6] = {
 				{1.0f,0.0f,0.0f},
 				{0.0f,1.0f,0.0f},
 				{0.0f,0.0f,1.0f},

hw3d/IndexedPhongPS.hlsl

@@ -12,6 +12,7 @@ cbuffer LightCBuf
 cbuffer ObjectCBuf
 {
 	float3 materialColors[6];
+    float padding;
 	float specularIntensity;
 	float specularPower;
 };
@@ -33,5 +34,5 @@ float4 main( float3 worldPos : Position,float3 n : Normal,uint tid : SV_Primitiv
 	// calculate specular intensity based on angle between viewing vector and reflection vector, narrow with power function
 	const float3 specular = att * (diffuseColor * diffuseIntensity) * specularIntensity * pow( max( 0.0f,dot( normalize( -r ),normalize( worldPos ) ) ),specularPower );
 	// final color
-	return float4(saturate( (diffuse + ambient + specular) * materialColors[tid % 6] ),1.0f);
+    return float4(saturate((diffuse + ambient + specular) * materialColors[(tid / 2) % 6]), 1.0f);
 }
\ No newline at end of file

hw3d/hw3d.vcxproj

@@ -289,6 +289,12 @@
       <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
       <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
+      <ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
+      <ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
+      <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)%(Filename).cso</ObjectFileOutput>
     </FxCompile>
     <FxCompile Include="SolidPS.hlsl">
       <ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>