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

Speed up mesh generation 

Cache intermediate combination mesh for generation.
master
Jeremy Hu 2019-08-12 22:47:11 +09:30
parent 471a324bb3
commit 42f243746e
2 changed files with 70 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/meshgenerator.cpp
View File

@ -840,7 +840,7 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com
combineGroups[currentGroupIndex].second.push_back({childIdString, colorName}); combineGroups[currentGroupIndex].second.push_back({childIdString, colorName});
} }
// Secondly, sub group by color // Secondly, sub group by color
std::vector<std::pair<nodemesh::Combiner::Mesh *, CombineMode>> groupMeshes; std::vector<std::tuple<nodemesh::Combiner::Mesh *, CombineMode, QString>> groupMeshes;
for (const auto &group: combineGroups) { for (const auto &group: combineGroups) {
std::set<size_t> used; std::set<size_t> used;
std::vector<std::vector<QString>> componentIdStrings; std::vector<std::vector<QString>> componentIdStrings;
@ -851,7 +851,7 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com
continue; continue;
const auto &colorName = group.second[i].second; const auto &colorName = group.second[i].second;
if (lastColorName != colorName || lastColorName.isEmpty()) { if (lastColorName != colorName || lastColorName.isEmpty()) {
qDebug() << "New sub group[" << currentSubGroupIndex << "] for color[" << colorName << "]"; //qDebug() << "New sub group[" << currentSubGroupIndex << "] for color[" << colorName << "]";
componentIdStrings.push_back({}); componentIdStrings.push_back({});
++currentSubGroupIndex; ++currentSubGroupIndex;
lastColorName = colorName; lastColorName = colorName;
@ -876,8 +876,12 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com
componentIdStrings[currentSubGroupIndex].push_back(group.second[j].first); componentIdStrings[currentSubGroupIndex].push_back(group.second[j].first);
} }
} }
std::vector<std::pair<nodemesh::Combiner::Mesh *, CombineMode>> multipleMeshes; std::vector<std::tuple<nodemesh::Combiner::Mesh *, CombineMode, QString>> multipleMeshes;
QStringList subGroupMeshIdStringList;
for (const auto &it: componentIdStrings) { for (const auto &it: componentIdStrings) {
QStringList componentChildGroupIdStringList;
for (const auto &componentChildGroupIdString: it)
componentChildGroupIdStringList += componentChildGroupIdString;
nodemesh::Combiner::Mesh *childMesh = combineComponentChildGroupMesh(it, componentCache); nodemesh::Combiner::Mesh *childMesh = combineComponentChildGroupMesh(it, componentCache);
if (nullptr == childMesh) if (nullptr == childMesh)
continue; continue;
@ -885,12 +889,14 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com
delete childMesh; delete childMesh;
continue; continue;
} }
multipleMeshes.push_back({childMesh, CombineMode::Normal}); QString componentChildGroupIdStringListString = componentChildGroupIdStringList.join("|");
subGroupMeshIdStringList += componentChildGroupIdStringListString;
multipleMeshes.push_back({childMesh, CombineMode::Normal, componentChildGroupIdStringListString});
} }
nodemesh::Combiner::Mesh *subGroupMesh = combineMultipleMeshes(multipleMeshes, foundColorSolubilitySetting); nodemesh::Combiner::Mesh *subGroupMesh = combineMultipleMeshes(multipleMeshes, foundColorSolubilitySetting);
if (nullptr == subGroupMesh) if (nullptr == subGroupMesh)
continue; continue;
groupMeshes.push_back({subGroupMesh, group.first}); groupMeshes.push_back({subGroupMesh, group.first, subGroupMeshIdStringList.join("&")});
} }
mesh = combineMultipleMeshes(groupMeshes, false); mesh = combineMultipleMeshes(groupMeshes, false);
} }
@ -906,12 +912,14 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentMesh(const QString &com
return mesh; return mesh;
} }
nodemesh::Combiner::Mesh *MeshGenerator::combineMultipleMeshes(const std::vector<std::pair<nodemesh::Combiner::Mesh *, CombineMode>> &multipleMeshes, bool recombine) nodemesh::Combiner::Mesh *MeshGenerator::combineMultipleMeshes(const std::vector<std::tuple<nodemesh::Combiner::Mesh *, CombineMode, QString>> &multipleMeshes, bool recombine)
{ {
nodemesh::Combiner::Mesh *mesh = nullptr; nodemesh::Combiner::Mesh *mesh = nullptr;
QString meshIdStrings;
for (const auto &it: multipleMeshes) { for (const auto &it: multipleMeshes) {
const auto &childCombineMode = it.second; const auto &childCombineMode = std::get<1>(it);
nodemesh::Combiner::Mesh *subMesh = it.first; nodemesh::Combiner::Mesh *subMesh = std::get<0>(it);
const QString &subMeshIdString = std::get<2>(it);
//qDebug() << "Combine mode:" << CombineModeToString(childCombineMode); //qDebug() << "Combine mode:" << CombineModeToString(childCombineMode);
if (nullptr == subMesh) { if (nullptr == subMesh) {
qDebug() << "Child mesh is null"; qDebug() << "Child mesh is null";
@ -923,18 +931,35 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineMultipleMeshes(const std::vector
continue; continue;
} }
if (nullptr == mesh) { if (nullptr == mesh) {
//if (childCombineMode == CombineMode::Inversion) {
// delete subMesh;
//} else {
mesh = subMesh; mesh = subMesh;
//} meshIdStrings = subMeshIdString;
} else { } else {
nodemesh::Combiner::Mesh *newMesh = combineTwoMeshes(*mesh, auto combinerMethod = childCombineMode == CombineMode::Inversion ?
nodemesh::Combiner::Method::Diff : nodemesh::Combiner::Method::Union;
auto combinerMethodString = combinerMethod == nodemesh::Combiner::Method::Union ?
"+" : "-";
meshIdStrings += combinerMethodString + subMeshIdString;
if (recombine)
meshIdStrings += "!";
nodemesh::Combiner::Mesh *newMesh = nullptr;
auto findCached = m_cacheContext->cachedCombination.find(meshIdStrings);
if (findCached != m_cacheContext->cachedCombination.end()) {
if (nullptr != findCached->second) {
//qDebug() << "Use cached combination:" << meshIdStrings;
newMesh = new nodemesh::Combiner::Mesh(*findCached->second);
}
} else {
newMesh = combineTwoMeshes(*mesh,
*subMesh, *subMesh,
childCombineMode == CombineMode::Inversion ? combinerMethod,
nodemesh::Combiner::Method::Diff : nodemesh::Combiner::Method::Union,
recombine); recombine);
delete subMesh; delete subMesh;
if (nullptr != newMesh)
m_cacheContext->cachedCombination.insert({meshIdStrings, new nodemesh::Combiner::Mesh(*newMesh)});
else
m_cacheContext->cachedCombination.insert({meshIdStrings, nullptr});
//qDebug() << "Add cached combination:" << meshIdStrings;
}
if (newMesh && !newMesh->isNull()) { if (newMesh && !newMesh->isNull()) {
delete mesh; delete mesh;
mesh = newMesh; mesh = newMesh;
@ -954,7 +979,7 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineMultipleMeshes(const std::vector
nodemesh::Combiner::Mesh *MeshGenerator::combineComponentChildGroupMesh(const std::vector<QString> &componentIdStrings, GeneratedComponent &componentCache) nodemesh::Combiner::Mesh *MeshGenerator::combineComponentChildGroupMesh(const std::vector<QString> &componentIdStrings, GeneratedComponent &componentCache)
{ {
std::vector<std::pair<nodemesh::Combiner::Mesh *, CombineMode>> multipleMeshes; std::vector<std::tuple<nodemesh::Combiner::Mesh *, CombineMode, QString>> multipleMeshes;
for (const auto &childIdString: componentIdStrings) { for (const auto &childIdString: componentIdStrings) {
CombineMode childCombineMode = CombineMode::Normal; CombineMode childCombineMode = CombineMode::Normal;
nodemesh::Combiner::Mesh *subMesh = combineComponentMesh(childIdString, &childCombineMode); nodemesh::Combiner::Mesh *subMesh = combineComponentMesh(childIdString, &childCombineMode);
@ -979,7 +1004,7 @@ nodemesh::Combiner::Mesh *MeshGenerator::combineComponentChildGroupMesh(const st
continue; continue;
} }
multipleMeshes.push_back({subMesh, childCombineMode}); multipleMeshes.push_back({subMesh, childCombineMode, childIdString});
} }
return combineMultipleMeshes(multipleMeshes); return combineMultipleMeshes(multipleMeshes);
} }
@ -1106,6 +1131,15 @@ void MeshGenerator::generate()
} }
for (auto it = m_cacheContext->components.begin(); it != m_cacheContext->components.end(); ) { for (auto it = m_cacheContext->components.begin(); it != m_cacheContext->components.end(); ) {
if (m_snapshot->components.find(it->first) == m_snapshot->components.end()) { if (m_snapshot->components.find(it->first) == m_snapshot->components.end()) {
for (auto combinationIt = m_cacheContext->cachedCombination.begin(); combinationIt != m_cacheContext->cachedCombination.end(); ) {
if (-1 != combinationIt->first.indexOf(it->first)) {
//qDebug() << "Removed cached combination:" << combinationIt->first;
delete combinationIt->second;
combinationIt = m_cacheContext->cachedCombination.erase(combinationIt);
continue;
}
combinationIt++;
}
it = m_cacheContext->components.erase(it); it = m_cacheContext->components.erase(it);
continue; continue;
} }
@ -1116,6 +1150,18 @@ void MeshGenerator::generate()
collectParts(); collectParts();
checkDirtyFlags(); checkDirtyFlags();
for (const auto &dirtyComponentId: m_dirtyComponentIds) {
for (auto combinationIt = m_cacheContext->cachedCombination.begin(); combinationIt != m_cacheContext->cachedCombination.end(); ) {
if (-1 != combinationIt->first.indexOf(dirtyComponentId)) {
//qDebug() << "Removed dirty cached combination:" << combinationIt->first;
delete combinationIt->second;
combinationIt = m_cacheContext->cachedCombination.erase(combinationIt);
continue;
}
combinationIt++;
}
}
m_dirtyComponentIds.insert(QUuid().toString()); m_dirtyComponentIds.insert(QUuid().toString());
m_mainProfileMiddleX = valueOfKeyInMapOrEmpty(m_snapshot->canvas, "originX").toFloat(); m_mainProfileMiddleX = valueOfKeyInMapOrEmpty(m_snapshot->canvas, "originX").toFloat();

4
src/meshgenerator.h
View File

@ -6,6 +6,7 @@
#include <nodemesh/combiner.h> #include <nodemesh/combiner.h>
#include <nodemesh/positionkey.h> #include <nodemesh/positionkey.h>
#include <nodemesh/builder.h> #include <nodemesh/builder.h>
#include <tuple>
#include "outcome.h" #include "outcome.h"
#include "snapshot.h" #include "snapshot.h"
#include "combinemode.h" #include "combinemode.h"
@ -47,6 +48,7 @@ public:
std::map<QString, GeneratedComponent> components; std::map<QString, GeneratedComponent> components;
std::map<QString, GeneratedPart> parts; std::map<QString, GeneratedPart> parts;
std::map<QString, QString> partMirrorIdMap; std::map<QString, QString> partMirrorIdMap;
std::map<QString, nodemesh::Combiner::Mesh *> cachedCombination;
}; };
class MeshGenerator : public QObject class MeshGenerator : public QObject
@ -116,7 +118,7 @@ private:
CombineMode componentCombineMode(const std::map<QString, QString> *component); CombineMode componentCombineMode(const std::map<QString, QString> *component);
nodemesh::Combiner::Mesh *combineComponentChildGroupMesh(const std::vector<QString> &componentIdStrings, nodemesh::Combiner::Mesh *combineComponentChildGroupMesh(const std::vector<QString> &componentIdStrings,
GeneratedComponent &componentCache); GeneratedComponent &componentCache);
nodemesh::Combiner::Mesh *combineMultipleMeshes(const std::vector<std::pair<nodemesh::Combiner::Mesh *, CombineMode>> &multipleMeshes, bool recombine=true); nodemesh::Combiner::Mesh *combineMultipleMeshes(const std::vector<std::tuple<nodemesh::Combiner::Mesh *, CombineMode, QString>> &multipleMeshes, bool recombine=true);
QString componentColorName(const std::map<QString, QString> *component); QString componentColorName(const std::map<QString, QString> *component);
void collectUncombinedComponent(const QString &componentIdString); void collectUncombinedComponent(const QString &componentIdString);
void cutFaceStringToCutTemplate(const QString &cutFaceString, std::vector<QVector2D> &cutTemplate); void cutFaceStringToCutTemplate(const QString &cutFaceString, std::vector<QVector2D> &cutTemplate);