Browse Source

Adapted to Magnum changes regarding Containers::Optional.

pull/205/head
Vladimír Vondruš 8 years ago
parent
commit
be8f19cc66
  1. 2
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
  2. 2
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h
  3. 6
      src/MagnumPlugins/AnyImageImporter/Test/Test.cpp
  4. 18
      src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp
  5. 18
      src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h
  6. 4
      src/MagnumPlugins/AnySceneImporter/Test/Test.cpp

2
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp

@ -120,6 +120,6 @@ void AnyImageImporter::doOpenFile(const std::string& filename) {
UnsignedInt AnyImageImporter::doImage2DCount() const { return _in->image2DCount(); } UnsignedInt AnyImageImporter::doImage2DCount() const { return _in->image2DCount(); }
std::optional<ImageData2D> AnyImageImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); } Containers::Optional<ImageData2D> AnyImageImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); }
}} }}

2
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h

@ -116,7 +116,7 @@ class MAGNUM_ANYIMAGEIMPORTER_EXPORT AnyImageImporter: public AbstractImporter {
MAGNUM_ANYIMAGEIMPORTER_LOCAL void doOpenFile(const std::string& filename) override; MAGNUM_ANYIMAGEIMPORTER_LOCAL void doOpenFile(const std::string& filename) override;
MAGNUM_ANYIMAGEIMPORTER_LOCAL UnsignedInt doImage2DCount() const override; MAGNUM_ANYIMAGEIMPORTER_LOCAL UnsignedInt doImage2DCount() const override;
MAGNUM_ANYIMAGEIMPORTER_LOCAL std::optional<ImageData2D> doImage2D(UnsignedInt id) override; MAGNUM_ANYIMAGEIMPORTER_LOCAL Containers::Optional<ImageData2D> doImage2D(UnsignedInt id) override;
std::unique_ptr<AbstractImporter> _in; std::unique_ptr<AbstractImporter> _in;
}; };

6
src/MagnumPlugins/AnyImageImporter/Test/Test.cpp

@ -63,7 +63,7 @@ void AnyImageImporterTest::tga() {
CORRADE_VERIFY(importer.openFile(TGA_FILE)); CORRADE_VERIFY(importer.openFile(TGA_FILE));
/* Check only size, as it is good enough proof that it is working */ /* Check only size, as it is good enough proof that it is working */
std::optional<ImageData2D> image = importer.image2D(0); Containers::Optional<ImageData2D> image = importer.image2D(0);
CORRADE_VERIFY(image); CORRADE_VERIFY(image);
CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->size(), Vector2i(2, 3));
} }
@ -76,7 +76,7 @@ void AnyImageImporterTest::jpeg() {
CORRADE_VERIFY(importer.openFile(JPEG_FILE)); CORRADE_VERIFY(importer.openFile(JPEG_FILE));
/* Check only size, as it is good enough proof that it is working */ /* Check only size, as it is good enough proof that it is working */
std::optional<ImageData2D> image = importer.image2D(0); Containers::Optional<ImageData2D> image = importer.image2D(0);
CORRADE_VERIFY(image); CORRADE_VERIFY(image);
CORRADE_COMPARE(image->size(), Vector2i(3, 2)); CORRADE_COMPARE(image->size(), Vector2i(3, 2));
} }
@ -89,7 +89,7 @@ void AnyImageImporterTest::png() {
CORRADE_VERIFY(importer.openFile(PNG_FILE)); CORRADE_VERIFY(importer.openFile(PNG_FILE));
/* Check only size, as it is good enough proof that it is working */ /* Check only size, as it is good enough proof that it is working */
std::optional<ImageData2D> image = importer.image2D(0); Containers::Optional<ImageData2D> image = importer.image2D(0);
CORRADE_VERIFY(image); CORRADE_VERIFY(image);
CORRADE_COMPARE(image->size(), Vector2i(3, 2)); CORRADE_COMPARE(image->size(), Vector2i(3, 2));
} }

18
src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp

@ -140,17 +140,17 @@ Int AnySceneImporter::doDefaultScene() { return _in->defaultScene(); }
UnsignedInt AnySceneImporter::doSceneCount() const { return _in->sceneCount(); } UnsignedInt AnySceneImporter::doSceneCount() const { return _in->sceneCount(); }
Int AnySceneImporter::doSceneForName(const std::string& name) { return _in->sceneForName(name); } Int AnySceneImporter::doSceneForName(const std::string& name) { return _in->sceneForName(name); }
std::string AnySceneImporter::doSceneName(const UnsignedInt id) { return _in->sceneName(id); } std::string AnySceneImporter::doSceneName(const UnsignedInt id) { return _in->sceneName(id); }
std::optional<SceneData> AnySceneImporter::doScene(const UnsignedInt id) { return _in->scene(id); } Containers::Optional<SceneData> AnySceneImporter::doScene(const UnsignedInt id) { return _in->scene(id); }
UnsignedInt AnySceneImporter::doLightCount() const { return _in->lightCount(); } UnsignedInt AnySceneImporter::doLightCount() const { return _in->lightCount(); }
Int AnySceneImporter::doLightForName(const std::string& name) { return _in->lightForName(name); } Int AnySceneImporter::doLightForName(const std::string& name) { return _in->lightForName(name); }
std::string AnySceneImporter::doLightName(const UnsignedInt id) { return _in->lightName(id); } std::string AnySceneImporter::doLightName(const UnsignedInt id) { return _in->lightName(id); }
std::optional<LightData> AnySceneImporter::doLight(const UnsignedInt id) { return _in->light(id); } Containers::Optional<LightData> AnySceneImporter::doLight(const UnsignedInt id) { return _in->light(id); }
UnsignedInt AnySceneImporter::doCameraCount() const { return _in->cameraCount(); } UnsignedInt AnySceneImporter::doCameraCount() const { return _in->cameraCount(); }
Int AnySceneImporter::doCameraForName(const std::string& name) { return _in->cameraForName(name); } Int AnySceneImporter::doCameraForName(const std::string& name) { return _in->cameraForName(name); }
std::string AnySceneImporter::doCameraName(const UnsignedInt id) { return _in->cameraName(id); } std::string AnySceneImporter::doCameraName(const UnsignedInt id) { return _in->cameraName(id); }
std::optional<CameraData> AnySceneImporter::doCamera(const UnsignedInt id) { return _in->camera(id); } Containers::Optional<CameraData> AnySceneImporter::doCamera(const UnsignedInt id) { return _in->camera(id); }
UnsignedInt AnySceneImporter::doObject2DCount() const { return _in->object2DCount(); } UnsignedInt AnySceneImporter::doObject2DCount() const { return _in->object2DCount(); }
Int AnySceneImporter::doObject2DForName(const std::string& name) { return _in->object2DForName(name); } Int AnySceneImporter::doObject2DForName(const std::string& name) { return _in->object2DForName(name); }
@ -165,12 +165,12 @@ std::unique_ptr<ObjectData3D> AnySceneImporter::doObject3D(const UnsignedInt id)
UnsignedInt AnySceneImporter::doMesh2DCount() const { return _in->mesh2DCount(); } UnsignedInt AnySceneImporter::doMesh2DCount() const { return _in->mesh2DCount(); }
Int AnySceneImporter::doMesh2DForName(const std::string& name) { return _in->mesh2DForName(name); } Int AnySceneImporter::doMesh2DForName(const std::string& name) { return _in->mesh2DForName(name); }
std::string AnySceneImporter::doMesh2DName(const UnsignedInt id) { return _in->mesh2DName(id); } std::string AnySceneImporter::doMesh2DName(const UnsignedInt id) { return _in->mesh2DName(id); }
std::optional<MeshData2D> AnySceneImporter::doMesh2D(const UnsignedInt id) { return _in->mesh2D(id); } Containers::Optional<MeshData2D> AnySceneImporter::doMesh2D(const UnsignedInt id) { return _in->mesh2D(id); }
UnsignedInt AnySceneImporter::doMesh3DCount() const { return _in->mesh3DCount(); } UnsignedInt AnySceneImporter::doMesh3DCount() const { return _in->mesh3DCount(); }
Int AnySceneImporter::doMesh3DForName(const std::string& name) { return _in->mesh3DForName(name); } Int AnySceneImporter::doMesh3DForName(const std::string& name) { return _in->mesh3DForName(name); }
std::string AnySceneImporter::doMesh3DName(const UnsignedInt id) { return _in->mesh3DName(id); } std::string AnySceneImporter::doMesh3DName(const UnsignedInt id) { return _in->mesh3DName(id); }
std::optional<MeshData3D> AnySceneImporter::doMesh3D(const UnsignedInt id) { return _in->mesh3D(id); } Containers::Optional<MeshData3D> AnySceneImporter::doMesh3D(const UnsignedInt id) { return _in->mesh3D(id); }
UnsignedInt AnySceneImporter::doMaterialCount() const { return _in->materialCount(); } UnsignedInt AnySceneImporter::doMaterialCount() const { return _in->materialCount(); }
Int AnySceneImporter::doMaterialForName(const std::string& name) { return _in->materialForName(name); } Int AnySceneImporter::doMaterialForName(const std::string& name) { return _in->materialForName(name); }
@ -180,21 +180,21 @@ std::unique_ptr<AbstractMaterialData> AnySceneImporter::doMaterial(const Unsigne
UnsignedInt AnySceneImporter::doTextureCount() const { return _in->textureCount(); } UnsignedInt AnySceneImporter::doTextureCount() const { return _in->textureCount(); }
Int AnySceneImporter::doTextureForName(const std::string& name) { return _in->textureForName(name); } Int AnySceneImporter::doTextureForName(const std::string& name) { return _in->textureForName(name); }
std::string AnySceneImporter::doTextureName(const UnsignedInt id) { return _in->textureName(id); } std::string AnySceneImporter::doTextureName(const UnsignedInt id) { return _in->textureName(id); }
std::optional<TextureData> AnySceneImporter::doTexture(const UnsignedInt id) { return _in->texture(id); } Containers::Optional<TextureData> AnySceneImporter::doTexture(const UnsignedInt id) { return _in->texture(id); }
UnsignedInt AnySceneImporter::doImage1DCount() const { return _in->image1DCount(); } UnsignedInt AnySceneImporter::doImage1DCount() const { return _in->image1DCount(); }
Int AnySceneImporter::doImage1DForName(const std::string& name) { return _in->image1DForName(name); } Int AnySceneImporter::doImage1DForName(const std::string& name) { return _in->image1DForName(name); }
std::string AnySceneImporter::doImage1DName(const UnsignedInt id) { return _in->image1DName(id); } std::string AnySceneImporter::doImage1DName(const UnsignedInt id) { return _in->image1DName(id); }
std::optional<ImageData1D> AnySceneImporter::doImage1D(const UnsignedInt id) { return _in->image1D(id); } Containers::Optional<ImageData1D> AnySceneImporter::doImage1D(const UnsignedInt id) { return _in->image1D(id); }
UnsignedInt AnySceneImporter::doImage2DCount() const { return _in->image2DCount(); } UnsignedInt AnySceneImporter::doImage2DCount() const { return _in->image2DCount(); }
Int AnySceneImporter::doImage2DForName(const std::string& name) { return _in->image2DForName(name); } Int AnySceneImporter::doImage2DForName(const std::string& name) { return _in->image2DForName(name); }
std::string AnySceneImporter::doImage2DName(const UnsignedInt id) { return _in->image2DName(id); } std::string AnySceneImporter::doImage2DName(const UnsignedInt id) { return _in->image2DName(id); }
std::optional<ImageData2D> AnySceneImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); } Containers::Optional<ImageData2D> AnySceneImporter::doImage2D(const UnsignedInt id) { return _in->image2D(id); }
UnsignedInt AnySceneImporter::doImage3DCount() const { return _in->image3DCount(); } UnsignedInt AnySceneImporter::doImage3DCount() const { return _in->image3DCount(); }
Int AnySceneImporter::doImage3DForName(const std::string& name) { return _in->image3DForName(name); } Int AnySceneImporter::doImage3DForName(const std::string& name) { return _in->image3DForName(name); }
std::string AnySceneImporter::doImage3DName(const UnsignedInt id) { return _in->image3DName(id); } std::string AnySceneImporter::doImage3DName(const UnsignedInt id) { return _in->image3DName(id); }
std::optional<ImageData3D> AnySceneImporter::doImage3D(const UnsignedInt id) { return _in->image3D(id); } Containers::Optional<ImageData3D> AnySceneImporter::doImage3D(const UnsignedInt id) { return _in->image3D(id); }
}} }}

18
src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h

@ -129,17 +129,17 @@ class MAGNUM_ANYSCENEIMPORTER_EXPORT AnySceneImporter: public AbstractImporter {
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doSceneCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doSceneCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doSceneForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doSceneForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doSceneName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doSceneName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<SceneData> doScene(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<SceneData> doScene(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doLightCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doLightCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doLightForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doLightForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doLightName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doLightName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<LightData> doLight(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<LightData> doLight(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doCameraCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doCameraCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doCameraForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doCameraForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doCameraName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doCameraName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<CameraData> doCamera(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<CameraData> doCamera(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doObject2DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doObject2DCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doObject2DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doObject2DForName(const std::string& name) override;
@ -154,12 +154,12 @@ class MAGNUM_ANYSCENEIMPORTER_EXPORT AnySceneImporter: public AbstractImporter {
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMesh2DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMesh2DCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMesh2DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMesh2DForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doMesh2DName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doMesh2DName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<MeshData2D> doMesh2D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<MeshData2D> doMesh2D(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMesh3DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMesh3DCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMesh3DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMesh3DForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doMesh3DName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doMesh3DName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<MeshData3D> doMesh3D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<MeshData3D> doMesh3D(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMaterialCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doMaterialCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMaterialForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doMaterialForName(const std::string& name) override;
@ -169,22 +169,22 @@ class MAGNUM_ANYSCENEIMPORTER_EXPORT AnySceneImporter: public AbstractImporter {
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doTextureCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doTextureCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doTextureForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doTextureForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doTextureName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doTextureName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<TextureData> doTexture(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<TextureData> doTexture(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage1DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage1DCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage1DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage1DForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage1DName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage1DName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<ImageData1D> doImage1D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<ImageData1D> doImage1D(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage2DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage2DCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage2DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage2DForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage2DName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage2DName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<ImageData2D> doImage2D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<ImageData2D> doImage2D(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage3DCount() const override; MAGNUM_ANYSCENEIMPORTER_LOCAL UnsignedInt doImage3DCount() const override;
MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage3DForName(const std::string& name) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Int doImage3DForName(const std::string& name) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage3DName(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL std::string doImage3DName(UnsignedInt id) override;
MAGNUM_ANYSCENEIMPORTER_LOCAL std::optional<ImageData3D> doImage3D(UnsignedInt id) override; MAGNUM_ANYSCENEIMPORTER_LOCAL Containers::Optional<ImageData3D> doImage3D(UnsignedInt id) override;
std::unique_ptr<AbstractImporter> _in; std::unique_ptr<AbstractImporter> _in;
}; };

4
src/MagnumPlugins/AnySceneImporter/Test/Test.cpp

@ -62,7 +62,7 @@ void AnySceneImporterTest::obj() {
CORRADE_VERIFY(importer.openFile(OBJ_FILE)); CORRADE_VERIFY(importer.openFile(OBJ_FILE));
/* Check only size, as it is good enough proof that it is working */ /* Check only size, as it is good enough proof that it is working */
std::optional<MeshData3D> mesh = importer.mesh3D(0); Containers::Optional<MeshData3D> mesh = importer.mesh3D(0);
CORRADE_VERIFY(mesh); CORRADE_VERIFY(mesh);
CORRADE_COMPARE(mesh->positions(0).size(), 3); CORRADE_COMPARE(mesh->positions(0).size(), 3);
} }
@ -75,7 +75,7 @@ void AnySceneImporterTest::ply() {
CORRADE_VERIFY(importer.openFile(PLY_FILE)); CORRADE_VERIFY(importer.openFile(PLY_FILE));
/* Check only size, as it is good enough proof that it is working */ /* Check only size, as it is good enough proof that it is working */
std::optional<MeshData3D> mesh = importer.mesh3D(0); Containers::Optional<MeshData3D> mesh = importer.mesh3D(0);
CORRADE_VERIFY(mesh); CORRADE_VERIFY(mesh);
CORRADE_COMPARE(mesh->positions(0).size(), 5); CORRADE_COMPARE(mesh->positions(0).size(), 5);
} }

Loading…
Cancel
Save