Initial dummy implementation of model patching.

src/common/types.h

@@ -43,6 +43,11 @@ struct vector3
     T x;
     T y;
     T z;
+
+    bool operator==(const vector3 &rhs) const
+    {
+        return std::tie(x,y,z) == std::tie(rhs.x,rhs.y,rhs.z);
+    }
 };
 
 using vector3f = vector3<float>;

src/mod_converter/fbx.cpp

@@ -365,9 +365,8 @@ bool CreateScene(const model &model, const std::string &name, FbxManager* pSdkMa
         {
             // Set the control point indices of the bottom side of the pyramid
             m->BeginPolygon();
-            m->AddPolygon(v.x);
-            m->AddPolygon(v.y);
-            m->AddPolygon(v.z);
+            for (auto i : v.vertex_list)
+                m->AddPolygon(i);
             m->EndPolygon();
         }
 

src/model/model.cpp

@@ -139,9 +139,7 @@ void vertex::load(const buffer &b, uint32_t flags)
 
 void face::load(const buffer &b)
 {
-    READ(b, x);
-    READ(b, y);
-    READ(b, z);
+    READ(b, vertex_list);
 }
 
 static String print_float(double v)
@@ -319,15 +317,10 @@ std::string block::printMtl() const
     return s;
 }
 
-std::string block::printObj(int group_offset, AxisSystem as) const
+static std::string print_vertices_and_faces(int group_offset, AxisSystem as,
+    const std::vector<vertex> &vertices, const std::vector<face> &faces)
 {
     std::string s;
-    s += "usemtl " + h.name + "\n";
-    s += "\n";
-    s += "g " + h.name + "\n";
-    s += "s 1\n"; // still unk how to use
-    s += "\n";
-
     s += "# " + std::to_string(vertices.size()) + " vertices\n";
     for (auto &v : vertices)
         s += v.printVertex(as) + "\n";
@@ -344,20 +337,76 @@ std::string block::printObj(int group_offset, AxisSystem as) const
     s += "# " + std::to_string(vertices.size()) + " faces\n";
     for (auto &t : faces)
     {
-        auto v = rotate(t, as);
-
-        auto x = std::to_string(v.x + 1 + group_offset);
-        auto y = std::to_string(v.y + 1 + group_offset);
-        auto z = std::to_string(v.z + 1 + group_offset);
+        // no rotate here
+        // it is not face operation
+        s += "f ";
+        for (auto v : t.vertex_list)
+        {
+            auto x = std::to_string(v + 1 + group_offset);
             x += "/" + x + "/" + x;
-        y += "/" + y + "/" + y;
-        z += "/" + z + "/" + z;
-        s += "f " + x + " " + z + " " + y + "\n";
+            s += x + " ";
+        }
+        s += "\n";
+    }
+    return s;
+}
+
+std::string block::printObj(int group_offset, AxisSystem as,
+    const std::vector<vertex> &vertices, const std::vector<face> &faces) const
+{
+    std::string s;
+    s += "usemtl " + h.name + "\n";
+    s += "\n";
+    s += "g " + h.name + "\n";
+    s += "s 1\n"; // still unk how to use
+    s += "\n";
+
+    s += print_vertices_and_faces(group_offset, as, vertices, faces);
+    return s;
+}
+
+std::string block::printObj(int group_offset, AxisSystem as) const
+{
+    return printObj(group_offset, as, vertices, faces);
+}
+
+std::string block::printObjSlow(int group_offset, AxisSystem as) const
+{
+    // TODO: this implementation is not working now
+    // Correct one is at https://pastebin.com/KewhggDj
+
+    std::vector<vertex> vertices2;
+    vertices2.reserve(vertices.size());
+    std::unordered_map<short, short> repl;
+    repl.reserve(vertices.size());
+
+    auto sz = vertices.size();
+    for (int i = 0; i < sz; i++)
+    {
+        auto it = std::find_if(vertices2.begin(), vertices2.end(), [this, i](auto &v1)
+        {
+            return (aim_vector3f&)vertices[i].coordinates == (aim_vector3f&)v1.coordinates;
+        });
+        if (it == vertices2.end())
+            vertices2.push_back(vertices[i]);
+        else
+            repl[i] = std::distance(vertices2.begin(), it);
     }
 
-    s += "\n";
-    s += "\n";
-    return s;
+    std::vector<face> faces2;
+    for (auto f : faces)
+    {
+        for (auto &v : f.vertex_list)
+            v = repl[v];
+        auto it = std::find_if(faces2.begin(), faces2.end(), [f](auto &f1)
+        {
+            return f.vertex_list == f1.vertex_list;
+        });
+        if (it == faces2.end())
+            faces2.push_back(f);
+    }
+
+    return printObj(group_offset, as, vertices2, faces2);
 }
 
 void block::header::texture::load(const buffer &b)
@@ -630,7 +679,7 @@ void model::print(const std::string &fn, AxisSystem as) const
         o << "\n";
     };
 
-    auto print_obj = [&](const auto &n)
+    auto print_obj = [&](const auto &n, bool patched)
     {
         std::ofstream o(n);
         title(o);
@@ -642,7 +691,7 @@ void model::print(const std::string &fn, AxisSystem as) const
             if (!b.canPrint())
                 continue;
 
-            o << b.printObj(n_vert, as) << "\n";
+            o << (patched ? b.printObjSlow(n_vert, as) : b.printObj(n_vert, as)) << "\n";
             n_vert += b.vertices.size();
         }
     };
@@ -653,7 +702,8 @@ void model::print(const std::string &fn, AxisSystem as) const
     for (auto &b : blocks)
         m << b.printMtl() << "\n";
 
-    print_obj(fn + ".obj");
+    print_obj(fn + ".obj", false);
+    print_obj(fn + "_patched.obj", true);
 }
 
 void model::save(yaml &root) const

src/model/model.h

@@ -144,8 +144,10 @@ struct vertex
     std::string printTex() const;
 };
 
-struct face : aim_vector3<uint16_t>
+struct face
 {
+    uint16_t vertex_list[3];
+
     void load(const buffer &b);
 };
 
@@ -311,10 +313,15 @@ struct block
 
     std::string printMtl() const;
     std::string printObj(int group_offset, AxisSystem as) const;
+    std::string printObjSlow(int group_offset, AxisSystem as) const;
     block_info save(yaml &root) const;
 
     bool canPrint() const;
     bool isEngineFx() const;
+
+private:
+    std::string block::printObj(int group_offset, AxisSystem as,
+        const std::vector<vertex> &vertices, const std::vector<face> &faces) const;
 };
 
 struct model