Update to latest Magnum with more efficient glTF mesh import and various UX improvements (#2551)

mosra · web-flow · commit 2aa5ed12c639 · 2025-03-07T16:26:19.000-05:00
* Update to latest Magnum.

* assets: contrary to the comment, this was mainly a workaround.

In some cases such as depth-only rendering it may be desirable to have
for example positions *not* interleaved with the remaining attributes,
and this would undo that optimization.

The code below however calls mutableIndices(), and without the
interleave it blows up because not all meshes have mutable index data,
apparently. So we need to expand that check there.

* assets: can use this nice helper also.

Could also resolve the TODO there because generateIndices() is a thing
that works, but don't feel like doing that now.

* Use arrayClear() instead of arrayResize(..., 0).

* Use the path() and filename() shorthands for Path::split().

* clang format wants to say something?!

The machine is so amazing, a human could never format it like this, it
would always have some silly slightly different opinion. Result? It
makes me *hate* the code I write because it's never good enough for the
machine, and I don't enjoy reading the formatted thing either.

We've achieved peak technology.
diff --git a/src/cmake/FindBullet.cmake b/src/cmake/FindBullet.cmake
@@ -27,7 +27,8 @@
 #   This file is part of Magnum.
 #
 #   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-#               2020, 2021, 2022, 2023 Vladimír Vondruš <mosra@centrum.cz>
+#               2020, 2021, 2022, 2023, 2024, 2025
+#             Vladimír Vondruš <mosra@centrum.cz>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a
 #   copy of this software and associated documentation files (the "Software"),
diff --git a/src/cmake/FindCorrade.cmake b/src/cmake/FindCorrade.cmake
@@ -277,7 +277,7 @@
 #   This file is part of Corrade.
 #
 #   Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
-#               2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024
+#               2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025
 #             Vladimír Vondruš <mosra@centrum.cz>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/cmake/FindMagnum.cmake b/src/cmake/FindMagnum.cmake
@@ -208,7 +208,7 @@
 #   This file is part of Magnum.
 #
 #   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-#               2020, 2021, 2022, 2023, 2024
+#               2020, 2021, 2022, 2023, 2024, 2025
 #             Vladimír Vondruš <mosra@centrum.cz>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/cmake/FindMagnumBindings.cmake b/src/cmake/FindMagnumBindings.cmake
@@ -35,7 +35,7 @@
 #   This file is part of Magnum.
 #
 #   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-#               2020, 2021, 2022, 2023, 2024
+#               2020, 2021, 2022, 2023, 2024, 2025
 #             Vladimír Vondruš <mosra@centrum.cz>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/cmake/FindMagnumIntegration.cmake b/src/cmake/FindMagnumIntegration.cmake
@@ -48,7 +48,7 @@
 #   This file is part of Magnum.
 #
 #   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-#               2020, 2021, 2022, 2023, 2024
+#               2020, 2021, 2022, 2023, 2024, 2025
 #             Vladimír Vondruš <mosra@centrum.cz>
 #   Copyright © 2018 Konstantinos Chatzilygeroudis <costashatz@gmail.com>
 #
diff --git a/src/cmake/FindMagnumPlugins.cmake b/src/cmake/FindMagnumPlugins.cmake
@@ -95,7 +95,7 @@
 #   This file is part of Magnum.
 #
 #   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
-#               2020, 2021, 2022, 2023, 2024
+#               2020, 2021, 2022, 2023, 2024, 2025
 #             Vladimír Vondruš <mosra@centrum.cz>
 #   Copyright © 2019 Jonathan Hale <squareys@googlemail.com>
 #
diff --git a/src/deps/corrade b/src/deps/corrade
@@ -1 +1 @@
-Subproject commit 9f09b71b15ee91cce454f827ba9e7a58e19a7bdf
+Subproject commit 3f9ad763414d622a9382b14ad93e9c345b5a0357
diff --git a/src/deps/magnum b/src/deps/magnum
@@ -1 +1 @@
-Subproject commit fb2dc562e312d5499446a39cdd432746bcdbb666
+Subproject commit f19dcac1b350c0f16964c4596fa808901a7becff
diff --git a/src/deps/magnum-bindings b/src/deps/magnum-bindings
@@ -1 +1 @@
-Subproject commit c8824470c98eb91f8efea6e541e8ed9ddee7181e
+Subproject commit 7f581c61149bedfd61d3c2dad0b0e00fa504f1ef
diff --git a/src/deps/magnum-integration b/src/deps/magnum-integration
@@ -1 +1 @@
-Subproject commit bc056f8800c88e21990e11461f75d409748f18a7
+Subproject commit 1a42db47452ca5c4454a41e2bc55ebf02f925fef
diff --git a/src/deps/magnum-plugins b/src/deps/magnum-plugins
@@ -1 +1 @@
-Subproject commit d3c88a33189f1f5ba4b0801a323c43083a986f43
+Subproject commit 115254e0e6c0266d606a5814fb3ea49bea16846f
diff --git a/src/esp/assets/GenericMeshData.cpp b/src/esp/assets/GenericMeshData.cpp
@@ -8,7 +8,9 @@
 #include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Utility/DebugStl.h>
 #include <Magnum/MeshTools/Compile.h>
+#include <Magnum/MeshTools/GenerateIndices.h>
 #include <Magnum/MeshTools/Interleave.h>
+
 namespace Cr = Corrade;
 namespace Mn = Magnum;
 
@@ -45,14 +47,10 @@ Magnum::GL::Mesh* GenericMeshData::getMagnumGLMesh() {
 }
 
 void GenericMeshData::setMeshData(Magnum::Trade::MeshData&& meshData) {
-  /* Interleave the mesh, if not already. This makes the GPU happier (better
-     cache locality for vertex fetching) and is a no-op if the source data is
-     already interleaved, so doesn't hurt to have it there always. */
-
   /* TODO: Address that non-triangle meshes will have their collisionMeshData_
    * incorrectly calculated */
 
-  meshData_ = Mn::MeshTools::interleave(std::move(meshData));
+  meshData_ = std::move(meshData);
 
   collisionMeshData_.primitive = meshData_->primitive();
 
@@ -63,16 +61,17 @@ void GenericMeshData::setMeshData(Magnum::Trade::MeshData&& meshData) {
       meshData_->positions3DAsArray();
 
   /* For collision data we need indices as UnsignedInt. If the mesh already has
-     those, just make the collision data reference them. If not, unpack them
-     and store them here. And if there is no index buffer at all, generate a
-     trivial one (0, 1, 2, 3...). */
+     those, and we can get a mutable view on them, just make the collision data
+     reference them. If not, unpack them and store them here. And if there is
+     no index buffer at all, generate a trivial one (0, 1, 2, 3...).
+
+     TODO why is a mutable view needed at all?! If not, make the views const
+     and remove the indexDataFlags() check below. */
   if (!meshData_->isIndexed()) {
     collisionMeshData_.indices = indexData_ =
-        Cr::Containers::Array<Mn::UnsignedInt>{Cr::NoInit,
-                                               meshData_->vertexCount()};
-    for (Mn::UnsignedInt i = 0; i != indexData_.size(); ++i)
-      indexData_[i] = i;
-  } else if (meshData_->indexType() == Mn::MeshIndexType::UnsignedInt) {
+        Mn::MeshTools::generateTrivialIndices(meshData_->vertexCount());
+  } else if (meshData_->indexType() == Mn::MeshIndexType::UnsignedInt &&
+             meshData_->indexDataFlags() & Mn::Trade::DataFlag::Mutable) {
     collisionMeshData_.indices =
         meshData_->mutableIndices<Mn::UnsignedInt>().asContiguous();
   } else {
diff --git a/src/esp/assets/ResourceManager.cpp b/src/esp/assets/ResourceManager.cpp
@@ -309,7 +309,7 @@ std::vector<std::string> ResourceManager::buildVertexColorMapReport(
   }
 
   return infoSemanticMeshData_->getVertColorSSDReport(
-      Cr::Utility::Path::split(filename).second(), semanticColorMapBeingUsed_,
+      Cr::Utility::Path::filename(filename), semanticColorMapBeingUsed_,
       semanticScene_);
 }  // ResourceManager::buildVertexColorMapReport
 
@@ -1342,7 +1342,7 @@ ResourceManager::flattenImportedMeshAndBuildSemantic(Importer& fileImporter,
 
   GenericSemanticMeshData::uptr semanticMeshData =
       GenericSemanticMeshData::buildSemanticMeshData(
-          *meshData, Cr::Utility::Path::split(filename).second(),
+          *meshData, Cr::Utility::Path::filename(filename),
           semanticColorMapBeingUsed_,
           (filename.find(".ply") == std::string::npos), semanticScene_);
 
@@ -2276,7 +2276,7 @@ void ResourceManager::loadMaterials(Importer& importer,
 
   // name of asset, for debugging purposes
   const std::string assetName =
-      Cr::Utility::Path::split(loadedAssetData.assetInfo.filepath).second();
+      Cr::Utility::Path::filename(loadedAssetData.assetInfo.filepath);
   int numMaterials = importer.materialCount();
   ESP_DEBUG(Mn::Debug::Flag::NoSpace)
       << "Building " << numMaterials << " materials for asset named '"
@@ -2600,7 +2600,7 @@ ObjectInstanceShaderType ResourceManager::getMaterialShaderType(
   // material or other settings.
   if (info.forceFlatShading) {
     ESP_VERY_VERBOSE(Mn::Debug::Flag::NoSpace)
-        << "Asset `" << Cr::Utility::Path::split(info.filepath).second()
+        << "Asset `" << Cr::Utility::Path::filename(info.filepath)
         << "` is being forced to use Flat shader by configuration.";
     return ObjectInstanceShaderType::Flat;
   }
@@ -2611,7 +2611,7 @@ ObjectInstanceShaderType ResourceManager::getMaterialShaderType(
     infoSpecShaderType = ObjectInstanceShaderType::Material;
   }
   ESP_VERY_VERBOSE(Mn::Debug::Flag::NoSpace)
-      << "Asset `" << Cr::Utility::Path::split(info.filepath).second()
+      << "Asset `" << Cr::Utility::Path::filename(info.filepath)
       << "` is using shadertype `"
       << metadata::attributes::getShaderTypeName(infoSpecShaderType) << "`.";
   return infoSpecShaderType;
diff --git a/src/esp/core/Logging.cpp b/src/esp/core/Logging.cpp
@@ -142,7 +142,7 @@ Cr::Containers::String buildMessagePrefix(Subsystem subsystem,
                                           const std::string& filename,
                                           const std::string& function,
                                           int line) {
-  auto baseFileName = Cr::Utility::Path::split(filename).second();
+  auto baseFileName = Cr::Utility::Path::filename(filename);
 
   const auto timePassed =
       std::chrono::high_resolution_clock::now().time_since_epoch();
diff --git a/src/esp/core/managedContainers/AbstractFileBasedManagedObject.h b/src/esp/core/managedContainers/AbstractFileBasedManagedObject.h
@@ -74,7 +74,7 @@ class AbstractFileBasedManagedObject : public AbstractManagedObject {
     // first parse for file name, and then get rid of extension(s).
     return Corrade::Utility::Path::splitExtension(
                Corrade::Utility::Path::splitExtension(
-                   Corrade::Utility::Path::split(getHandle()).second())
+                   Corrade::Utility::Path::filename(getHandle()))
                    .first())
         .first();
   }
diff --git a/src/esp/core/managedContainers/ManagedFileBasedContainer.h b/src/esp/core/managedContainers/ManagedFileBasedContainer.h
@@ -256,7 +256,7 @@ class ManagedFileBasedContainer : public ManagedContainer<T, Access> {
                                const std::string& filename,
                                bool createDir) const {
     // get file directory from passed desired filename, if present
-    std::string fileDirectory = Cr::Utility::Path::split(filename).first();
+    std::string fileDirectory = Cr::Utility::Path::path(filename);
     // if no directory given then use object's local directory
     if (fileDirectory.empty()) {
       fileDirectory = managedObject->getFileDirectory();
diff --git a/src/esp/gfx/DebugLineRender.cpp b/src/esp/gfx/DebugLineRender.cpp
@@ -171,7 +171,7 @@ void DebugLineRender::flushLines(const Magnum::Matrix4& projCamMatrix,
   Mn::GL::Renderer::setDepthFunction(Mn::GL::Renderer::DepthFunction::Less);
 
   // Clear _verts to receive new data
-  arrayResize(_verts, 0);
+  arrayClear(_verts);
 
   // restore blending state if necessary
   if (doToggleBlend) {
diff --git a/src/esp/gfx_batch/Renderer.cpp b/src/esp/gfx_batch/Renderer.cpp
@@ -1021,20 +1021,19 @@ void Renderer::clear(const Mn::UnsignedInt sceneId) {
                                             << "scenes", );
 
   Scene& scene = state_->scenes[sceneId];
-  // TODO have arrayClear()!!!
-  /* Resizing instead of `= {}` to not discard the memory */
-  arrayResize(scene.parents, 0);
-  arrayResize(scene.transformations, 0);
-  arrayResize(scene.lights, 0);
-  arrayResize(scene.drawBatchIds, 0);
-  arrayResize(scene.transformationIds, 0);
-  arrayResize(scene.drawBatches, Cr::NoInit, 0);
-  arrayResize(scene.draws, 0);
-  arrayResize(scene.textureTransformations, 0);
-  arrayResize(scene.drawCommands, 0);
-  arrayResize(scene.drawsSorted, 0);
-  arrayResize(scene.transformationIdsSorted, 0);
-  arrayResize(scene.drawCommandsSorted, 0);
+  /* Clearing instead of `= {}` to not discard the memory */
+  arrayClear(scene.parents);
+  arrayClear(scene.transformations);
+  arrayClear(scene.lights);
+  arrayClear(scene.drawBatchIds);
+  arrayClear(scene.transformationIds);
+  arrayClear(scene.drawBatches);
+  arrayClear(scene.draws);
+  arrayClear(scene.textureTransformations);
+  arrayClear(scene.drawCommands);
+  arrayClear(scene.drawsSorted);
+  arrayClear(scene.transformationIdsSorted);
+  arrayClear(scene.drawCommandsSorted);
 
   /* There's nothing in the scene, so there's no dirty state to process */
   scene.dirty = false;
@@ -1047,9 +1046,8 @@ void Renderer::clearLights(const Mn::UnsignedInt sceneId) {
                                             << "scenes", );
 
   Scene& scene = state_->scenes[sceneId];
-  // TODO have arrayClear()!!!
-  /* Resizing instead of `= {}` to not discard the memory */
-  arrayResize(scene.lights, 0);
+  /* Clearing instead of `= {}` to not discard the memory */
+  arrayClear(scene.lights);
 
   /* Not marking the dirty bit as lights are processed with updated
      transformations every frame anyway */
@@ -1153,7 +1151,7 @@ void Renderer::draw(Mn::GL::AbstractFramebuffer& framebuffer) {
       /* Draw batch offsets with two implicit 0s at the begin. Reset all values
          to 0 in case the array wasn't empty before. */
       // TODO Utility::fill() instead
-      arrayResize(scene.drawBatchOffsets, Cr::NoInit, 0);
+      arrayClear(scene.drawBatchOffsets);
       arrayResize(scene.drawBatchOffsets, Cr::ValueInit,
                   scene.drawBatches.size() + 2);
 
diff --git a/src/esp/io/Io.cpp b/src/esp/io/Io.cpp
@@ -50,7 +50,7 @@ std::string getPathRelativeToAbsPath(const std::string& toRelPath,
                                      const std::string& absPathArg) {
   // Check if absPath is a path or filename - only use the path if it is a
   // filenaame
-  const std::string absPath = Cr::Utility::Path::split(absPathArg).first();
+  const std::string absPath = Cr::Utility::Path::path(absPathArg);
 
   std::string result = "";
   const char* delim = "/";
diff --git a/src/esp/metadata/managers/AbstractAttributesManager.h b/src/esp/metadata/managers/AbstractAttributesManager.h
@@ -410,13 +410,13 @@ AbstractAttributesManager<T, Access>::loadAllFileBasedTemplates(
     bool saveAsDefaults) {
   std::vector<int> templateIndices(paths.size(), ID_UNDEFINED);
   if (paths.size() > 0) {
-    std::string dir = CrPath::split(paths[0]).first();
+    std::string dir = CrPath::path(paths[0]);
     ESP_DEBUG() << "Loading" << paths.size() << "" << this->objectType_
                 << "templates found in" << dir;
     for (uint32_t i = 0; i < paths.size(); ++i) {
       auto attributesFilename = paths[i];
-      ESP_VERY_VERBOSE() << "Load" << this->objectType_ << "template:"
-                         << CrPath::split(attributesFilename).second();
+      ESP_VERY_VERBOSE() << "Load" << this->objectType_
+                         << "template:" << CrPath::filename(attributesFilename);
       auto tmplt = this->createObject(attributesFilename, true);
       // If failed to load, do not attempt to modify further
       if (tmplt == nullptr) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@`
`27`	`27`	`# This file is part of Magnum.`
`28`	`28`	`#`
`29`	`29`	`# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,`
`30`		`-# 2020, 2021, 2022, 2023 Vladimír Vondruš <[email protected]>`
	`30`	`+# 2020, 2021, 2022, 2023, 2024, 2025`
	`31`	`+# Vladimír Vondruš <[email protected]>`
`31`	`32`	`#`
`32`	`33`	`# Permission is hereby granted, free of charge, to any person obtaining a`
`33`	`34`	`# copy of this software and associated documentation files (the "Software"),`
Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@`
`277`	`277`	`# This file is part of Corrade.`
`278`	`278`	`#`
`279`	`279`	`# Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,`
`280`		`-# 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024`
	`280`	`+# 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025`
`281`	`281`	`# Vladimír Vondruš <[email protected]>`
`282`	`282`	`#`
`283`	`283`	`# Permission is hereby granted, free of charge, to any person obtaining a`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@`
`208`	`208`	`# This file is part of Magnum.`
`209`	`209`	`#`
`210`	`210`	`# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,`
`211`		`-# 2020, 2021, 2022, 2023, 2024`
	`211`	`+# 2020, 2021, 2022, 2023, 2024, 2025`
`212`	`212`	`# Vladimír Vondruš <[email protected]>`
`213`	`213`	`#`
`214`	`214`	`# Permission is hereby granted, free of charge, to any person obtaining a`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`# This file is part of Magnum.`
`36`	`36`	`#`
`37`	`37`	`# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,`
`38`		`-# 2020, 2021, 2022, 2023, 2024`
	`38`	`+# 2020, 2021, 2022, 2023, 2024, 2025`
`39`	`39`	`# Vladimír Vondruš <[email protected]>`
`40`	`40`	`#`
`41`	`41`	`# Permission is hereby granted, free of charge, to any person obtaining a`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`# This file is part of Magnum.`
`49`	`49`	`#`
`50`	`50`	`# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,`
`51`		`-# 2020, 2021, 2022, 2023, 2024`
	`51`	`+# 2020, 2021, 2022, 2023, 2024, 2025`
`52`	`52`	`# Vladimír Vondruš <[email protected]>`
`53`	`53`	`# Copyright © 2018 Konstantinos Chatzilygeroudis <[email protected]>`
`54`	`54`	`#`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@`
`95`	`95`	`# This file is part of Magnum.`
`96`	`96`	`#`
`97`	`97`	`# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,`
`98`		`-# 2020, 2021, 2022, 2023, 2024`
	`98`	`+# 2020, 2021, 2022, 2023, 2024, 2025`
`99`	`99`	`# Vladimír Vondruš <[email protected]>`
`100`	`100`	`# Copyright © 2019 Jonathan Hale <[email protected]>`
`101`	`101`	`#`