zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inconsistent base normal when shape is too straight

master
Jeremy Hu 2019-07-27 14:12:07 +09:30
parent a833232d3c
commit 0f411d3bd9
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
thirdparty/nodemesh/nodemesh/builder.cpp vendored
View File

@ -121,6 +121,33 @@ void Builder::setNodeOriginInfo(size_t nodeIndex, int nearOriginNodeIndex, int f
node.farOriginNodeIndex = farOriginNodeIndex; node.farOriginNodeIndex = farOriginNodeIndex;
} }
QVector3D Builder::calculateBaseNormalFromTraverseDirection(const QVector3D &traverseDirection)
{
const std::vector<QVector3D> axisList = {
QVector3D {1, 0, 0},
QVector3D {0, 1, 0},
QVector3D {0, 0, 1},
};
float maxDot = -1;
size_t nearAxisIndex = 0;
bool reversed = false;
for (size_t i = 0; i < axisList.size(); ++i) {
const auto axis = axisList[i];
auto dot = QVector3D::dotProduct(axis, traverseDirection);
auto positiveDot = abs(dot);
if (positiveDot >= maxDot) {
reversed = dot < 0;
maxDot = positiveDot;
nearAxisIndex = i;
}
}
// axisList[nearAxisIndex] align with the traverse direction,
// So we pick the next axis to do cross product with traverse direction
const auto& choosenAxis = axisList[(nearAxisIndex + 1) % 3];
auto baseNormal = QVector3D::crossProduct(traverseDirection, choosenAxis).normalized();
return reversed ? -baseNormal : baseNormal;
}
void Builder::resolveBaseNormalRecursively(size_t nodeIndex) void Builder::resolveBaseNormalRecursively(size_t nodeIndex)
{ {
auto &node = m_nodes[nodeIndex]; auto &node = m_nodes[nodeIndex];
@ -135,18 +162,8 @@ void Builder::resolveBaseNormalRecursively(size_t nodeIndex)
if (searchResult.second) { if (searchResult.second) {
resolveBaseNormalForLeavesRecursively(nodeIndex, searchResult.first); resolveBaseNormalForLeavesRecursively(nodeIndex, searchResult.first);
} else { } else {
const std::vector<QVector3D> axisList = { resolveBaseNormalForLeavesRecursively(nodeIndex,
QVector3D {0, 0, 1}, calculateBaseNormalFromTraverseDirection(node.traverseDirection));
QVector3D {0, 1, 0},
QVector3D {1, 0, 0}
};
for (const auto &axis: axisList) {
if (validateNormal(QVector3D::crossProduct(axis, node.traverseDirection).normalized())) {
resolveBaseNormalForLeavesRecursively(nodeIndex, axis);
return;
}
}
resolveBaseNormalForLeavesRecursively(nodeIndex, axisList[0]);
} }
} }
} }
@ -746,11 +763,7 @@ QVector3D Builder::revisedBaseNormalAcordingToCutNormal(const QVector3D &baseNor
baseNormal : -baseNormal; baseNormal : -baseNormal;
// 0.966: < 15 degress // 0.966: < 15 degress
if (QVector3D::dotProduct(cutNormal, orientedBaseNormal) > 0.966) { if (QVector3D::dotProduct(cutNormal, orientedBaseNormal) > 0.966) {
if (QVector3D::dotProduct(cutNormal, QVector3D(1, 0, 0)) > 0.966) { orientedBaseNormal = calculateBaseNormalFromTraverseDirection(cutNormal);
orientedBaseNormal = QVector3D(0, 1, 0);
} else {
orientedBaseNormal = QVector3D(1, 0, 0);
}
} }
return orientedBaseNormal.normalized(); return orientedBaseNormal.normalized();
} }

1
thirdparty/nodemesh/nodemesh/builder.h vendored
View File

@ -150,6 +150,7 @@ private:
void applyDeform(); void applyDeform();
QVector3D calculateDeformPosition(const QVector3D &vertexPosition, const QVector3D &ray, const QVector3D &deformNormal, float deformFactor); QVector3D calculateDeformPosition(const QVector3D &vertexPosition, const QVector3D &ray, const QVector3D &deformNormal, float deformFactor);
bool swallowEdgeForNode(size_t nodeIndex, size_t edgeOrder); bool swallowEdgeForNode(size_t nodeIndex, size_t edgeOrder);
static QVector3D calculateBaseNormalFromTraverseDirection(const QVector3D &traverseDirection);
}; };
} }