Skip to content

Commit

Permalink
AssimpImporter: Skip invalid light test for Assimp < 3.1
Browse files Browse the repository at this point in the history
Signed-off-by: Squareys <squareys@googlemail.com>
  • Loading branch information
Squareys committed Jul 12, 2017
1 parent eb69be7 commit 1998da9
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/MagnumPlugins/AssimpImporter/Test/Test.cpp
Expand Up @@ -46,6 +46,7 @@

#include <assimp/Logger.hpp>
#include <assimp/DefaultLogger.hpp>
#include <assimp/version.h>

#include "configure.h"

Expand Down Expand Up @@ -121,7 +122,12 @@ void AssimpImporterTest::light() {
AssimpImporter importer;
CORRADE_VERIFY(importer.openFile(Utility::Directory::join(ASSIMPIMPORTER_TEST_DIR, "light.dae")));

CORRADE_COMPARE(importer.lightCount(), 4); /* 3 valid + 1 invalid */
if(aiGetVersionMajor() <= 3 && aiGetVersionMinor() < 1) {
/* Cannot load lights with undefined light type yet */
CORRADE_COMPARE(importer.lightCount(), 3); /* 3 valid */
} else {
CORRADE_COMPARE(importer.lightCount(), 4); /* 3 valid + 1 invalid */
}
CORRADE_COMPARE(importer.object3DCount(), 5); /* root + 4 light objects */

constexpr Trade::LightData::Type types[3]{
Expand All @@ -146,6 +152,11 @@ void AssimpImporterTest::light() {
CORRADE_COMPARE(lightObject->instance(), i);
}

if(aiGetVersionMajor() <= 3 && aiGetVersionMinor() < 1) {
/* Cannot load lights with undefined light type yet */
return;
}

std::ostringstream out;
Error redirectError{&out};

Expand Down

0 comments on commit 1998da9

Please sign in to comment.