Relintai/mesh_utils
1
0
Fork 0
mirror of https://github.com/Relintai/mesh_utils.git synced 2025-05-15 23:02:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Started removing colocals.

Browse Source
This commit is contained in:
Relintai 2021-09-29 08:19:21 +02:00
parent b6940f3799
commit df80bd10f0
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xatlas/xatlas.cpp
View File

@ -5700,17 +5700,23 @@ public:
uint32_t unifiedIndices[3]; uint32_t unifiedIndices[3];
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
const uint32_t sourceVertex = sourceMesh->vertexAt(m_faceToSourceFaceMap[f] * 3 + i); const uint32_t sourceVertex = sourceMesh->vertexAt(m_faceToSourceFaceMap[f] * 3 + i);
uint32_t sourceUnifiedVertex = sourceMesh->firstColocalVertex(sourceVertex); //uint32_t sourceUnifiedVertex = sourceMesh->firstColocalVertex(sourceVertex);
uint32_t sourceUnifiedVertex = sourceVertex;
/*
if (m_generatorType == segment::ChartGeneratorType::OriginalUv && sourceVertex != sourceUnifiedVertex) { if (m_generatorType == segment::ChartGeneratorType::OriginalUv && sourceVertex != sourceUnifiedVertex) {
// Original UVs: don't unify vertices with different UVs; we want to preserve UVs. // Original UVs: don't unify vertices with different UVs; we want to preserve UVs.
if (!equal(sourceMesh->texcoord(sourceVertex), sourceMesh->texcoord(sourceUnifiedVertex), sourceMesh->epsilon())) if (!equal(sourceMesh->texcoord(sourceVertex), sourceMesh->texcoord(sourceUnifiedVertex), sourceMesh->epsilon()))
sourceUnifiedVertex = sourceVertex; sourceUnifiedVertex = sourceVertex;
} }
uint32_t unifiedVertex = sourceVertexToUnifiedVertexMap.get(sourceUnifiedVertex); */
if (unifiedVertex == UINT32_MAX) {
unifiedVertex = sourceVertexToUnifiedVertexMap.add(sourceUnifiedVertex); uint32_t unifiedVertex;// = sourceVertexToUnifiedVertexMap.get(sourceUnifiedVertex);
m_unifiedMesh->addVertex(sourceMesh->position(sourceVertex), Vector3(0.0f), sourceMesh->texcoord(sourceVertex));
} //if (unifiedVertex == UINT32_MAX) {
unifiedVertex = sourceVertexToUnifiedVertexMap.add(sourceUnifiedVertex);
m_unifiedMesh->addVertex(sourceMesh->position(sourceVertex), Vector3(0.0f), sourceMesh->texcoord(sourceVertex));
//}
if (sourceVertexToChartVertexMap.get(sourceVertex) == UINT32_MAX) { if (sourceVertexToChartVertexMap.get(sourceVertex) == UINT32_MAX) {
sourceVertexToChartVertexMap.add(sourceVertex); sourceVertexToChartVertexMap.add(sourceVertex);
m_vertexToSourceVertexMap.push_back(sourceVertex); m_vertexToSourceVertexMap.push_back(sourceVertex);
@ -5755,7 +5761,10 @@ public:
for (uint32_t f = 0; f < faceCount; f++) { for (uint32_t f = 0; f < faceCount; f++) {
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
const uint32_t vertex = sourceMesh->vertexAt(m_faceToSourceFaceMap[f] * 3 + i); const uint32_t vertex = sourceMesh->vertexAt(m_faceToSourceFaceMap[f] * 3 + i);
const uint32_t sourceUnifiedVertex = sourceMesh->firstColocalVertex(vertex);
//const uint32_t sourceUnifiedVertex = sourceMesh->firstColocalVertex(vertex);
const uint32_t sourceUnifiedVertex = vertex;
const uint32_t parentVertex = parentMesh->vertexAt(faces[f] * 3 + i); const uint32_t parentVertex = parentMesh->vertexAt(faces[f] * 3 + i);
uint32_t unifiedVertex = sourceVertexToUnifiedVertexMap.get(sourceUnifiedVertex); uint32_t unifiedVertex = sourceVertexToUnifiedVertexMap.get(sourceUnifiedVertex);
if (unifiedVertex == UINT32_MAX) { if (unifiedVertex == UINT32_MAX) {
@ -5777,7 +5786,10 @@ public:
for (uint32_t i = 0; i < 3; i++) { for (uint32_t i = 0; i < 3; i++) {
const uint32_t vertex = sourceMesh->vertexAt(m_faceToSourceFaceMap[f] * 3 + i); const uint32_t vertex = sourceMesh->vertexAt(m_faceToSourceFaceMap[f] * 3 + i);
m_originalIndices[f * 3 + i] = chartMeshIndices[vertex]; m_originalIndices[f * 3 + i] = chartMeshIndices[vertex];
const uint32_t unifiedVertex = sourceMesh->firstColocalVertex(vertex);
//const uint32_t unifiedVertex = sourceMesh->firstColocalVertex(vertex);
const uint32_t unifiedVertex = vertex;
unifiedIndices[i] = sourceVertexToUnifiedVertexMap.get(unifiedVertex); unifiedIndices[i] = sourceVertexToUnifiedVertexMap.get(unifiedVertex);
} }
m_unifiedMesh->addFace(unifiedIndices); m_unifiedMesh->addFace(unifiedIndices);
@ -6220,6 +6232,7 @@ private:
} }
} }
} }
// Add faces. // Add faces.
for (uint32_t f = 0; f < faceCount; f++) { for (uint32_t f = 0; f < faceCount; f++) {
const uint32_t face = m_faceToSourceFaceMap[f]; const uint32_t face = m_faceToSourceFaceMap[f];
@ -6233,6 +6246,7 @@ private:
// Don't copy flags - ignored faces aren't used by chart groups, they are handled by InvalidMeshGeometry. // Don't copy flags - ignored faces aren't used by chart groups, they are handled by InvalidMeshGeometry.
mesh->addFace(indices); mesh->addFace(indices);
} }
XA_PROFILE_START(createChartGroupMeshColocals) XA_PROFILE_START(createChartGroupMeshColocals)
mesh->createColocals(); mesh->createColocals();
XA_PROFILE_END(createChartGroupMeshColocals) XA_PROFILE_END(createChartGroupMeshColocals)