- remove libsquish and glm

Author: Try

CMakeLists.txt

@@ -10,20 +10,10 @@ set(PHYSFS_BUILD_SHARED OFF)
 
 set(CMAKE_CXX_STANDARD 14)
 
-# Mute annoying MSVC-Warnings
-if(MSVC)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
-	add_definitions(-DNOMINMAX)
-endif()
-
 # 3rd-party dependencies
-add_subdirectory(lib/libsquish)
-
 set(PHYSFS_BUILD_TEST OFF CACHE STRING "" FORCE)
 add_subdirectory(lib/physfs)
 
-include_directories(lib/glm/glm)
-include_directories(lib/libsquish)
 include_directories(lib/physfs/src)
 include_directories(.)
 

lib/libsquish

@@ -8,6 +8,6 @@ file(GLOB SRC
 
 
 add_library(zenload STATIC ${SRC})
-target_link_libraries(zenload utils vdfs squish)
+target_link_libraries(zenload utils vdfs)
 set_target_properties(zenload PROPERTIES LINKER_LANGUAGE C)
 target_include_directories(zenload PUBLIC ..)

zenload/CMakeLists.txt

@@ -9,7 +9,6 @@
 #include <assert.h>
 #include <inttypes.h>
 #include <math.h>
-#include <squish.h>
 #include <string.h>
 #include "utils/logger.h"
 
@@ -468,50 +467,5 @@ namespace ZenLoad
 
         return desc;
     }
-
-    /**
-	 * @brief Convert dds to RGBA8
-	 */
-    void convertDDSToRGBA8(const std::vector<uint8_t>& ddsData, std::vector<uint8_t>& rgba8Data, int mip)
-    {
-        size_t seek = 0;
-        seek += sizeof(uint32_t);  // Skip magic number
-        const DDSURFACEDESC2* desc = reinterpret_cast<const DDSURFACEDESC2*>(&ddsData[seek]);
-        seek += sizeof(DDSURFACEDESC2);
-
-        mip = std::min((int)mip, (int)desc->dwMipMapCount);
-
-        DXTLevel dxtLevel = getDXTLevelFromDDS(ddsData);
-        int squishDxtLevel;
-        switch (dxtLevel)
-        {
-            case DXTLevel::DXT1:
-                squishDxtLevel = squish::kDxt1;
-                break;
-
-            case DXTLevel::DXT3:
-                squishDxtLevel = squish::kDxt3;
-                break;
-
-            case DXTLevel::DXT5:
-                squishDxtLevel = squish::kDxt5;
-                break;
-
-            case DXTLevel::Unknown:
-                assert(false);
-                return;
-        }
-
-        for (int i = 0; i < mip; i++)
-        {
-            seek += ComputeSizeInBytes(i, desc->dwWidth, desc->dwHeight, squishDxtLevel == squish::kDxt1);
-        }
-
-        int px = (int)std::max(1.0f, (float)floor(desc->dwWidth / pow(2.0f, mip)));
-        int py = (int)std::max(1.0f, (float)floor(desc->dwHeight / pow(2.0f, mip)));
-        rgba8Data.resize(px * py * sizeof(uint32_t));
-
-        squish::DecompressImage(rgba8Data.data(), px, py, &ddsData[seek], squishDxtLevel);
-    }
 }  // namespace ZenLoad
 /* THE END */

zenload/ztex2dds.cpp

@@ -11,11 +11,6 @@ namespace ZenLoad
 	*/
     int convertZTEX2DDS(const std::vector<uint8_t>& ztexData, std::vector<uint8_t>& ddsData, bool optionForceARGB = false, int* pOutWidth = nullptr, int* pOutHeight = nullptr);
 
-    /**
-	 * @brief Convert dds to RGBA8
-	 */
-    void convertDDSToRGBA8(const std::vector<uint8_t>& ddsData, std::vector<uint8_t>& rgba8Data, int mip = 0);
-
     /**
 	 * @return Total offset (including header) of where the given mip-level starts inside ddsData
 	 */