v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4541 from blackhorse-reddog/master 

I ran into an error while processing coloured binary stl. Just a type but better be fixed
pull/4621/head
Kim Kulling 2022-07-07 14:37:24 +02:00 committed by GitHub
parent bac3432733 e9b08f35b2
commit 7e4a20f843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/AssetLib/STL/STLLoader.cpp
View File

@ -517,13 +517,13 @@ bool STLImporter::LoadBinaryFile() {
const ai_real invVal((ai_real)1.0 / (ai_real)31.0); const ai_real invVal((ai_real)1.0 / (ai_real)31.0);
if (bIsMaterialise) // this is reversed if (bIsMaterialise) // this is reversed
{ {
clr->r = (color & 0x31u) * invVal; clr->r = (color & 0x1fu) * invVal;
clr->g = ((color & (0x31u << 5)) >> 5u) * invVal; clr->g = ((color & (0x1fu << 5)) >> 5u) * invVal;
clr->b = ((color & (0x31u << 10)) >> 10u) * invVal; clr->b = ((color & (0x1fu << 10)) >> 10u) * invVal;
} else { } else {
clr->b = (color & 0x31u) * invVal; clr->b = (color & 0x1fu) * invVal;
clr->g = ((color & (0x31u << 5)) >> 5u) * invVal; clr->g = ((color & (0x1fu << 5)) >> 5u) * invVal;
clr->r = ((color & (0x31u << 10)) >> 10u) * invVal; clr->r = ((color & (0x1fu << 10)) >> 10u) * invVal;
} }
// assign the color to all vertices of the face // assign the color to all vertices of the face
*(clr + 1) = *clr; *(clr + 1) = *clr;