From e8f0eb930d8b33b44bbf50810040662f6da05991 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Fri, 24 Feb 2023 14:34:32 +0200 Subject: [PATCH] Fix loading binary LWO files --- code/AssetLib/LWO/LWOLoader.cpp | 2 +- test/unit/utLWOImportExport.cpp | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/code/AssetLib/LWO/LWOLoader.cpp b/code/AssetLib/LWO/LWOLoader.cpp index 7cca332b1..1bf39b2da 100644 --- a/code/AssetLib/LWO/LWOLoader.cpp +++ b/code/AssetLib/LWO/LWOLoader.cpp @@ -178,7 +178,7 @@ void LWOImporter::InternReadFile(const std::string &pFile, mLayers->push_back(Layer()); mCurLayer = &mLayers->back(); mCurLayer->mName = ""; - mCurLayer->mIndex = (uint16_t) -1; + mCurLayer->mIndex = 1; // old lightwave file format (prior to v6) mIsLWO2 = false; diff --git a/test/unit/utLWOImportExport.cpp b/test/unit/utLWOImportExport.cpp index e0053020f..2ab1c4722 100644 --- a/test/unit/utLWOImportExport.cpp +++ b/test/unit/utLWOImportExport.cpp @@ -357,16 +357,11 @@ TEST_F(utLWOImportExport, importLWOuvtest) { } -// These tests leak memory and complain on ASAN CI build -#if 0 - - TEST_F(utLWOImportExport, importLWOBConcavePolygon) { ::Assimp::Importer importer; const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/LWO/LWOB/ConcavePolygon.lwo", aiProcess_ValidateDataStructure); - // FIXME: this should succees but there's a bug in the importer - EXPECT_EQ(nullptr, scene); + EXPECT_NE(nullptr, scene); } @@ -374,8 +369,7 @@ TEST_F(utLWOImportExport, importLWOBbluewithcylindrictex) { ::Assimp::Importer importer; const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/LWO/LWOB/MappingModes/bluewithcylindrictexz.lwo", aiProcess_ValidateDataStructure); - // FIXME: this should succees but there's a bug in the importer - EXPECT_EQ(nullptr, scene); + EXPECT_NE(nullptr, scene); } @@ -383,8 +377,7 @@ TEST_F(utLWOImportExport, importLWOBsphere_with_mat_gloss_10pc) { ::Assimp::Importer importer; const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/LWO/LWOB/sphere_with_mat_gloss_10pc.lwo", aiProcess_ValidateDataStructure); - // FIXME: this should succees but there's a bug in the importer - EXPECT_EQ(nullptr, scene); + EXPECT_NE(nullptr, scene); } @@ -392,9 +385,5 @@ TEST_F(utLWOImportExport, importLWOBsphere_with_mat_gloss_50pc) { ::Assimp::Importer importer; const aiScene *scene = importer.ReadFile(ASSIMP_TEST_MODELS_DIR "/LWO/LWOB/sphere_with_mat_gloss_50pc.lwo", aiProcess_ValidateDataStructure); - // FIXME: this should succees but there's a bug in the importer - EXPECT_EQ(nullptr, scene); + EXPECT_NE(nullptr, scene); } - - -#endif // ASAN failing tests