Browse Source

[wip] Trade: expand SceneConverterFeature to 32 bits.

In the end this didn't need all 64 (which would be a stupid waste
anyway).
sceneconverter
Vladimír Vondruš 4 years ago
parent
commit
0b58116985
  1. 2
      src/Magnum/Trade/AbstractSceneConverter.cpp
  2. 2
      src/Magnum/Trade/AbstractSceneConverter.h
  3. 4
      src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp

2
src/Magnum/Trade/AbstractSceneConverter.cpp

@ -217,7 +217,7 @@ Debug& operator<<(Debug& debug, const SceneConverterFeature value) {
/* LCOV_EXCL_STOP */ /* LCOV_EXCL_STOP */
} }
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")"; return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedInt(value)) << Debug::nospace << ")";
} }
Debug& operator<<(Debug& debug, const SceneConverterFeatures value) { Debug& operator<<(Debug& debug, const SceneConverterFeatures value) {

2
src/Magnum/Trade/AbstractSceneConverter.h

@ -53,7 +53,7 @@ namespace Magnum { namespace Trade {
@see @ref SceneConverterFeatures, @ref AbstractSceneConverter::features() @see @ref SceneConverterFeatures, @ref AbstractSceneConverter::features()
*/ */
enum class SceneConverterFeature: UnsignedByte { enum class SceneConverterFeature: UnsignedInt {
/** /**
* Convert a mesh with * Convert a mesh with
* @ref AbstractSceneConverter::convert(const MeshData&). * @ref AbstractSceneConverter::convert(const MeshData&).

4
src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp

@ -665,8 +665,8 @@ void AbstractSceneConverterTest::convertMeshToFileNotImplemented() {
void AbstractSceneConverterTest::debugFeature() { void AbstractSceneConverterTest::debugFeature() {
std::ostringstream out; std::ostringstream out;
Debug{&out} << SceneConverterFeature::ConvertMeshInPlace << SceneConverterFeature(0xf0); Debug{&out} << SceneConverterFeature::ConvertMeshInPlace << SceneConverterFeature(0xdeaddead);
CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xf0)\n"); CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xdeaddead)\n");
} }
void AbstractSceneConverterTest::debugFeatures() { void AbstractSceneConverterTest::debugFeatures() {

Loading…
Cancel
Save