godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xatlas: Sync with upstream 16ace528a 

Just cleaning up unused but set variables.

16ace528ac
This commit is contained in:
Rémi Verschelde 2022-05-17 23:02:58 +02:00
parent 311de59e3c
commit 10c99d7b41
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -714,7 +714,7 @@ File extracted from upstream release tarball:
## xatlas ## xatlas
- Upstream: https://github.com/jpcy/xatlas - Upstream: https://github.com/jpcy/xatlas
- Version: git (ec707faeac3b95e6b416076a9509718cce105b6a, 2021) - Version: git (16ace528acd2cf1f16a7c0dde99c42c486488dbe, 2022)
- License: MIT - License: MIT
Files extracted from upstream source: Files extracted from upstream source:

5
thirdparty/xatlas/xatlas.cpp vendored
View File

@ -4753,13 +4753,10 @@ public:
Vector2 *v = m_vertexBuffers[m_activeVertexBuffer]; Vector2 *v = m_vertexBuffers[m_activeVertexBuffer];
v[m_numVertices] = v[0]; v[m_numVertices] = v[0];
m_area = 0; m_area = 0;
float centroidx = 0, centroidy = 0;
for (uint32_t k = 0; k < m_numVertices; k++) { for (uint32_t k = 0; k < m_numVertices; k++) {
// http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/ // http://local.wasp.uwa.edu.au/~pbourke/geometry/polyarea/
float f = v[k].x * v[k + 1].y - v[k + 1].x * v[k].y; float f = v[k].x * v[k + 1].y - v[k + 1].x * v[k].y;
m_area += f; m_area += f;
centroidx += f * (v[k].x + v[k + 1].x);
centroidy += f * (v[k].y + v[k + 1].y);
} }
m_area = 0.5f * fabsf(m_area); m_area = 0.5f * fabsf(m_area);
} }
@ -9089,7 +9086,6 @@ AddMeshError AddMesh(Atlas *atlas, const MeshDecl &meshDecl, uint32_t meshCountH
const uint32_t kMaxWarnings = 50; const uint32_t kMaxWarnings = 50;
uint32_t warningCount = 0; uint32_t warningCount = 0;
internal::Array<uint32_t> triIndices; internal::Array<uint32_t> triIndices;
uint32_t firstFaceIndex = 0;
internal::Triangulator triangulator; internal::Triangulator triangulator;
for (uint32_t face = 0; face < faceCount; face++) { for (uint32_t face = 0; face < faceCount; face++) {
// Decode face indices. // Decode face indices.
@ -9199,7 +9195,6 @@ AddMeshError AddMesh(Atlas *atlas, const MeshDecl &meshDecl, uint32_t meshCountH
for (uint32_t i = 0; i < triIndices.size(); i++) for (uint32_t i = 0; i < triIndices.size(); i++)
meshPolygonMapping->triangleToPolygonIndicesMap.push_back(triIndices[i]); meshPolygonMapping->triangleToPolygonIndicesMap.push_back(triIndices[i]);
} }
firstFaceIndex += faceVertexCount;
} }
if (warningCount > kMaxWarnings) if (warningCount > kMaxWarnings)
XA_PRINT(" %u additional warnings truncated\n", warningCount - kMaxWarnings); XA_PRINT(" %u additional warnings truncated\n", warningCount - kMaxWarnings);