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

Bit more work.

Browse Source
This commit is contained in:
Relintai 2021-09-28 19:03:46 +02:00
parent acd276bdb1
commit e40a4cea4a
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
xatlas/xatlas.cpp
View File

@ -4511,9 +4511,11 @@ struct AtlasData {
const uint32_t edgeCount = mesh->edgeCount(); const uint32_t edgeCount = mesh->edgeCount();
edgeDihedralAngles.resize(edgeCount); edgeDihedralAngles.resize(edgeCount);
edgeLengths.resize(edgeCount); edgeLengths.resize(edgeCount);
faceAreas.resize(faceCount); faceAreas.resize(faceCount);
if (options.useInputMeshUvs) //if (options.useInputMeshUvs)
faceUvAreas.resize(faceCount); faceUvAreas.resize(faceCount);
faceNormals.resize(faceCount); faceNormals.resize(faceCount);
isFaceInChart.resize(faceCount); isFaceInChart.resize(faceCount);
isFaceInChart.zeroOutMemory(); isFaceInChart.zeroOutMemory();
@ -4527,8 +4529,10 @@ struct AtlasData {
} }
faceAreas[f] = mesh->computeFaceArea(f); faceAreas[f] = mesh->computeFaceArea(f);
XA_DEBUG_ASSERT(faceAreas[f] > 0.0f); XA_DEBUG_ASSERT(faceAreas[f] > 0.0f);
if (options.useInputMeshUvs)
faceUvAreas[f] = mesh->computeFaceParametricArea(f); //if (options.useInputMeshUvs)
// faceUvAreas[f] = mesh->computeFaceParametricArea(f);
faceNormals[f] = mesh->computeFaceNormal(f); faceNormals[f] = mesh->computeFaceNormal(f);
} }
for (uint32_t face = 0; face < faceCount; face++) { for (uint32_t face = 0; face < faceCount; face++) {
@ -4566,8 +4570,10 @@ struct OriginalUvCharts {
for (uint32_t f = 0; f < faceCount; f++) { for (uint32_t f = 0; f < faceCount; f++) {
if (m_data.isFaceInChart.get(f)) if (m_data.isFaceInChart.get(f))
continue; continue;
if (isZero(m_data.faceUvAreas[f], kAreaEpsilon))
continue; // Face must have valid UVs. //if (isZero(m_data.faceUvAreas[f], kAreaEpsilon))
// continue; // Face must have valid UVs.
// Found an unassigned face, create a new chart. // Found an unassigned face, create a new chart.
Chart chart; Chart chart;
chart.firstFace = m_chartFaces.size(); chart.firstFace = m_chartFaces.size();
@ -4597,7 +4603,8 @@ private:
}; };
void floodfillFaces(Chart &chart) { void floodfillFaces(Chart &chart) {
const bool isFaceAreaNegative = m_data.faceUvAreas[m_chartFaces[chart.firstFace]] < 0.0f; //const bool isFaceAreaNegative = m_data.faceUvAreas[m_chartFaces[chart.firstFace]] < 0.0f;
for (;;) { for (;;) {
bool newFaceAdded = false; bool newFaceAdded = false;
const uint32_t faceCount = chart.faceCount; const uint32_t faceCount = chart.faceCount;
@ -4609,10 +4616,12 @@ private:
continue; // Boundary edge. continue; // Boundary edge.
if (m_data.isFaceInChart.get(face)) if (m_data.isFaceInChart.get(face))
continue; // Already assigned to a chart. continue; // Already assigned to a chart.
if (isZero(m_data.faceUvAreas[face], kAreaEpsilon))
continue; // Face must have valid UVs. //if (isZero(m_data.faceUvAreas[face], kAreaEpsilon))
if ((m_data.faceUvAreas[face] < 0.0f) != isFaceAreaNegative) // continue; // Face must have valid UVs.
continue; // Face winding is opposite of the first chart face.
//if ((m_data.faceUvAreas[face] < 0.0f) != isFaceAreaNegative)
// continue; // Face winding is opposite of the first chart face.
//const Vector2 &uv0 = m_data.mesh->texcoord(edgeIt.vertex0()); //const Vector2 &uv0 = m_data.mesh->texcoord(edgeIt.vertex0());
@ -7938,9 +7947,9 @@ void ComputeCharts(Atlas *atlas, ChartOptions options) {
XA_PROFILE_PRINT_AND_RESET(" Build atlas: ", buildAtlas) XA_PROFILE_PRINT_AND_RESET(" Build atlas: ", buildAtlas)
XA_PROFILE_PRINT_AND_RESET(" Init: ", buildAtlasInit) XA_PROFILE_PRINT_AND_RESET(" Init: ", buildAtlasInit)
XA_PROFILE_PRINT_AND_RESET(" Planar charts: ", planarCharts) XA_PROFILE_PRINT_AND_RESET(" Planar charts: ", planarCharts)
if (options.useInputMeshUvs) { //if (options.useInputMeshUvs) {
XA_PROFILE_PRINT_AND_RESET(" Original UV charts: ", originalUvCharts) // XA_PROFILE_PRINT_AND_RESET(" Original UV charts: ", originalUvCharts)
} //}
XA_PROFILE_PRINT_AND_RESET(" Clustered charts: ", clusteredCharts) XA_PROFILE_PRINT_AND_RESET(" Clustered charts: ", clusteredCharts)
XA_PROFILE_PRINT_AND_RESET(" Place seeds: ", clusteredChartsPlaceSeeds) XA_PROFILE_PRINT_AND_RESET(" Place seeds: ", clusteredChartsPlaceSeeds)
XA_PROFILE_PRINT_AND_RESET(" Boundary intersection: ", clusteredChartsPlaceSeedsBoundaryIntersection) XA_PROFILE_PRINT_AND_RESET(" Boundary intersection: ", clusteredChartsPlaceSeedsBoundaryIntersection)

2
xatlas/xatlas.h
View File

@ -179,7 +179,7 @@ struct ChartOptions {
float maxCost = 2.0f; // If total of all metrics * weights > maxCost, don't grow chart. Lower values result in more charts. float maxCost = 2.0f; // If total of all metrics * weights > maxCost, don't grow chart. Lower values result in more charts.
uint32_t maxIterations = 1; // Number of iterations of the chart growing and seeding phases. Higher values result in better charts. uint32_t maxIterations = 1; // Number of iterations of the chart growing and seeding phases. Higher values result in better charts.
bool useInputMeshUvs = false; // Use MeshDecl::vertexUvData for charts. //bool useInputMeshUvs = false; // Use MeshDecl::vertexUvData for charts.
bool fixWinding = false; // Enforce consistent texture coordinate winding. bool fixWinding = false; // Enforce consistent texture coordinate winding.
}; };