diff --git a/DirectXTK_Desktop_2010.vcxproj b/DirectXTK_Desktop_2010.vcxproj index d5319080c..b49701885 100644 --- a/DirectXTK_Desktop_2010.vcxproj +++ b/DirectXTK_Desktop_2010.vcxproj @@ -229,7 +229,7 @@ Use - Level3 + Level4 Disabled _WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -243,7 +243,7 @@ Use - Level3 + Level4 Disabled _WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -256,7 +256,7 @@ - Level3 + Level4 Use MaxSpeed true @@ -275,7 +275,7 @@ - Level3 + Level4 Use MaxSpeed true diff --git a/DirectXTK_Desktop_2012.vcxproj b/DirectXTK_Desktop_2012.vcxproj index 20a56b39f..a36cbc6d1 100644 --- a/DirectXTK_Desktop_2012.vcxproj +++ b/DirectXTK_Desktop_2012.vcxproj @@ -232,7 +232,7 @@ Use - Level3 + Level4 Disabled _WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -246,7 +246,7 @@ Use - Level3 + Level4 Disabled _WIN32_WINNT=0x0600;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -259,7 +259,7 @@ - Level3 + Level4 Use MaxSpeed true @@ -278,7 +278,7 @@ - Level3 + Level4 Use MaxSpeed true diff --git a/DirectXTK_Windows8.vcxproj b/DirectXTK_Windows8.vcxproj index 2cc316851..973e34b04 100644 --- a/DirectXTK_Windows8.vcxproj +++ b/DirectXTK_Windows8.vcxproj @@ -272,7 +272,7 @@ Use - Level3 + Level4 Disabled _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -289,7 +289,7 @@ Use - Level3 + Level4 Disabled _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -306,7 +306,7 @@ Use - Level3 + Level4 Disabled _UNICODE;UNICODE;_DEBUG;_LIB;%(PreprocessorDefinitions) pch.h @@ -322,7 +322,7 @@ - Level3 + Level4 Use MaxSpeed true @@ -344,7 +344,7 @@ - Level3 + Level4 Use MaxSpeed true @@ -365,7 +365,7 @@ - Level3 + Level4 Use MaxSpeed true diff --git a/DirectXTK_WindowsPhone8.vcxproj b/DirectXTK_WindowsPhone8.vcxproj index fc54387b7..44d9b1582 100644 --- a/DirectXTK_WindowsPhone8.vcxproj +++ b/DirectXTK_WindowsPhone8.vcxproj @@ -227,7 +227,7 @@ Use pch.h $(ProjectDir)Inc;%(AdditionalIncludeDirectories) - Level3 + Level4 Console diff --git a/Src/GeometricPrimitive.cpp b/Src/GeometricPrimitive.cpp index 696230e81..408706f89 100644 --- a/Src/GeometricPrimitive.cpp +++ b/Src/GeometricPrimitive.cpp @@ -515,12 +515,12 @@ std::unique_ptr GeometricPrimitive::CreateGeoSphere(_In_ ID3 XMFLOAT3 v01; // vertex on the midpoint of v0 and v1 XMFLOAT3 v12; // ditto v1 and v2 XMFLOAT3 v20; // ditto v2 and v0 - uint32_t iv01; // index of v01 - uint32_t iv12; // index of v12 - uint32_t iv20; // index of v20 + uint16_t iv01; // index of v01 + uint16_t iv12; // index of v12 + uint16_t iv20; // index of v20 // Function that, when given the index of two vertices, creates a new vertex at the midpoint of those vertices. - auto divideEdge = [&](uint32_t i0, uint32_t i1, XMFLOAT3& outVertex, uint32_t& outIndex) + auto divideEdge = [&](uint16_t i0, uint16_t i1, XMFLOAT3& outVertex, uint16_t& outIndex) { const UndirectedEdge edge = makeUndirectedEdge(i0, i1); @@ -545,7 +545,7 @@ std::unique_ptr GeometricPrimitive::CreateGeoSphere(_In_ ID3 ) ); - outIndex = static_cast( vertexPositions.size() ); + outIndex = static_cast( vertexPositions.size() ); CheckIndexOverflow(outIndex); vertexPositions.push_back(outVertex); @@ -567,7 +567,7 @@ std::unique_ptr GeometricPrimitive::CreateGeoSphere(_In_ ID3 // /b\c/d\ // v2 o---o---o v1 // v12 - const uint32_t indicesToAdd[] = + const uint16_t indicesToAdd[] = { iv0, iv01, iv20, // a iv20, iv12, iv2, // b diff --git a/Src/PlatformHelpers.h b/Src/PlatformHelpers.h index dc55e24d6..bcf334fa4 100644 --- a/Src/PlatformHelpers.h +++ b/Src/PlatformHelpers.h @@ -13,6 +13,8 @@ #pragma once +#pragma warning(disable : 4324) + #include #if _WIN32_WINNT < 0x0602 /*_WIN32_WINNT_WIN8*/ @@ -83,6 +85,9 @@ namespace DirectX { #if defined(_DEBUG) || defined(PROFILE) resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name); + #else + UNREFERENCED_PARAMETER(resource); + UNREFERENCED_PARAMETER(name); #endif }