Merge pull request #2 from Ultimaker/CURA-12743_slow-performance-while-painting

CURA-12743 optimize painting performance

Author: HellAholic

CMakeLists.txt

@@ -4,6 +4,7 @@ project(uvula)
 find_package(standardprojectsettings REQUIRED)
 find_package(spdlog REQUIRED)
 find_package(range-v3 REQUIRED)
+find_package(clipper REQUIRED)
 
 option(EXTENSIVE_WARNINGS "Build with all warnings" ON)
 
@@ -21,8 +22,13 @@ message(STATUS "Configuring Uvula version: ${UVULA_VERSION}")
 set(UVULA_SRC
         src/xatlas.cpp
         src/unwrap.cpp
-        src/Vector.cpp
-        src/Matrix.cpp
+        src/project.cpp
+        src/Vector3F.cpp
+        src/Vector2F.cpp
+        src/Matrix33F.cpp
+        src/Matrix44F.cpp
+        src/Triangle3F.cpp
+        src/Point3F.cpp
         src/geometry_utils.cpp
 )
 add_library(libuvula STATIC ${UVULA_SRC})
@@ -31,6 +37,7 @@ target_link_libraries(libuvula
         PUBLIC
         spdlog::spdlog
         range-v3::range-v3
+        clipper::clipper
 )
 
 target_include_directories(libuvula

cli/cli.cpp

@@ -14,8 +14,8 @@
 #include <spdlog/stopwatch.h>
 
 #include "Face.h"
-#include "UVCoord.h"
-#include "Vertex.h"
+#include "Point2F.h"
+#include "Point3F.h"
 #include "unwrap.h"
 
 int main(int argc, char** argv)
@@ -84,7 +84,7 @@ int main(int argc, char** argv)
             spdlog::info("Processing (unnamed) mesh", mesh->mName.data);
         }
 
-        std::vector<Vertex> vertices;
+        std::vector<Point3F> vertices;
         vertices.reserve(mesh->mNumVertices);
         for (size_t j = 0; j < mesh->mNumVertices; j++)
         {
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
             indices.emplace_back(face.mIndices[0], face.mIndices[1], face.mIndices[2]);
         }
 
-        std::vector<UVCoord> uv_coords(mesh->mNumVertices, { 0.0, 0.0 });
+        std::vector<Point2F> uv_coords(mesh->mNumVertices, { 0.0, 0.0 });
         uint32_t texture_width, texture_height;
 
         spdlog::stopwatch timer;
@@ -132,10 +132,10 @@ int main(int argc, char** argv)
                         export_mesh->mTextureCoords[j] = new aiVector3D[export_mesh->mNumVertices];
                         for (size_t k = 0; k < export_mesh->mNumVertices; k++)
                         {
-                            const UVCoord& uv = uv_coords[k];
+                            const Point2F& uv = uv_coords[k];
                             aiVector3D& export_uv = export_mesh->mTextureCoords[j][k];
-                            export_uv.x = uv.u;
-                            export_uv.y = uv.v;
+                            export_uv.x = uv.x;
+                            export_uv.y = uv.y;
                         }
                     }
                     else

conanfile.py

@@ -92,6 +92,7 @@ def layout(self):
     def requirements(self):
         self.requires("spdlog/1.15.1")
         self.requires("range-v3/0.12.0")
+        self.requires("clipper/6.4.2@ultimaker/stable")
         if self.options.get_safe("with_python_bindings", False):
             self.requires("cpython/3.12.2")
             self.requires("pybind11/2.11.1")

include/Face.h

@@ -4,9 +4,14 @@
 
 #include <cstdint>
 
-struct Face
+template<typename IndexType>
+struct FaceIndex
 {
-    uint32_t i1{ 0 };
-    uint32_t i2{ 0 };
-    uint32_t i3{ 0 };
+    IndexType i1{ 0 };
+    IndexType i2{ 0 };
+    IndexType i3{ 0 };
 };
+
+using Face = FaceIndex<uint32_t>;
+
+using FaceSigned = FaceIndex<int32_t>;

include/Matrix.h

@@ -0,0 +1,22 @@
+// (c) 2025, UltiMaker -- see LICENCE for details
+
+#pragma once
+
+struct Point2F;
+class Point3F;
+class Vector3F;
+
+class Matrix33F
+{
+public:
+    explicit Matrix33F() = default;
+
+    void transpose();
+
+    [[nodiscard]] Point2F project(const Point3F& vertex) const;
+
+    static Matrix33F makeOrthogonalBasis(const Vector3F& normal);
+
+private:
+    float values_[3][3];
+};

include/Matrix33F.h

@@ -0,0 +1,17 @@
+// (c) 2025, UltiMaker -- see LICENCE for details
+
+#pragma once
+#include "Point3F.h"
+
+class Matrix44F
+{
+public:
+    explicit Matrix44F() = default;
+
+    explicit Matrix44F(const float values[4][4]);
+
+    Point3F preMultiply(const Point3F& point) const;
+
+private:
+    float values_[4][4];
+};

include/Matrix44F.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-struct UVCoord
+struct Point2F
 {
-    float u{ 0.0 };
-    float v{ 0.0 };
+    float x{ 0.0 };
+    float y{ 0.0 };
 };

include/UVCoord.h include/Point2F.hinclude/UVCoord.h renamed to include/Point2F.h

@@ -0,0 +1,48 @@
+// (c) 2025, UltiMaker -- see LICENCE for details
+
+#pragma once
+
+class Matrix44F;
+
+class Point3F
+{
+public:
+    explicit Point3F(const float x, const float y, const float z);
+
+    [[nodiscard]] float x() const
+    {
+        return x_;
+    }
+
+    [[nodiscard]] float y() const
+    {
+        return y_;
+    }
+
+    [[nodiscard]] float z() const
+    {
+        return z_;
+    }
+
+    Point3F& operator/=(const float scale);
+
+    friend bool operator<(const Point3F& lhs, const Point3F& rhs)
+    {
+        if (lhs.x_ != rhs.x_)
+        {
+            return lhs.x_ < rhs.x_;
+        }
+
+        if (lhs.y_ != rhs.y_)
+        {
+            return lhs.y_ < rhs.y_;
+        }
+
+        return lhs.z_ < rhs.z_;
+    }
+
+private:
+    float x_{ 0.0 };
+    float y_{ 0.0 };
+    float z_{ 0.0 };
+};

include/Point3F.h

@@ -0,0 +1,12 @@
+// (c) 2025, UltiMaker -- see LICENCE for details
+
+#pragma once
+
+#include "Point2F.h"
+
+struct Triangle2F
+{
+    Point2F p1;
+    Point2F p2;
+    Point2F p3;
+};