File upstream-Optimize-models.patch of Package celestia

Overview Repositories Revisions Requests Users Attributes Meta

File upstream-Optimize-models.patch of Package celestia (Revision b1a204fb505e1f44af3941dfd2448d8d)

Currently displaying revision b1a204fb505e1f44af3941dfd2448d8d , Show latest

From 8110a80e6269e6f120d86abc19bf92e2acc6b74b Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@gmail.com>
Date: Tue, 25 Jan 2022 20:08:25 +0200
Subject: [PATCH 1/3] Optimize mesh by merging similar primitive groups

---
 src/celmodel/mesh.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++
 src/celmodel/mesh.h   |  1 +
 2 files changed, 59 insertions(+)

diff --git a/src/celmodel/mesh.cpp b/src/celmodel/mesh.cpp
index 9cba43c05..a89d23ed4 100644
--- a/src/celmodel/mesh.cpp
+++ b/src/celmodel/mesh.cpp
@@ -14,9 +14,11 @@
 #include <iterator>
 #include <tuple>
 #include <utility>
+#include <celutil/logger.h>
 
 #include "mesh.h"
 
+using celestia::util::GetLogger;
 
 namespace cmod
 {
@@ -393,9 +395,65 @@ Mesh::aggregateByMaterial()
               {
                   return g0.materialIndex < g1.materialIndex;
               });
+    mergePrimitiveGroups();
 }
 
 
+void
+Mesh::mergePrimitiveGroups()
+{
+    if (groups.size() < 2)
+        return;
+
+    std::vector<PrimitiveGroup> newGroups;
+    for (size_t i = 0; i < groups.size(); i++)
+    {
+        auto &g = groups[i];
+
+        if (g.vertexCountOverride == 0 && g.prim == PrimitiveGroupType::TriStrip)
+        {
+            std::vector<Index32> newIndices;
+            newIndices.reserve(g.indices.size() * 2);
+            for (size_t j = 0, e = g.indices.size() - 2; j < e; j++)
+            {
+                auto x = g.indices[j + 0];
+                auto y = g.indices[j + 1];
+                auto z = g.indices[j + 2];
+                // skip degenerated triangles
+                if (x == y || y == z || z == x)
+                    continue;
+                if ((j & 1) != 0) // FIXME: CCW hardcoded
+                    std::swap(y, z);
+                newIndices.push_back(x);
+                newIndices.push_back(y);
+                newIndices.push_back(z);
+            }
+            g.indices = std::move(newIndices);
+            g.prim = PrimitiveGroupType::TriList;
+        }
+
+        if (i == 0 || g.vertexCountOverride != 0 || g.prim != PrimitiveGroupType::TriList)
+        {
+            newGroups.push_back(std::move(g));
+        }
+        else
+        {
+            auto &p = newGroups.back();
+            if (p.prim != g.prim || p.materialIndex != g.materialIndex)
+            {
+                newGroups.push_back(std::move(g));
+            }
+            else
+            {
+                p.indices.reserve(p.indices.size() + g.indices.size());
+                p.indices.insert(p.indices.end(), g.indices.begin(), g.indices.end());
+            }
+        }
+    }
+    GetLogger()->info("Optimized mesh groups: had {} groups, now: {} of them.\n", groups.size(), newGroups.size());
+    groups = std::move(newGroups);
+}
+
 bool
 Mesh::pick(const Eigen::Vector3d& rayOrigin, const Eigen::Vector3d& rayDirection, PickResult* result) const
 {
diff --git a/src/celmodel/mesh.h b/src/celmodel/mesh.h
index 86d35877d..fc6bcb58d 100644
--- a/src/celmodel/mesh.h
+++ b/src/celmodel/mesh.h
@@ -239,6 +239,7 @@ class Mesh
 
  private:
     PrimitiveGroup createLinePrimitiveGroup(bool lineStrip, const std::vector<Index32>& indices);
+    void mergePrimitiveGroups();
 
     VertexDescription vertexDesc{ };

From 1db9b0dd06dc3a45cff29173c5433b177d7367ea Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@gmail.com>
Date: Thu, 27 Jan 2022 22:28:49 +0200
Subject: [PATCH 2/3] Optimize model by merging similar meshes

---
 src/celmodel/mesh.cpp  | 60 +++++++++++++++++++++++++++++++++++++-----
 src/celmodel/mesh.h    |  3 +++
 src/celmodel/model.cpp | 19 +++++++++++++
 3 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/src/celmodel/mesh.cpp b/src/celmodel/mesh.cpp
index a89d23ed4..579f7cc00 100644
--- a/src/celmodel/mesh.cpp
+++ b/src/celmodel/mesh.cpp
@@ -40,6 +40,13 @@ VertexDescription appendingAttributes(const VertexDescription& desc, It begin, I
     return VertexDescription(std::move(allAttributes));
 }
 
+bool
+isOpaqueMaterial(const Material &material)
+{
+    return (!(material.opacity > 0.01f && material.opacity < 1.0f)) &&
+             material.blend != BlendMode::AdditiveBlend;
+}
+
 } // end unnamed namespace
 
 
@@ -322,13 +329,7 @@ Mesh::addGroup(PrimitiveGroupType prim,
 {
     PrimitiveGroup g;
     if (prim == PrimitiveGroupType::LineStrip || prim == PrimitiveGroupType::LineList)
-    {
         g = createLinePrimitiveGroup(prim == PrimitiveGroupType::LineStrip, indices);
-    }
-    else
-    {
-        g.primOverride = prim;
-    }
 
     g.indices = std::move(indices);
     g.prim = prim;
@@ -721,4 +722,51 @@ Mesh::getPrimitiveCount() const
     return count;
 }
 
+void
+Mesh::merge(const Mesh &other)
+{
+    auto &ti = groups.front().indices;
+    const auto &oi = other.groups.front().indices;
+
+    ti.reserve(ti.size() + oi.size());
+    for (auto i : oi)
+        ti.push_back(i + nVertices);
+
+    vertices.reserve(vertices.size() + other.vertices.size());
+    vertices.insert(vertices.end(), other.vertices.begin(), other.vertices.end());
+
+    nVertices += other.nVertices;
+}
+
+bool
+Mesh::canMerge(const Mesh &other, const std::vector<Material> &materials) const
+{
+    if (getGroupCount() != 1 || other.getGroupCount() != 1)
+        return false;
+
+    const auto &tg = groups.front();
+    const auto &og = other.groups.front();
+
+    if (tg.vertexCountOverride != 0 || og.vertexCountOverride != 0 || tg.prim != PrimitiveGroupType::TriList)
+        return false;
+
+    if (std::tie(tg.materialIndex, tg.prim, vertexDesc.strideBytes) !=
+        std::tie(og.materialIndex, og.prim, other.vertexDesc.strideBytes))
+        return false;
+
+    if (!isOpaqueMaterial(materials[tg.materialIndex]) || !isOpaqueMaterial(materials[og.materialIndex]))
+        return false;
+
+    for (auto i = VertexAttributeSemantic::Position;
+         i < VertexAttributeSemantic::SemanticMax;
+         i = static_cast<VertexAttributeSemantic>(1 + static_cast<uint16_t>(i)))
+    {
+        auto &ta = vertexDesc.getAttribute(i);
+        auto &oa = other.vertexDesc.getAttribute(i);
+        if (ta.format != oa.format || ta.offsetWords != oa.offsetWords)
+            return false;
+    }
+
+    return true;
+}
 } // end namespace cmod
diff --git a/src/celmodel/mesh.h b/src/celmodel/mesh.h
index fc6bcb58d..68dbb2945 100644
--- a/src/celmodel/mesh.h
+++ b/src/celmodel/mesh.h
@@ -237,6 +237,9 @@ class Mesh
     unsigned int getVertexStrideWords() const { return vertexDesc.strideBytes / sizeof(cmod::VWord); }
     unsigned int getPrimitiveCount() const;
 
+    void merge(const Mesh&);
+    bool canMerge(const Mesh&, const std::vector<Material> &materials) const;
+
  private:
     PrimitiveGroup createLinePrimitiveGroup(bool lineStrip, const std::vector<Index32>& indices);
     void mergePrimitiveGroups();
diff --git a/src/celmodel/model.cpp b/src/celmodel/model.cpp
index ce3f77b66..def26e852 100644
--- a/src/celmodel/model.cpp
+++ b/src/celmodel/model.cpp
@@ -15,8 +15,11 @@
 
 #include <Eigen/Geometry>
 
+#include <celutil/logger.h>
+
 #include "model.h"
 
+using celestia::util::GetLogger;
 
 namespace cmod
 {
@@ -335,6 +338,22 @@ Model::sortMeshes(const MeshComparator& comparator)
 
     // Sort the meshes so that completely opaque ones are first
     std::sort(meshes.begin(), meshes.end(), std::ref(comparator));
+
+    std::vector<Mesh> newMeshes;
+    newMeshes.push_back(meshes[0].clone());
+
+    for (size_t i = 1; i < meshes.size(); i++)
+    {
+        auto &p = newMeshes.back();
+        if (!p.canMerge(meshes[i], materials))
+        {
+            newMeshes.push_back(meshes[i].clone());
+            continue;
+        }
+        p.merge(meshes[i]);
+    }
+    GetLogger()->info("Merged similar meshes: {} -> {}.\n", meshes.size(), newMeshes.size());
+    meshes = std::move(newMeshes);
 }
 
 } // end namespace cmod

From 6d07e6cfcb936d694f1fa02fff5e99601a0276f0 Mon Sep 17 00:00:00 2001
From: Hleb Valoshka <375gnu@gmail.com>
Date: Thu, 17 Feb 2022 23:01:11 +0200
Subject: [PATCH 3/3] Optimize meshes with meshoptimizer library if available

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcbbfaddd..12d5feb08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,14 @@ endif()
 find_package(Freetype REQUIRED)
 link_libraries(Freetype::Freetype)
 
+find_package(meshoptimizer CONFIG QUIET)
+if(meshoptimizer_FOUND)
+  message(STATUS "Found meshoptimizer library")
+  set(HAVE_MESHOPTIMIZER 1)
+else()
+  message(STATUS "meshoptimizer library is missing")
+endif()
+
 #[[
 get_cmake_property(_variableNames VARIABLES)
 list (SORT _variableNames)
diff --git a/config.h.in b/config.h.in
index ddc068989..6675c4a0d 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,4 +3,5 @@
 #cmakedefine HAVE_FLOAT_CHARCONV
 #cmakedefine HAVE_STD_FILESYSTEM
 #cmakedefine HAVE_WORDEXP
+#cmakedefine HAVE_MESHOPTIMIZER
 #cmakedefine WORDS_BIGENDIAN
diff --git a/src/celestia/CMakeLists.txt b/src/celestia/CMakeLists.txt
index 405ece35a..ddf9884d0 100644
--- a/src/celestia/CMakeLists.txt
+++ b/src/celestia/CMakeLists.txt
@@ -80,6 +80,10 @@ if(ENABLE_FFMPEG)
   target_link_libraries(celestia ${FFMPEG_LIBRARIES})
 endif()
 
+if (HAVE_MESHOPTIMIZER)
+  target_link_libraries(celestia meshoptimizer::meshoptimizer)
+endif()
+
 install(TARGETS celestia LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP)
 
 add_subdirectory(glut)
diff --git a/src/celmodel/mesh.cpp b/src/celmodel/mesh.cpp
index 579f7cc00..809ebabc6 100644
--- a/src/celmodel/mesh.cpp
+++ b/src/celmodel/mesh.cpp
@@ -16,6 +16,10 @@
 #include <utility>
 #include <celutil/logger.h>
 
+#ifdef HAVE_MESHOPTIMIZER
+#include <meshoptimizer.h>
+#endif
+
 #include "mesh.h"
 
 using celestia::util::GetLogger;
@@ -455,6 +459,21 @@ Mesh::mergePrimitiveGroups()
     groups = std::move(newGroups);
 }
 
+void
+Mesh::optimize()
+{
+#ifdef HAVE_MESHOPTIMIZER
+    if (groups.size() > 1)
+        return;
+
+    auto &g = groups.front();
+
+    meshopt_optimizeVertexCache(g.indices.data(), g.indices.data(), g.indices.size(), nVertices);
+    meshopt_optimizeOverdraw(g.indices.data(), g.indices.data(), g.indices.size(), reinterpret_cast<float*>(vertices.data()), nVertices, vertexDesc.strideBytes, 1.05f);
+    meshopt_optimizeVertexFetch(vertices.data(), g.indices.data(), g.indices.size(), vertices.data(), nVertices, vertexDesc.strideBytes);
+#endif
+}
+
 bool
 Mesh::pick(const Eigen::Vector3d& rayOrigin, const Eigen::Vector3d& rayDirection, PickResult* result) const
 {
@@ -769,4 +788,5 @@ Mesh::canMerge(const Mesh &other, const std::vector<Material> &materials) const
 
     return true;
 }
+
 } // end namespace cmod
diff --git a/src/celmodel/mesh.h b/src/celmodel/mesh.h
index 68dbb2945..be3cd2bfa 100644
--- a/src/celmodel/mesh.h
+++ b/src/celmodel/mesh.h
@@ -239,6 +239,7 @@ class Mesh
 
     void merge(const Mesh&);
     bool canMerge(const Mesh&, const std::vector<Material> &materials) const;
+    void optimize();
 
  private:
     PrimitiveGroup createLinePrimitiveGroup(bool lineStrip, const std::vector<Index32>& indices);
diff --git a/src/celmodel/model.cpp b/src/celmodel/model.cpp
index def26e852..81ca1c23c 100644
--- a/src/celmodel/model.cpp
+++ b/src/celmodel/model.cpp
@@ -318,7 +318,6 @@ Model::usesTextureType(TextureSemantic t) const
 }
 
 
-
 bool
 Model::OpacityComparator::operator()(const Mesh& a, const Mesh& b) const
 {
@@ -353,6 +352,9 @@ Model::sortMeshes(const MeshComparator& comparator)
         p.merge(meshes[i]);
     }
     GetLogger()->info("Merged similar meshes: {} -> {}.\n", meshes.size(), newMeshes.size());
+
+    for (auto &mesh : newMeshes)
+        mesh.optimize();
     meshes = std::move(newMeshes);
 }

Places

File upstream-Optimize-models.patch of Package celestia (Revision b1a204fb505e1f44af3941dfd2448d8d)

Places