Update to Magnum with new MaterialTools and improved glTF import/expo…

…rt. (#2015)
facebookresearch · Feb 24, 2023 · c7f4d13 · c7f4d13
1 parent 8648a23
commit c7f4d13
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
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
+4 −4		doc/building-corrade.dox
+23 −7		doc/corrade-changelog.dox
+1 −1		doc/corrade-cmake.dox
+15 −8		doc/corrade-developers.dox
+2 −0		doc/cpu.dot
+5 −1		doc/snippets/CMakeLists.txt
+1 −1		doc/snippets/Containers.cpp
+8 −0		doc/snippets/Corrade.cpp
+11 −0		doc/snippets/testsuite-compare-string.ansi
+66 −0		doc/snippets/testsuite-compare-string.cpp
+1 −1		modules/FindCorrade.cmake
+11 −1		modules/UseCorrade.cmake
+21 −8		package/archlinux/PKGBUILD-clang
+21 −8		package/archlinux/PKGBUILD-clang-libc++
+12 −21		src/Corrade/Containers/BitArray.cpp
+36 −2		src/Corrade/Containers/BitArray.h
+390 −0		src/Corrade/Containers/BitArrayView.cpp
+113 −4		src/Corrade/Containers/BitArrayView.h
+1 −2		src/Corrade/Containers/GrowableArray.h
+15 −0		src/Corrade/Containers/Optional.h
+15 −37		src/Corrade/Containers/StridedBitArrayView.h
+6 −2		src/Corrade/Containers/String.h
+26 −6		src/Corrade/Containers/StringView.cpp
+10 −0		src/Corrade/Containers/Test/ArrayTupleTest.cpp
+52 −1		src/Corrade/Containers/Test/BitArrayTest.cpp
+515 −0		src/Corrade/Containers/Test/BitArrayViewBenchmark.cpp
+473 −6		src/Corrade/Containers/Test/BitArrayViewTest.cpp
+142 −0		src/Corrade/Containers/Test/BitArrayViewTest.h
+2 −1		src/Corrade/Containers/Test/CMakeLists.txt
+4 −0		src/Corrade/Containers/Test/EnumSetTest.cpp
+7 −3		src/Corrade/Containers/Test/GrowableArrayTest.cpp
+10 −0		src/Corrade/Containers/Test/IterableTest.cpp
+13 −0		src/Corrade/Containers/Test/PointerTest.cpp
+20 −53		src/Corrade/Containers/Test/StridedBitArrayViewTest.cpp
+4 −0		src/Corrade/Containers/Test/StridedDimensionsTest.cpp
+33 −2		src/Corrade/Containers/Test/StringTest.cpp
+23 −4		src/Corrade/Corrade.h
+1 −0		src/Corrade/Cpu.cpp
+199 −90		src/Corrade/Cpu.h
+62 −4		src/Corrade/Test/CpuTest.cpp
+41 −3		src/Corrade/Test/TargetTest.cpp
+125 −0		src/Corrade/TestSuite/Compare/Implementation/Diff.h
+129 −0		src/Corrade/TestSuite/Compare/String.cpp
+48 −4		src/Corrade/TestSuite/Compare/String.h
+1 −0		src/Corrade/TestSuite/Compare/Test/CMakeLists.txt
+146 −0		src/Corrade/TestSuite/Compare/Test/DiffTest.cpp
+200 −0		src/Corrade/TestSuite/Compare/Test/StringTest.cpp
+2 −2		src/Corrade/TestSuite/Tester.h
+1 −0		src/Corrade/Utility/CMakeLists.txt
+62 −8		src/Corrade/Utility/Debug.cpp
+39 −18		src/Corrade/Utility/Debug.h
+7 −7		src/Corrade/Utility/IntrinsicsAvx.h
+28 −1		src/Corrade/Utility/Json.cpp
+17 −1		src/Corrade/Utility/Json.h
+157 −22		src/Corrade/Utility/Test/DebugTest.cpp
+71 −11		src/Corrade/Utility/Test/JsonTest.cpp
+1 −1		src/Corrade/Utility/visibility.h
+7 −1		src/Corrade/configure.h.cmake
+1 −1		.editorconfig
+5 −0		doc/python/magnum.text.rst
+166 −4		doc/python/magnum.trade.rst
+5 −1		doc/python/pages/changelog.rst
+1 −1		package/archlinux/PKGBUILD-coverage
+13 −13		src/Corrade/Containers/StridedArrayViewPythonBindings.h
+5 −2		src/Magnum/CMakeLists.txt
+113 −0		src/Magnum/StridedArrayViewPythonBindings.h
+1 −1		src/python/corrade/containers.cpp
+2 −2		src/python/corrade/test/test_stridedarrayview.cpp
+21 −8		src/python/magnum/math.vector.h
+15 −0		src/python/magnum/test/image.gltf
+17 −1		src/python/magnum/test/mesh.gltf
+71 −0		src/python/magnum/test/scene.gltf
+26 −4		src/python/magnum/test/test_math.py
+613 −81		src/python/magnum/test/test_trade.py
+17 −1		src/python/magnum/text.cpp
+896 −93		src/python/magnum/trade.cpp
+1 −1		package/ci/android-x86.sh
+1 −1		package/ci/appveyor-desktop-mingw.bat
+1 −1		package/ci/appveyor-desktop.bat
+1 −1		package/ci/emscripten.sh
+1 −1		package/ci/ios-simulator.sh
+1 −1		package/ci/unix-desktop.sh
+1 −1		src/MagnumPlugins/GlslangShaderConverter/GlslangConverter.cpp
+211 −42		src/MagnumPlugins/GltfImporter/GltfImporter.cpp
+10 −6		src/MagnumPlugins/GltfImporter/GltfImporter.h
+78 −39		src/MagnumPlugins/GltfImporter/Test/GltfImporterTest.cpp
+42 −7		src/MagnumPlugins/GltfImporter/Test/scene-custom-fields.gltf
+713 −182		src/MagnumPlugins/GltfSceneConverter/GltfSceneConverter.cpp
+81 −5		src/MagnumPlugins/GltfSceneConverter/GltfSceneConverter.h
+13 −1		src/MagnumPlugins/GltfSceneConverter/Test/CMakeLists.txt
+740 −118		src/MagnumPlugins/GltfSceneConverter/Test/GltfSceneConverterTest.cpp
+41 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-clearcoat-default-texture-swizzle.gltf
+41 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-clearcoat-gltf-defaults-kept.gltf
+38 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-clearcoat-gltf-defaults-omitted.gltf
+18 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-clearcoat-magnum-defaults.gltf
+71 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-clearcoat.gltf
+40 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-custom-no-transform-explicit-used-extensions.gltf
+92 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-custom-skipped-3d.gltf
+61 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-custom-skipped.gltf
+156 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-custom.gltf
+50 −0		src/MagnumPlugins/GltfSceneConverter/Test/material-unused-attributes-layers.gltf
+ −		src/MagnumPlugins/GltfSceneConverter/Test/texcoord-flip-floats-material-custom-material-attribute.glb
+3 −3		src/MagnumPlugins/OpenExrImporter/OpenExrImporter.cpp
+11 −10		src/MagnumPlugins/UfbxImporter/Test/UfbxImporterTest.cpp
+8 −6		src/MagnumPlugins/UfbxImporter/UfbxImporter.cpp
+2 −3		src/MagnumPlugins/UfbxImporter/UfbxImporter.h