Updated for Windows SDK 10586
This commit is contained in:
Родитель
31d0c7b6c6
Коммит
c25f819346
|
@ -9,6 +9,7 @@
|
|||
*.i
|
||||
*.vspscc
|
||||
*.opensdf
|
||||
*.opendb
|
||||
*.ipch
|
||||
*.cache
|
||||
*.tlog
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
|
||||
<AppContainerApplication>true</AppContainerApplication>
|
||||
<ApplicationType>Windows Store</ApplicationType>
|
||||
<WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
|
||||
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
|
||||
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
|
|
|
@ -992,7 +992,7 @@ void CUVAtlasRepacker::ComputeBoundingBox(
|
|||
\***************************************************************************/
|
||||
HRESULT CUVAtlasRepacker::PrepareChartsInfo()
|
||||
{
|
||||
XMMATRIX bestMatrix;
|
||||
XMMATRIX bestMatrix = XMMatrixIdentity();
|
||||
float RotateAngle = 5.0f;
|
||||
|
||||
std::vector<XMFLOAT2> OutVec;
|
||||
|
@ -1546,7 +1546,7 @@ void CUVAtlasRepacker::PutChartInPosition(uint32_t index)
|
|||
_PositionInfo *pPosInfo =
|
||||
(_PositionInfo *)&(m_ChartsInfo[index].PosInfo[m_triedRotate]);
|
||||
|
||||
XMMATRIX matrixRotate, transMatrix;
|
||||
XMMATRIX matrixRotate;
|
||||
matrixRotate = XMMatrixRotationZ(m_triedPutRotation / 180.0f * XM_PI);
|
||||
XMStoreFloat2(&(pPosInfo->basePoint), XMVector2TransformCoord(XMLoadFloat2(&(pPosInfo->basePoint)),
|
||||
matrixRotate));
|
||||
|
@ -1554,6 +1554,7 @@ void CUVAtlasRepacker::PutChartInPosition(uint32_t index)
|
|||
pPosInfo->angle);
|
||||
|
||||
m_currAspectRatio = m_triedAspectRatio;
|
||||
XMMATRIX transMatrix = XMMatrixIdentity();;
|
||||
switch (m_triedPutRotation)
|
||||
{
|
||||
case 0:
|
||||
|
|
|
@ -903,7 +903,6 @@ HRESULT CIsochartMesh::CalculateVertMappingCoord(
|
|||
XMFLOAT3 vec2(m_pVerts[pFace->dwVertexID[2]].uv.x - m_pVerts[pFace->dwVertexID[0]].uv.x,
|
||||
m_pVerts[pFace->dwVertexID[2]].uv.y - m_pVerts[pFace->dwVertexID[0]].uv.y,
|
||||
0);
|
||||
XMFLOAT3 vec3;
|
||||
|
||||
if (CalculateZOfVec3Cross(&vec1, &vec2) >= 0)
|
||||
{
|
||||
|
|
|
@ -323,8 +323,6 @@ inline void Rotate2DPoint(
|
|||
inline void CIsochartMesh::RotateChart(
|
||||
const DirectX::XMFLOAT2& center, float fAngle) const
|
||||
{
|
||||
DirectX::XMFLOAT2 tempCoordinate;
|
||||
|
||||
float fCos = cosf(fAngle);
|
||||
float fSin = sinf(fAngle);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче