PNG/Transparency for Textures, Fixed Back/Front primitives

Author: SydMontague

CMakeLists.txt

@@ -4,19 +4,36 @@ PROJECT(DW1ModelConverter)
 SET(CMAKE_CXX_STANDARD 20)
 
 # --- Libraries ---
+# boost
+#FIND_PACKAGE(Boost 1.75 REQUIRED)
+#INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
+
+# libpng
+FIND_PACKAGE(PNG REQUIRED)
+INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+
 # tinyxml2
 ADD_SUBDIRECTORY("libs/tinyxml2")
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dcimg_use_png")
 INCLUDE_DIRECTORIES( "libs" )
 
-# boost
-#FIND_PACKAGE(Boost 1.75 REQUIRED)
-#INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
-
 # --- Tools ---
 
 SET(SOURCE_FILES ${SOURCE_FILES} "src/main.cpp" "src/TIM.cpp" "src/Collada.cpp" "src/Animation.cpp" "src/CLUTMap.cpp" 
                                  "src/Model.cpp")
 
 ADD_EXECUTABLE(DW1ModelConverter ${SOURCE_FILES})
-TARGET_LINK_LIBRARIES(DW1ModelConverter tinyxml2)
+TARGET_LINK_LIBRARIES(DW1ModelConverter PUBLIC tinyxml2 PNG::PNG)
+
+# Copy .dll dependencies. Extremely dirty!
+if(WIN32)
+    FIND_FILE(PNG_FILE "bin/libpng16d.dll")
+    FIND_FILE(ZLIB_FILE "bin/zlib.dll" PATHS "${ZLIB_INCLUDE_DIR}/..")
+
+    ADD_CUSTOM_COMMAND(TARGET DW1ModelConverter POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy ${PNG_FILE} $<TARGET_FILE_DIR:DW1ModelConverter>
+      COMMAND ${CMAKE_COMMAND} -E copy ${ZLIB_FILE} $<TARGET_FILE_DIR:DW1ModelConverter>
+      COMMAND_EXPAND_LISTS
+    )
+endif()

src/Model.cpp

@@ -77,13 +77,13 @@ std::vector<Face> Primitive::toFaces()
 {
     std::vector<Face> faces;
 
-    faces.push_back(getFace(0, 1, 2));
-    if (flag.isDoubleFaced) faces.push_back(getFace(2, 1, 0));
+    faces.push_back(getFace(2, 1, 0));
+    if (flag.isDoubleFaced) faces.push_back(getFace(0, 1, 2));
 
     if (mode.isQuad)
     {
-        faces.push_back(getFace(3, 2, 1));
-        if (flag.isDoubleFaced) faces.push_back(getFace(1, 2, 3));
+        faces.push_back(getFace(1, 2, 3));
+        if (flag.isDoubleFaced) faces.push_back(getFace(3, 2, 1));
     }
 
     return faces;

src/Model.hpp

@@ -81,7 +81,7 @@ struct SVector
 
     FVector convertToFixedPoint(uint32_t decimalBits)
     {
-        float scale = -1.0f / (1 << decimalBits);
+        float scale = 1.0f / (1 << decimalBits);
         return { x * scale, y * scale, z * scale };
     }
 

src/TIM.cpp

@@ -9,7 +9,7 @@ static uint32_t toTexturePage(uint32_t x, uint32_t y) { return (x / 64) + ((y /
 
 void AbstractTIM::writeImage(CLUTMap& clutMap, std::filesystem::path path)
 {
-    cimg::CImg<uint8_t> new_image(width, height, 1, 3, 0);
+    cimg::CImg<uint8_t> new_image(width, height, 1, 4, 0);
     auto& clut = clutMap[toTexturePage(pixelOrgX, pixelOrgY)];
 
     for (uint32_t y = 0; y < height; y++)
@@ -23,13 +23,11 @@ void AbstractTIM::writeImage(CLUTMap& clutMap, std::filesystem::path path)
             uint32_t palette = clutCoord.coords.y - clutOrgY;
 
             TIMColor color      = palettes[palette][pixels[(y * static_cast<uint64_t>(width)) + x]];
-            const uint8_t bla[] = { static_cast<uint8_t>(color.r * 8),
-                                    static_cast<uint8_t>(color.g * 8),
-                                    static_cast<uint8_t>(color.b * 8) };
-            new_image.draw_point(x, y, bla, 1.0f);
+            RGBA rgba = color.getColor();
+            new_image.draw_point(x, y, reinterpret_cast<uint8_t*>(&rgba), 1.0f);
         }
 
-    new_image.save_bmp(path.string().c_str());
+    new_image.save_png(path.string().c_str());
 }
 
 AbstractTIM::AbstractTIM(const std::filesystem::path path)

src/TIM.hpp

@@ -9,12 +9,31 @@
 #include <utility>
 #include <vector>
 
+struct RGBA
+{
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+    uint8_t a;
+};
+
 struct TIMColor
 {
     uint16_t r   : 5;
     uint16_t g   : 5;
     uint16_t b   : 5;
     uint16_t stp : 1;
+
+    const RGBA getColor()
+    {
+        if (r == 0 && g == 0 && b == 0 && stp == 0) return { 0, 0, 0, 0 }; // transparent
+        if (r == 0 && g == 0 && b == 0 && stp == 1) return { 0, 0, 0, 255 }; // black
+
+        return { static_cast<uint8_t>(r << 3),
+                 static_cast<uint8_t>(g << 3),
+                 static_cast<uint8_t>(b << 3),
+                 static_cast<uint8_t>(0xFF - stp * 0x80) };
+    }
 };
 
 struct CLUT4BPP

src/main.cpp

@@ -17,7 +17,7 @@ int main()
     exporter.getDocument().SaveFile("BOYS.dae");
     CLUTMap clutMap(model);
 
-    tim.writeImage(clutMap, "BOYS.bmp");
+    tim.writeImage(clutMap, "BOYS.png");
 
     // TODO support transparency channel for textures
     // TODO support for texture+color primitives