From 10c99d7b41b9c039e4dd5249b8e3f56bda042157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 17 May 2022 23:02:58 +0200 Subject: [PATCH] xatlas: Sync with upstream 16ace528a Just cleaning up unused but set variables. https://github.com/jpcy/xatlas/commit/16ace528acd2cf1f16a7c0dde99c42c486488dbe --- thirdparty/README.md | 2 +- thirdparty/xatlas/xatlas.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/thirdparty/README.md b/thirdparty/README.md index 400d376d4dc..8df07aedcf2 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -714,7 +714,7 @@ File extracted from upstream release tarball: ## xatlas - Upstream: https://github.com/jpcy/xatlas -- Version: git (ec707faeac3b95e6b416076a9509718cce105b6a, 2021) +- Version: git (16ace528acd2cf1f16a7c0dde99c42c486488dbe, 2022) - License: MIT Files extracted from upstream source: diff --git a/thirdparty/xatlas/xatlas.cpp b/thirdparty/xatlas/xatlas.cpp index d92ef1a83a1..5c5c57ecabb 100644 --- a/thirdparty/xatlas/xatlas.cpp +++ b/thirdparty/xatlas/xatlas.cpp @@ -4753,13 +4753,10 @@ public: Vector2 *v = m_vertexBuffers[m_activeVertexBuffer]; v[m_numVertices] = v[0]; m_area = 0; - float centroidx = 0, centroidy = 0; for (uint32_t k = 0; k < m_numVertices; k++) { // 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; 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); } @@ -9089,7 +9086,6 @@ AddMeshError AddMesh(Atlas *atlas, const MeshDecl &meshDecl, uint32_t meshCountH const uint32_t kMaxWarnings = 50; uint32_t warningCount = 0; internal::Array triIndices; - uint32_t firstFaceIndex = 0; internal::Triangulator triangulator; for (uint32_t face = 0; face < faceCount; face++) { // 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++) meshPolygonMapping->triangleToPolygonIndicesMap.push_back(triIndices[i]); } - firstFaceIndex += faceVertexCount; } if (warningCount > kMaxWarnings) XA_PRINT(" %u additional warnings truncated\n", warningCount - kMaxWarnings);