Przeglądaj źródła

I ran into an error while processing colored binary stl. Just a type but
better be fixed.

Piroska Gabor 3 lat temu
rodzic
commit
7ce447294f
1 zmienionych plików z 6 dodań i 6 usunięć
  1. 6 6
      code/AssetLib/STL/STLLoader.cpp

+ 6 - 6
code/AssetLib/STL/STLLoader.cpp

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