From a9c5b6f1be3cfc75208937eda2cdd38c65769056 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 17 Nov 2016 19:57:24 +0100 Subject: [PATCH 1/6] Ensure that filelist for assimp lib is not empty for coveralls. --- code/CMakeLists.txt | 12 ++++++++++++ test/CMakeLists.txt | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 3f0b69670..7f42d9ee7 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -928,3 +928,15 @@ if(MSVC AND ASSIMP_INSTALL_PDB) CONFIGURATIONS RelWithDebInfo ) endif () + +if (ASSIMP_COVERALLS) + include(Coveralls) + + set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} ) + + # Create the coveralls target. + coveralls_setup( + "${COVERAGE_SRCS}" # The source files. + ON # If we should upload. + "${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path. +endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e7beee49e..e227e2124 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -122,15 +122,15 @@ ENDIF( WIN32 ) target_link_libraries( unit assimp ${platform_libs} ) add_subdirectory(headercheck) -if (ASSIMP_COVERALLS) - include(Coveralls) - - set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} ) - - # Create the coveralls target. - coveralls_setup( - "${COVERAGE_SRCS}" # The source files. - ON # If we should upload. - "${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path. -endif() +#if (ASSIMP_COVERALLS) +# include(Coveralls) +# +# set(COVERAGE_SRCS ${assimp_src} ${TEST_SRCS} ) +# +# # Create the coveralls target. +# coveralls_setup( +# "${COVERAGE_SRCS}" # The source files. +# ON # If we should upload. +# "${PROJECT_SOURCE_DIR}/cmake-modules/") # (Optional) Alternate project cmake module path. +#endif() From 91e4d029dc72cf76b9e4bc562f7554ce9bf21d11 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Fri, 18 Nov 2016 13:08:00 +0100 Subject: [PATCH 2/6] Update material.h Fixed grammar --- include/assimp/material.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/assimp/material.h b/include/assimp/material.h index 1f97096b2..23a45878e 100644 --- a/include/assimp/material.h +++ b/include/assimp/material.h @@ -413,7 +413,7 @@ enum aiTextureFlags * SourceColor * SourceBlend + DestColor * DestBlend * @endcode * where DestColor is the previous color in the framebuffer at this - * position and SourceColor is the material colro before the transparency + * position and SourceColor is the material color before the transparency * calculation.
* This corresponds to the #AI_MATKEY_BLEND_FUNC property. */ From e4d43aa51a7a177bb1f081316e5de70c86942df2 Mon Sep 17 00:00:00 2001 From: Jared Mulconry Date: Sat, 19 Nov 2016 02:07:32 +1100 Subject: [PATCH 3/6] Fixed a bug in the AMF Importer Postprocessing where metadata would be incorrectly recorded as having type bool for all entries. --- code/AMFImporter_Postprocess.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/AMFImporter_Postprocess.cpp b/code/AMFImporter_Postprocess.cpp index 41b16035e..e88c2c08b 100644 --- a/code/AMFImporter_Postprocess.cpp +++ b/code/AMFImporter_Postprocess.cpp @@ -352,7 +352,7 @@ void AMFImporter::Postprocess_AddMetadata(const std::listSet(meta_idx++, metadata.Type, metadata.Value.c_str()); + pSceneNode.mMetaData->Set(meta_idx++, metadata.Type, aiString(metadata.Value)); } }// if(pMetadataList.size() > 0) } From d0d07006c8e325012875a4c30d388c1a6c97b3ef Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 19 Nov 2016 11:54:39 +0100 Subject: [PATCH 4/6] Travis config: fix typo. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bdd7a549d..9e553f489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,5 +50,5 @@ after_success: - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info - lcov --list coverage.info - - coveralls-lcov --repo-token ${COVERALLS_TOKEN} coverage.info + - coveralls-lcov --repo-token=${COVERALLS_TOKEN} coverage.info From 7ceaca61fd64ccb85423161c09cf8558ad3645f3 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 19 Nov 2016 15:23:08 +0100 Subject: [PATCH 5/6] Set right source encoding for coveralls-lcov. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e553f489..ff9318bb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,5 +50,5 @@ after_success: - lcov --directory . --capture --output-file coverage.info - lcov --remove coverage.info '/usr/*' 'contrib/*' 'test/*' --output-file coverage.info - lcov --list coverage.info - - coveralls-lcov --repo-token=${COVERALLS_TOKEN} coverage.info + - coveralls-lcov --source-encoding=ISO-8859-1 --repo-token=${COVERALLS_TOKEN} coverage.info From b6fb1f3c05381722587f3e0e95e02a3dde3d010c Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Sun, 20 Nov 2016 15:14:33 +0100 Subject: [PATCH 6/6] Update STLLoader.cpp If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning --- code/STLLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/STLLoader.cpp b/code/STLLoader.cpp index c2cffdb03..0571e542b 100644 --- a/code/STLLoader.cpp +++ b/code/STLLoader.cpp @@ -274,7 +274,7 @@ void STLImporter::LoadASCIIFile() } else pScene->mRootNode->mName.Set(""); - unsigned int faceVertexCounter = 0; + unsigned int faceVertexCounter = 3; for ( ;; ) { // go to the next token