Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Magnum and m.css to latest #2309

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Update Magnum and m.css to latest #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0815f2e
Update Magnum and m.css to latest.
mosra Jan 29, 2024
4385064
Adapt JS bindings to the new Quaternion::rotation() overload.
mosra Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/m.css
Open in desktop
Submodule m.css updated 157 files
2 changes: 1 addition & 1 deletion src/deps/corrade
Open in desktop
Submodule corrade updated 8 files
+3 −2 doc/corrade-changelog.dox
+1 −0 src/Corrade/Containers/Pair.h
+2 −2 src/Corrade/Containers/StridedArrayView.h
+1 −0 src/Corrade/Containers/StridedDimensions.h
+1 −0 src/Corrade/Containers/Triple.h
+13 −8 src/Corrade/Utility/Algorithms.h
+41 −0 src/Corrade/Utility/Test/AlgorithmsTest.cpp
+16 −18 src/Corrade/Utility/Unicode.cpp
2 changes: 1 addition & 1 deletion src/deps/magnum
Open in desktop
Submodule magnum updated 41 files
+6 −0 doc/changelog.dox
+3 −0 package/archlinux/PKGBUILD-emscripten-wasm
+3 −0 package/archlinux/PKGBUILD-emscripten-wasm-webgl2
+1 −1 src/Magnum/Animation/Easing.h
+5 −5 src/Magnum/Math/Color.h
+2 −1 src/Magnum/Math/Matrix.h
+55 −1 src/Magnum/Math/Quaternion.h
+24 −0 src/Magnum/Math/Range.h
+43 −40 src/Magnum/Math/RectangularMatrix.h
+2 −0 src/Magnum/Math/Test/BezierTest.cpp
+46 −0 src/Magnum/Math/Test/ColorTest.cpp
+2 −2 src/Magnum/Math/Test/ComplexTest.cpp
+2 −0 src/Magnum/Math/Test/DualComplexTest.cpp
+2 −0 src/Magnum/Math/Test/DualQuaternionTest.cpp
+2 −0 src/Magnum/Math/Test/DualTest.cpp
+3 −3 src/Magnum/Math/Test/FunctionsBenchmark.cpp
+3 −3 src/Magnum/Math/Test/InterpolationBenchmark.cpp
+8 −8 src/Magnum/Math/Test/IntersectionBenchmark.cpp
+2 −0 src/Magnum/Math/Test/Matrix3Test.cpp
+2 −0 src/Magnum/Math/Test/Matrix4Test.cpp
+5 −5 src/Magnum/Math/Test/MatrixBenchmark.cpp
+6 −0 src/Magnum/Math/Test/MatrixTest.cpp
+83 −4 src/Magnum/Math/Test/QuaternionTest.cpp
+30 −0 src/Magnum/Math/Test/RangeTest.cpp
+139 −83 src/Magnum/Math/Test/RectangularMatrixTest.cpp
+1 −0 src/Magnum/Math/Test/SwizzleTest.cpp
+2 −0 src/Magnum/Math/Test/UnitTest.cpp
+28 −0 src/Magnum/Math/Test/Vector2Test.cpp
+28 −0 src/Magnum/Math/Test/Vector3Test.cpp
+36 −4 src/Magnum/Math/Test/Vector4Test.cpp
+3 −3 src/Magnum/Math/Test/VectorBenchmark.cpp
+516 −64 src/Magnum/Math/Test/VectorTest.cpp
+696 −654 src/Magnum/Math/Vector.h
+1 −1 src/Magnum/Math/Vector2.h
+1 −1 src/Magnum/Math/Vector3.h
+4 −4 src/Magnum/Math/Vector4.h
+15 −0 src/Magnum/Platform/EmscriptenApplication.h
+0 −1 src/Magnum/SceneTools/Test/MapTest.cpp
+2 −1 src/Magnum/Trade/MaterialData.h
+16 −9 src/Magnum/Trade/MeshData.h
+1 −1 src/Magnum/Vk/DeviceCreateInfo.h
2 changes: 1 addition & 1 deletion src/deps/magnum-bindings
Open in desktop
Submodule magnum-bindings updated 24 files
+6 −0 CMakeLists.txt
+167 −78 doc/python/corrade.containers.rst
+2 −0 doc/python/magnum.math.rst
+4 −0 doc/python/magnum.meshtools.rst
+323 −0 doc/python/magnum.trade.rst
+19 −2 doc/python/pages/building.rst
+17 −9 doc/python/pages/changelog.rst
+52 −15 src/Corrade/Containers/StridedArrayViewPythonBindings.h
+26 −3 src/Magnum/Trade/PythonBindings.h
+13 −4 src/python/corrade/CMakeLists.txt
+10 −0 src/python/corrade/__init__.py.in
+78 −18 src/python/corrade/containers.cpp
+137 −43 src/python/corrade/test/test_containers.py
+31 −3 src/python/corrade/test/test_containers_numpy.py
+7 −28 src/python/magnum/magnum.cpp
+7 −0 src/python/magnum/math.cpp
+16 −3 src/python/magnum/meshtools.cpp
+4 −0 src/python/magnum/scenetools.cpp
+12 −12 src/python/magnum/test/test.py
+15 −4 src/python/magnum/test/test_math.py
+18 −1 src/python/magnum/test/test_meshtools.py
+31 −0 src/python/magnum/test/test_scenetools.py
+684 −17 src/python/magnum/test/test_trade.py
+294 −54 src/python/magnum/trade.cpp
2 changes: 1 addition & 1 deletion src/deps/magnum-integration
Open in desktop
Submodule magnum-integration updated 5 files
+12 −2 doc/building-integration.dox
+24 −13 modules/FindMagnum.cmake
+15 −4 package/archlinux/PKGBUILD
+22 −10 src/Magnum/ImGuiIntegration/Context.h
+11 −9 src/Magnum/ImGuiIntegration/Test/ContextGLTest.cpp
2 changes: 1 addition & 1 deletion src/deps/magnum-plugins
Open in desktop
Submodule magnum-plugins updated 24 files
+28 −4 doc/building-plugins.dox
+116 −22 modules/FindGlslang.cmake
+8 −8 src/MagnumPlugins/DevIlImageImporter/Test/DevIlImageImporterTest.cpp
+1 −0 src/MagnumPlugins/GlslangShaderConverter/GlslangConverter.cpp
+2 −0 src/MagnumPlugins/PngImageConverter/Test/CMakeLists.txt
+166 −77 src/MagnumPlugins/PngImageConverter/Test/PngImageConverterTest.cpp
+8 −0 src/MagnumPlugins/PngImporter/PngImporter.conf
+65 −7 src/MagnumPlugins/PngImporter/PngImporter.cpp
+14 −10 src/MagnumPlugins/PngImporter/Test/CMakeLists.txt
+240 −31 src/MagnumPlugins/PngImporter/Test/PngImporterTest.cpp
+3 −3 src/MagnumPlugins/PngImporter/Test/README.md
+ − src/MagnumPlugins/PngImporter/Test/ga-binary-alpha-trns.png
+ − src/MagnumPlugins/PngImporter/Test/ga-binary-alpha.png
+ − src/MagnumPlugins/PngImporter/Test/ga.png
+ − src/MagnumPlugins/PngImporter/Test/rgba-binary-alpha-iphone.png
+ − src/MagnumPlugins/PngImporter/Test/rgba-binary-alpha-trns.png
+ − src/MagnumPlugins/PngImporter/Test/rgba-binary-alpha.png
+ − src/MagnumPlugins/PngImporter/Test/rgba-linear.png
+ − src/MagnumPlugins/PngImporter/Test/rgba-srgb.png
+ − src/MagnumPlugins/PngImporter/Test/rgba.png
+5 −5 src/MagnumPlugins/SpngImporter/Test/CMakeLists.txt
+7 −7 src/MagnumPlugins/SpngImporter/Test/SpngImporterTest.cpp
+2 −2 src/MagnumPlugins/StbImageImporter/Test/CMakeLists.txt
+15 −16 src/MagnumPlugins/StbImageImporter/Test/StbImageImporterTest.cpp
5 changes: 4 additions & 1 deletion src/esp/bindings_js/bindings_js.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,10 @@ EMSCRIPTEN_BINDINGS(habitat_sim_bindings_js) {
.function("transformVector", &Magnum::Quaternion::transformVector)
// mul class method instead of operator*
.class_function("mul", &Quaternion_mul)
.class_function("rotation", &Magnum::Quaternion::rotation);
.class_function("rotation",
em::select_overload<Magnum::Quaternion(
const Magnum::Vector3&, const Magnum::Vector3&)>(
&Magnum::Quaternion::rotation));

em::class_<AgentConfiguration>("AgentConfiguration")
.smart_ptr_constructor("AgentConfiguration",
Expand Down