From fa0951012ff31bfd3c4caeca586c4a440a365731 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 11 Nov 2020 20:32:55 +0100 Subject: [PATCH] closes https://github.com/assimp/assimp/issues/1044: fix envelope handling in lightintensity. --- code/AssetLib/LWS/LWSLoader.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/AssetLib/LWS/LWSLoader.cpp b/code/AssetLib/LWS/LWSLoader.cpp index 7d67c86d6..2a5cbeb8d 100644 --- a/code/AssetLib/LWS/LWSLoader.cpp +++ b/code/AssetLib/LWS/LWSLoader.cpp @@ -750,12 +750,17 @@ void LWSImporter::InternReadFile(const std::string &pFile, aiScene *pScene, IOSy } // 'LightIntensity': set intensity of currently active light else if ((*it).tokens[0] == "LightIntensity" || (*it).tokens[0] == "LgtIntensity") { - if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) + if (nodes.empty() || nodes.back().type != LWS::NodeDesc::LIGHT) { ASSIMP_LOG_ERROR("LWS: Unexpected keyword: \'LightIntensity\'"); - - else - fast_atoreal_move(c, nodes.back().lightIntensity); - + } else { + const std::string env = "(envelope)"; + if (0 == strncmp(c, env.c_str(), env.size())) { + ASSIMP_LOG_ERROR("LWS: envelopes for LightIntensity not supported, set to 1.0"); + nodes.back().lightIntensity = (ai_real)1.0; + } else { + fast_atoreal_move(c, nodes.back().lightIntensity); + } + } } // 'LightType': set type of currently active light else if ((*it).tokens[0] == "LightType") {