Update Magnum to latest & fix various minor buildsystem issues

src/esp/bindings/EnumOperators.h

@@ -0,0 +1,39 @@
+// Copyright (c) Facebook, Inc. and its affiliates.
+// This source code is licensed under the MIT license found in the
+// LICENSE file in the root directory of this source tree.
+
+#ifndef ESP_BINDINGS_ENUMOPERATORS_H_
+#define ESP_BINDINGS_ENUMOPERATORS_H_
+
+#include <pybind11/pybind11.h>
+
+namespace esp {
+
+/* Pybind's py::arithmetic() doesn't work on strongly-typed enums with custom
+   operators */
+template <class T>
+void pybindEnumOperators(pybind11::enum_<T>& e) {
+  e.def("__or__",
+        [](const T& a, const T& b) {
+          return T(typename std::underlying_type<T>::type(a | b));
+        })
+      .def("__and__",
+           [](const T& a, const T& b) {
+             return T(typename std::underlying_type<T>::type(a & b));
+           })
+      .def("__xor__",
+           [](const T& a, const T& b) {
+             return T(typename std::underlying_type<T>::type(a ^ b));
+           })
+      .def("__invert__",
+           [](const T& a) {
+             return T(typename std::underlying_type<T>::type(~a));
+           })
+      .def("__bool__", [](const T& a) {
+        return bool(typename std::underlying_type<T>::type(a));
+      });
+}
+
+}  // namespace esp
+
+#endif

src/esp/bindings/GfxBindings.cpp

@@ -11,9 +11,8 @@
 #include <Magnum/PythonBindings.h>
 #include <Magnum/SceneGraph/PythonBindings.h>
 
-#include "python/corrade/EnumOperators.h"
-
 #include "esp/assets/ResourceManager.h"
+#include "esp/bindings/EnumOperators.h"
 #include "esp/gfx/DebugLineRender.h"
 #include "esp/gfx/LightSetup.h"
 #include "esp/gfx/RenderCamera.h"
@@ -55,7 +54,7 @@ void initGfxBindings(py::module& m) {
   flags.value("FRUSTUM_CULLING", RenderCamera::Flag::FrustumCulling)
       .value("OBJECTS_ONLY", RenderCamera::Flag::ObjectsOnly)
       .value("NONE", RenderCamera::Flag{});
-  corrade::enumOperators(flags);
+  pybindEnumOperators(flags);
 
   render_camera
       .def(py::init_alias<std::reference_wrapper<scene::SceneNode>,
@@ -87,7 +86,7 @@ void initGfxBindings(py::module& m) {
 
   rendererFlags.value("VISUALIZE_TEXTURE", Renderer::Flag::VisualizeTexture)
       .value("NONE", Renderer::Flag{});
-  corrade::enumOperators(rendererFlags);
+  pybindEnumOperators(rendererFlags);
 
   renderer.def(py::init(&Renderer::create<>))
       .def(

src/esp/bindings/PhysicsBindings.cpp

@@ -1,8 +1,7 @@
 #include "esp/bindings/Bindings.h"
+#include "esp/bindings/EnumOperators.h"
 #include "esp/physics/PhysicsManager.h"
 
-#include "python/corrade/EnumOperators.h"
-
 namespace py = pybind11;
 using py::literals::operator""_a;
 
@@ -207,7 +206,7 @@ void initPhysicsBindings(py::module& m) {
       .value("UserGroup8", CollisionGroup::UserGroup8)
       .value("UserGroup9", CollisionGroup::UserGroup9)
       .value("None", CollisionGroup{});
-  corrade::enumOperators(collisionGroups);
+  pybindEnumOperators(collisionGroups);
 
   // ==== class object CollisionGroupHelper ====
   py::class_<CollisionGroupHelper, std::shared_ptr<CollisionGroupHelper>>(

src/esp/geo/VoxelUtils.cpp

@@ -19,10 +19,10 @@ void generateInteriorExteriorVoxelGrid(
                       static_cast<std::size_t>(m_voxelGridDimensions[1]),
                       static_cast<std::size_t>(m_voxelGridDimensions[2])};
   Corrade::Containers::Array<char> cr_grid{
-      Corrade::ValueInit, v_grid->gridSize() * sizeof(Mn::Math::BoolVector<6>)};
+      Corrade::ValueInit, v_grid->gridSize() * sizeof(Mn::Math::BitVector<6>)};
   auto shadowGrid_ =
-      Cr::Containers::StridedArrayView<3, Mn::Math::BoolVector<6>>{
-          Cr::Containers::arrayCast<Mn::Math::BoolVector<6>>(cr_grid), dims};
+      Cr::Containers::StridedArrayView<3, Mn::Math::BitVector<6>>{
+          Cr::Containers::arrayCast<Mn::Math::BitVector<6>>(cr_grid), dims};
 
   // fill each grid with ray cast
   bool hit = false;

src/esp/gfx_batch/CMakeLists.txt

@@ -1,3 +1,5 @@
+find_package(Magnum REQUIRED GL Shaders Trade)
+
 set(gfx_batch_SOURCES Renderer.cpp Renderer.h RendererStandalone.cpp
                       RendererStandalone.h
 )

src/esp/gfx_batch/Renderer.cpp

@@ -9,6 +9,7 @@
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/StringStlHash.h>
 #include <Corrade/PluginManager/Manager.h>
 #include <Corrade/PluginManager/PluginMetadata.h>
 #include <Corrade/Utility/Algorithms.h>
@@ -38,21 +39,6 @@
 namespace Cr = Corrade;
 namespace Mn = Magnum;
 
-/* std::hash specialization to be able to use Corrade::String in unordered_map
- */
-// TODO put directly into Corrade, it's duplicated ON SEVEN PLACES ALREADY!!!
-namespace std {
-template <>
-struct hash<Cr::Containers::String> {
-  std::size_t operator()(const Cr::Containers::String& key) const {
-    const Cr::Utility::MurmurHash2 hash;
-    const Cr::Utility::HashDigest<sizeof(std::size_t)> digest =
-        hash(key.data(), key.size());
-    return *reinterpret_cast<const std::size_t*>(digest.byteArray());
-  }
-};
-}  // namespace std
-
 namespace esp {
 namespace gfx_batch {
 

src/tests/CMakeLists.txt

@@ -1,6 +1,6 @@
 find_package(Magnum REQUIRED DebugTools AnyImageConverter AnySceneImporter)
 find_package(
-  MagnumPlugins REQUIRED StbImageImporter KtxImporter
+  MagnumPlugins REQUIRED GltfImporter StbImageImporter KtxImporter
   OPTIONAL_COMPONENTS GltfSceneConverter KtxImageConverter
 )
 

src/tests/PhysicsTest.cpp

@@ -175,9 +175,12 @@ const struct {
 
 PhysicsTest::PhysicsTest() {
   addInstancedTests(
-      {&PhysicsTest::testJoinCompound, &PhysicsTest::testCollisionBoundingBox,
+      {&PhysicsTest::testJoinCompound,
+#ifdef ESP_BUILD_WITH_BULLET
+       &PhysicsTest::testCollisionBoundingBox,
        &PhysicsTest::testDiscreteContactTest,
        &PhysicsTest::testBulletCompoundShapeMargins,
+#endif
        &PhysicsTest::testConfigurableScaling, &PhysicsTest::testVelocityControl,
        &PhysicsTest::testSceneNodeAttachment, &PhysicsTest::testMotionTypes,
        &PhysicsTest::testNumActiveContactPoints,

src/utils/datatool/SceneLoader.cpp

@@ -30,12 +30,12 @@ namespace esp {
 namespace assets {
 
 SceneLoader::SceneLoader()
-    :
 #ifdef MAGNUM_BUILD_STATIC
-      // avoid using plugins that might depend on different library versions
+    :  // avoid using plugins that might depend on different library versions
       importerManager_("nonexistent")
 #endif
-          {};
+{
+}
 
 MeshData SceneLoader::load(const AssetInfo& info) {
   MeshData mesh;