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

Fix node forward direction

master
Jeremy HU 2022-10-16 19:56:10 +11:00
parent 2a602a031f
commit 86a05d1bfb
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dust3d/mesh/tube_mesh_builder.cc
View File

@ -62,12 +62,15 @@ void TubeMeshBuilder::buildNodePositionAndDirections()
std::vector<Vector3> rawDirections; std::vector<Vector3> rawDirections;
rawDirections.resize(m_nodePositions.size()); rawDirections.resize(m_nodePositions.size());
m_nodeForwardDistances.resize(m_nodePositions.size());
m_nodeForwardDirections.resize(m_nodePositions.size()); m_nodeForwardDirections.resize(m_nodePositions.size());
if (m_nodePositions.size() >= 2) { if (m_nodePositions.size() >= 2) {
if (m_isCircle) { if (m_isCircle) {
for (size_t i = 0; i < m_nodePositions.size(); ++i) { for (size_t i = 0; i < m_nodePositions.size(); ++i) {
size_t j = (i + 1) % m_nodePositions.size(); size_t j = (i + 1) % m_nodePositions.size();
rawDirections[i] = (m_nodePositions[j] - m_nodePositions[i]).normalized(); rawDirections[i] = (m_nodePositions[j] - m_nodePositions[i]);
m_nodeForwardDistances[i] = rawDirections[i].length();
rawDirections[i].normalize();
} }
for (size_t i = 0; i < m_nodePositions.size(); ++i) { for (size_t i = 0; i < m_nodePositions.size(); ++i) {
size_t j = (i + 1) % m_nodePositions.size(); size_t j = (i + 1) % m_nodePositions.size();
@ -76,13 +79,16 @@ void TubeMeshBuilder::buildNodePositionAndDirections()
} else { } else {
for (size_t j = 1; j < m_nodePositions.size(); ++j) { for (size_t j = 1; j < m_nodePositions.size(); ++j) {
size_t i = j - 1; size_t i = j - 1;
rawDirections[i] = (m_nodePositions[j] - m_nodePositions[i]).normalized(); rawDirections[i] = (m_nodePositions[j] - m_nodePositions[i]);
m_nodeForwardDistances[i] = rawDirections[i].length();
rawDirections[i].normalize();
} }
rawDirections[m_nodeForwardDirections.size() - 1] = rawDirections[m_nodeForwardDirections.size() - 2]; rawDirections[m_nodeForwardDirections.size() - 1] = rawDirections[m_nodeForwardDirections.size() - 2];
m_nodeForwardDirections.front() = rawDirections.front(); m_nodeForwardDirections.front() = rawDirections.front();
for (size_t j = 1; j + 1 < m_nodePositions.size(); ++j) { for (size_t j = 1; j + 1 < m_nodePositions.size(); ++j) {
size_t i = j - 1; size_t i = j - 1;
m_nodeForwardDirections[j] = (rawDirections[i] + rawDirections[j]).normalized(); m_nodeForwardDirections[j] = (rawDirections[i] * m_nodeForwardDistances[j] +
rawDirections[j] * m_nodeForwardDistances[i]).normalized();
} }
m_nodeForwardDirections.back() = rawDirections.back(); m_nodeForwardDirections.back() = rawDirections.back();
} }

1
dust3d/mesh/tube_mesh_builder.h
View File

@ -53,6 +53,7 @@ private:
std::vector<MeshNode> m_nodes; std::vector<MeshNode> m_nodes;
std::vector<Vector3> m_nodePositions; std::vector<Vector3> m_nodePositions;
std::vector<Vector3> m_nodeForwardDirections; std::vector<Vector3> m_nodeForwardDirections;
std::vector<double> m_nodeForwardDistances;
std::vector<Vector3> m_generatedVertices; std::vector<Vector3> m_generatedVertices;
std::vector<std::vector<size_t>> m_generatedFaces; std::vector<std::vector<size_t>> m_generatedFaces;
Vector3 m_generatedBaseNormal; Vector3 m_generatedBaseNormal;