Update Magnum with new scene tools, bindings and plugin additions (#2114

) * Update Magnum with new scene tools, bindings and plugin additions. * Adapt to Magnum changes. * Update a generated test file. The magnitude of normals changed due to a fix in Matrix4::normalMatrix() done some time ago. Doesn't affect rendering in any way as the normals get always normalized per-pixel.
facebookresearch · May 24, 2023 · bde806a · bde806a
1 parent 9987de7
commit bde806a
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 29 deletions.
diff --git a/data/test_assets/scenes/batch-four-squares-no-scene.bin b/data/test_assets/scenes/batch-four-squares-no-scene.bin
diff --git a/src/cmake/FindMagnum.cmake b/src/cmake/FindMagnum.cmake
@@ -910,7 +910,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
 
         # SceneTools library
         elseif(_component STREQUAL SceneTools)
-            set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES FlattenTransformationHierarchy.h)
+            set(_MAGNUM_${_COMPONENT}_INCLUDE_PATH_NAMES Hierarchy.h)
 
         # ShaderTools library
         elseif(_component STREQUAL ShaderTools)

diff --git a/src/deps/corrade b/src/deps/corrade
diff --git a/src/deps/magnum b/src/deps/magnum
diff --git a/src/deps/magnum-bindings b/src/deps/magnum-bindings
diff --git a/src/deps/magnum-plugins b/src/deps/magnum-plugins
diff --git a/src/esp/assets/ResourceManager.cpp b/src/esp/assets/ResourceManager.cpp
@@ -32,14 +32,14 @@
 #include <Magnum/Math/Tags.h>
 #include <Magnum/MeshTools/Compile.h>
 #include <Magnum/MeshTools/Concatenate.h>
+#include <Magnum/MeshTools/Copy.h>
 #include <Magnum/MeshTools/FilterAttributes.h>
 #include <Magnum/MeshTools/Interleave.h>
-#include <Magnum/MeshTools/Reference.h>
 #include <Magnum/MeshTools/RemoveDuplicates.h>
 #include <Magnum/MeshTools/Transform.h>
 #include <Magnum/PixelFormat.h>
 #include <Magnum/SceneGraph/Object.h>
-#include <Magnum/SceneTools/FlattenTransformationHierarchy.h>
+#include <Magnum/SceneTools/Hierarchy.h>
 #include <Magnum/Trade/AbstractImporter.h>
 #include <Magnum/Trade/FlatMaterialData.h>
 #include <Magnum/Trade/ImageData.h>
@@ -1469,7 +1469,7 @@ ResourceManager::flattenImportedMeshAndBuildSemantic(Importer& fileImporter,
     // All the transformations, flattened and indexed by mesh id, with
     // reframeTransform applied to each
     Cr::Containers::Array<Mn::Matrix4> transformations =
-        Mn::SceneTools::flattenTransformationHierarchy3D(
+        Mn::SceneTools::absoluteFieldTransformations3D(
             *scene, Mn::Trade::SceneField::Mesh, reframeTransform);
 
     Cr::Containers::Array<Mn::Trade::MeshData> flattenedMeshes;
@@ -3663,7 +3663,7 @@ void ResourceManager::createConvexHullDecomposition(
         ch.m_triangles, ch.m_nTriangles * 3};
 
     // create an owned MeshData
-    Cr::Containers::Optional<Mn::Trade::MeshData> CHMesh = Mn::MeshTools::owned(
+    Cr::Containers::Optional<Mn::Trade::MeshData> CHMesh = Mn::MeshTools::copy(
         Mn::Trade::MeshData{Mn::MeshPrimitive::Triangles,
                             {},
                             indices,

diff --git a/src/esp/geo/VoxelGrid.cpp b/src/esp/geo/VoxelGrid.cpp
@@ -12,7 +12,6 @@
 #include <Magnum/Math/Vector.h>
 #include <Magnum/MeshTools/Compile.h>
 #include <Magnum/MeshTools/Interleave.h>
-#include <Magnum/MeshTools/Reference.h>
 #include <Magnum/Primitives/Cone.h>
 #include <Magnum/Primitives/Cube.h>
 #include <Magnum/Primitives/Cylinder.h>

diff --git a/src/esp/gfx/PbrImageBasedLighting.cpp b/src/esp/gfx/PbrImageBasedLighting.cpp
@@ -15,8 +15,8 @@
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Angle.h>
 #include <Magnum/MeshTools/Compile.h>
+#include <Magnum/MeshTools/Copy.h>
 #include <Magnum/MeshTools/FlipNormals.h>
-#include <Magnum/MeshTools/Reference.h>
 #include <Magnum/Primitives/Cube.h>
 #include <Magnum/Trade/AbstractImporter.h>
 #include <Magnum/Trade/ImageData.h>
@@ -322,7 +322,7 @@ void PbrImageBasedLighting::computePrecomputedMap(PrecomputedMapType type) {
 
   // prepare a cube
   Mn::Trade::MeshData cubeData =
-      Mn::MeshTools::owned(Mn::Primitives::cubeSolid());
+      Mn::MeshTools::copy(Mn::Primitives::cubeSolid());
   // camera is now inside the cube, must flip the face winding, otherwise all
   // the faces are culled
   Mn::MeshTools::flipFaceWindingInPlace(cubeData.mutableIndices());

diff --git a/src/esp/gfx_batch/Renderer.cpp b/src/esp/gfx_batch/Renderer.cpp
@@ -30,7 +30,7 @@
 #include <Magnum/MeshTools/Duplicate.h>
 #include <Magnum/MeshTools/RemoveDuplicates.h>
 #include <Magnum/PixelFormat.h>
-#include <Magnum/SceneTools/FlattenMeshHierarchy.h>
+#include <Magnum/SceneTools/Hierarchy.h>
 #include <Magnum/Shaders/Generic.h>
 #include <Magnum/Shaders/Phong.h>
 #include <Magnum/Shaders/PhongGL.h>
@@ -795,24 +795,27 @@ bool Renderer::addFile(const Cr::Containers::StringView filename,
       /* Files treated as a whole have their hierarchy flattened and added under
          a single name, which is the filename */
     } else {
-      Cr::Containers::Array<
-          Cr::Containers::Triple<Mn::UnsignedInt, Mn::Int, Mn::Matrix4>>
-          flattened = Mn::SceneTools::flattenMeshHierarchy3D(*scene);
-      for (std::size_t i = 0; i != flattened.size(); ++i) {
-        meshViews[i].transformation = flattened[i].third();
+      /* The returned transformations are in the same order as the Mesh field,
+         which is the same order as the meshViews array */
+      Cr::Containers::Array<Mn::Matrix4> transformations =
+          Mn::SceneTools::absoluteFieldTransformations3D(
+              *scene, Mn::Trade::SceneField::Mesh);
+      for (std::size_t i = 0; i != transformations.size(); ++i) {
+        meshViews[i].transformation = transformations[i];
       }
       /* If no name is specified, the full filename is used */
       const Cr::Containers::StringView usedName = name ? name : filename;
       if (!state_->meshViewRangeForName
-               .insert({usedName,
-                        {meshViewOffset,
-                         meshViewOffset + Mn::UnsignedInt(flattened.size())}})
+               .insert(
+                   {usedName,
+                    {meshViewOffset,
+                     meshViewOffset + Mn::UnsignedInt(transformations.size())}})
                .second) {
         Mn::Error{} << "Renderer::addFile(): node name" << usedName
                     << "already exists";
         return {};
       }
-      CORRADE_INTERNAL_ASSERT(meshViewOffset + flattened.size() ==
+      CORRADE_INTERNAL_ASSERT(meshViewOffset + transformations.size() ==
                               state_->meshViews.size());
     }
   }

diff --git a/src/tests/GfxBatchRendererTest.cpp b/src/tests/GfxBatchRendererTest.cpp
@@ -25,7 +25,7 @@
 #include <Magnum/Primitives/Circle.h>
 #include <Magnum/Primitives/Plane.h>
 #include <Magnum/Primitives/UVSphere.h>
-#include <Magnum/SceneTools/FlattenMeshHierarchy.h>
+#include <Magnum/SceneTools/Hierarchy.h>
 #include <Magnum/Trade/AbstractImageConverter.h>
 #include <Magnum/Trade/AbstractSceneConverter.h>
 #include <Magnum/Trade/MaterialData.h>
@@ -1405,13 +1405,18 @@ void GfxBatchRendererTest::generateTestDataFourSquares() {
     const Mn::Trade::MeshData squares[]{
         Mn::MeshTools::generateIndices(Mn::Primitives::planeSolid(
             Mn::Primitives::PlaneFlag::TextureCoordinates))};
+    Cr::Containers::Array<Cr::Containers::Pair<
+        Mn::UnsignedInt, Cr::Containers::Pair<Mn::UnsignedInt, Mn::Int>>>
+        meshesMaterials = sceneData.meshesMaterialsAsArray();
+    Cr::Containers::Array<Mn::Matrix4> transformations =
+        Mn::SceneTools::absoluteFieldTransformations3D(
+            sceneData, Mn::Trade::SceneField::Mesh);
     Cr::Containers::Array<Mn::Trade::MeshData> flattenedMeshes;
-    for (const Cr::Containers::Triple<Mn::UnsignedInt, Mn::Int, Mn::Matrix4>&
-             meshTransformation :
-         Mn::SceneTools::flattenMeshHierarchy3D(sceneData)) {
-      arrayAppend(flattenedMeshes, Mn::MeshTools::transform3D(
-                                       squares[meshTransformation.first()],
-                                       meshTransformation.third()));
+    for (std::size_t i = 0; i != meshesMaterials.size(); ++i) {
+      arrayAppend(flattenedMeshes,
+                  Mn::MeshTools::transform3D(
+                      squares[meshesMaterials[i].second().first()],
+                      transformations[i]));
     }
     const Mn::Trade::MeshData squaresJoined =
         Mn::MeshTools::concatenate(flattenedMeshes);