From 0b5811698585ae879cb7fa70c67ec7757e2011c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 12 Apr 2022 22:10:51 +0200 Subject: [PATCH] [wip] Trade: expand SceneConverterFeature to 32 bits. In the end this didn't need all 64 (which would be a stupid waste anyway). --- src/Magnum/Trade/AbstractSceneConverter.cpp | 2 +- src/Magnum/Trade/AbstractSceneConverter.h | 2 +- src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Trade/AbstractSceneConverter.cpp b/src/Magnum/Trade/AbstractSceneConverter.cpp index b4c795855..87993d50e 100644 --- a/src/Magnum/Trade/AbstractSceneConverter.cpp +++ b/src/Magnum/Trade/AbstractSceneConverter.cpp @@ -217,7 +217,7 @@ Debug& operator<<(Debug& debug, const SceneConverterFeature value) { /* LCOV_EXCL_STOP */ } - return debug << "(" << Debug::nospace << reinterpret_cast(UnsignedByte(value)) << Debug::nospace << ")"; + return debug << "(" << Debug::nospace << reinterpret_cast(UnsignedInt(value)) << Debug::nospace << ")"; } Debug& operator<<(Debug& debug, const SceneConverterFeatures value) { diff --git a/src/Magnum/Trade/AbstractSceneConverter.h b/src/Magnum/Trade/AbstractSceneConverter.h index abdec939b..dc8a1064e 100644 --- a/src/Magnum/Trade/AbstractSceneConverter.h +++ b/src/Magnum/Trade/AbstractSceneConverter.h @@ -53,7 +53,7 @@ namespace Magnum { namespace Trade { @see @ref SceneConverterFeatures, @ref AbstractSceneConverter::features() */ -enum class SceneConverterFeature: UnsignedByte { +enum class SceneConverterFeature: UnsignedInt { /** * Convert a mesh with * @ref AbstractSceneConverter::convert(const MeshData&). diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp index 6c2a2e287..a70242391 100644 --- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp @@ -665,8 +665,8 @@ void AbstractSceneConverterTest::convertMeshToFileNotImplemented() { void AbstractSceneConverterTest::debugFeature() { std::ostringstream out; - Debug{&out} << SceneConverterFeature::ConvertMeshInPlace << SceneConverterFeature(0xf0); - CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xf0)\n"); + Debug{&out} << SceneConverterFeature::ConvertMeshInPlace << SceneConverterFeature(0xdeaddead); + CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xdeaddead)\n"); } void AbstractSceneConverterTest::debugFeatures() {