Show cutface review as image instead of mesh

huxingyi · Dec 20, 2022 · 98ad7bc · 98ad7bc
1 parent 4e15cb9
commit 98ad7bc
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 164 deletions.
diff --git a/application/application.pro b/application/application.pro
@@ -286,8 +286,6 @@ HEADERS += ../dust3d/mesh/resolve_triangle_tangent.h
 SOURCES += ../dust3d/mesh/resolve_triangle_tangent.cc
 HEADERS += ../dust3d/mesh/rope_mesh.h
 SOURCES += ../dust3d/mesh/rope_mesh.cc
-HEADERS += ../dust3d/mesh/section_preview_mesh_builder.h
-SOURCES += ../dust3d/mesh/section_preview_mesh_builder.cc
 HEADERS += ../dust3d/mesh/section_remesher.h
 SOURCES += ../dust3d/mesh/section_remesher.cc
 HEADERS += ../dust3d/mesh/smooth_normal.h

diff --git a/application/sources/document.cc b/application/sources/document.cc
@@ -2151,6 +2151,14 @@ void Document::meshReady()
         emit resultComponentPreviewMeshesChanged();
     }
 
+    std::unique_ptr<std::map<dust3d::Uuid, std::unique_ptr<QImage>>> componentPreviewImages;
+    componentPreviewImages.reset(m_meshGenerator->takeComponentPreviewImages());
+    if (componentPreviewImages && !componentPreviewImages->empty()) {
+        for (auto& it : *componentPreviewImages) {
+            setComponentPreviewImage(it.first, std::move(it.second));
+        }
+    }
+
     delete m_resultMesh;
     m_resultMesh = resultMesh;
 

diff --git a/application/sources/mesh_generator.cc b/application/sources/mesh_generator.cc
@@ -20,6 +20,11 @@ std::map<dust3d::Uuid, std::unique_ptr<ModelMesh>>* MeshGenerator::takeComponent
     return m_componentPreviewMeshes.release();
 }
 
+std::map<dust3d::Uuid, std::unique_ptr<QImage>>* MeshGenerator::takeComponentPreviewImages()
+{
+    return m_componentPreviewImages.release();
+}
+
 MonochromeMesh* MeshGenerator::takeWireframeMesh()
 {
     return m_wireframeMesh.release();
@@ -35,11 +40,19 @@ void MeshGenerator::process()
     if (nullptr != m_object)
         m_resultMesh = std::make_unique<ModelMesh>(*m_object);
 
+    m_componentPreviewImages = std::make_unique<std::map<dust3d::Uuid, std::unique_ptr<QImage>>>();
+
     m_componentPreviewMeshes = std::make_unique<std::map<dust3d::Uuid, std::unique_ptr<ModelMesh>>>();
     for (const auto& componentId : m_generatedPreviewComponentIds) {
         auto it = m_generatedComponentPreviews.find(componentId);
         if (it == m_generatedComponentPreviews.end())
             continue;
+        if (!it->second.cutFaceTemplate.empty()) {
+            QImage* previewImage = buildCutFaceTemplatePreviewImage(it->second.cutFaceTemplate);
+            if (nullptr != previewImage)
+                (*m_componentPreviewImages)[componentId].reset(previewImage);
+            continue;
+        }
         std::vector<std::array<dust3d::Vector2, 3>> triangleUvs;
         if (!it->second.triangleUvs.empty()) {
             triangleUvs.resize(it->second.triangles.size());

diff --git a/application/sources/mesh_generator.h b/application/sources/mesh_generator.h
@@ -15,6 +15,7 @@ class MeshGenerator : public QObject, public dust3d::MeshGenerator {
     ~MeshGenerator();
     ModelMesh* takeResultMesh();
     std::map<dust3d::Uuid, std::unique_ptr<ModelMesh>>* takeComponentPreviewMeshes();
+    std::map<dust3d::Uuid, std::unique_ptr<QImage>>* takeComponentPreviewImages();
     MonochromeMesh* takeWireframeMesh();
 public slots:
     void process();
@@ -24,6 +25,7 @@ public slots:
 private:
     std::unique_ptr<ModelMesh> m_resultMesh;
     std::unique_ptr<std::map<dust3d::Uuid, std::unique_ptr<ModelMesh>>> m_componentPreviewMeshes;
+    std::unique_ptr<std::map<dust3d::Uuid, std::unique_ptr<QImage>>> m_componentPreviewImages;
     std::unique_ptr<MonochromeMesh> m_wireframeMesh;
 };
 

diff --git a/dust3d/mesh/mesh_generator.cc b/dust3d/mesh/mesh_generator.cc
@@ -27,7 +27,6 @@
 #include <dust3d/mesh/mesh_generator.h>
 #include <dust3d/mesh/mesh_recombiner.h>
 #include <dust3d/mesh/rope_mesh.h>
-#include <dust3d/mesh/section_preview_mesh_builder.h>
 #include <dust3d/mesh/smooth_normal.h>
 #include <dust3d/mesh/stitch_mesh_builder.h>
 #include <dust3d/mesh/triangulate.h>
@@ -711,18 +710,8 @@ std::unique_ptr<MeshState> MeshGenerator::combinePartMesh(const std::string& par
         preview.triangleUvs = partCache.triangleUvs;
         addComponentPreview(componentIdString, std::move(preview));
     } else if (PartTarget::CutFace == target) {
-        std::unique_ptr<SectionPreviewMeshBuilder> sectionPreviewMeshBuilder;
-        std::vector<Vector2> previewCutTemplate;
-        cutFaceStringToCutTemplate(partIdString, previewCutTemplate);
-        sectionPreviewMeshBuilder = std::make_unique<SectionPreviewMeshBuilder>(previewCutTemplate, partCache.color);
-        sectionPreviewMeshBuilder->build();
         ComponentPreview preview;
-        preview.vertices = sectionPreviewMeshBuilder->resultVertices();
-        preview.triangles = sectionPreviewMeshBuilder->resultTriangles();
-        preview.vertexProperties = sectionPreviewMeshBuilder->resultVertexProperties();
-        preview.color = partCache.color;
-        preview.metalness = partCache.metalness;
-        preview.roughness = partCache.roughness;
+        cutFaceStringToCutTemplate(partIdString, preview.cutFaceTemplate);
         addComponentPreview(componentIdString, std::move(preview));
     }
 

diff --git a/dust3d/mesh/mesh_generator.h b/dust3d/mesh/mesh_generator.h
@@ -103,6 +103,7 @@ class MeshGenerator {
         float metalness = 0.0;
         float roughness = 1.0;
         std::vector<std::tuple<dust3d::Color, float /*metalness*/, float /*roughness*/>> vertexProperties;
+        std::vector<Vector2> cutFaceTemplate;
     };
 
     MeshGenerator(Snapshot* snapshot);

diff --git a/dust3d/mesh/section_preview_mesh_builder.cc b/dust3d/mesh/section_preview_mesh_builder.cc
diff --git a/dust3d/mesh/section_preview_mesh_builder.h b/dust3d/mesh/section_preview_mesh_builder.h