vtfpp: create VTF parser

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -51,7 +51,7 @@ jobs:
         shell: cmd
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "src/thirdparty/bufferstream"]
 	path = src/thirdparty/bufferstream
 	url = https://github.com/craftablescience/BufferStream
+[submodule "src/thirdparty/miniz"]
+	path = src/thirdparty/miniz
+	url = https://github.com/richgel999/miniz

CMakeLists.txt

@@ -1,23 +1,49 @@
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
 project(sourcepp)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
 # Options (General)
-option(SOURCEPP_USE_DMXPP         "Build dmxpp library"                ON)
-option(SOURCEPP_USE_FGDPP         "Build fgdpp library"                ON)
-option(SOURCEPP_USE_STUDIOMODELPP "Build studiomodelpp library"        ON)
-option(SOURCEPP_USE_VMFPP         "Build vmfpp library"                ON)
-option(SOURCEPP_BUILD_TESTS       "Build tests for enabled libraries" OFF)
+option(SOURCEPP_USE_DMXPP               "Build dmxpp library"                  ON)
+option(SOURCEPP_USE_FGDPP               "Build fgdpp library"                  ON)
+option(SOURCEPP_USE_STUDIOMODELPP       "Build studiomodelpp library"          ON)
+option(SOURCEPP_USE_VMFPP               "Build vmfpp library"                  ON)
+option(SOURCEPP_USE_VTFPP               "Build vtfpp library"                  ON)
+option(SOURCEPP_BUILD_TESTS             "Build tests for enabled libraries"   OFF)
+option(SOURCEPP_USE_STATIC_MSVC_RUNTIME "Link to static MSVC runtime library" OFF)
 
 
 # Options (Library)
 option(FGDPP_ENABLE_SPEN_FGD_SUPPORT "Enable support for FGD alterations (https://github.com/TeamSpen210/HammerAddons/wiki/Unified-FGD) made by TeamSpen's HammerAddons. Fully backwards compatible with Valve's FGD standard." OFF)
 
 
-# BufferStream
-add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/bufferstream")
+# Set defaults
+if(PROJECT_IS_TOP_LEVEL)
+    set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+
+if(SOURCEPP_USE_STATIC_MSVC_RUNTIME)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+endif()
+
+
+# bufferstream
+if(NOT TARGET bufferstream)
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/bufferstream")
+endif()
+
+
+# miniz
+if(SOURCEPP_USE_VTFPP AND NOT TARGET miniz)
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/miniz")
+endif()
+
+
+# stb_image
+if(SOURCEPP_USE_VTFPP)
+    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/stb_image")
+endif()
 
 
 # Shared code
@@ -108,6 +134,37 @@ if(SOURCEPP_USE_VMFPP)
 endif()
 
 
+# vtfpp
+if(SOURCEPP_USE_VTFPP)
+    add_pretty_parser(vtfpp SOURCES
+            "${CMAKE_CURRENT_SOURCE_DIR}/include/vtfpp/ImageConversion.h"
+            "${CMAKE_CURRENT_SOURCE_DIR}/include/vtfpp/ImageFormats.h"
+            "${CMAKE_CURRENT_SOURCE_DIR}/include/vtfpp/vtfpp.h"
+            "${CMAKE_CURRENT_SOURCE_DIR}/src/vtfpp/ImageConversion.cpp"
+            "${CMAKE_CURRENT_SOURCE_DIR}/src/vtfpp/vtfpp.cpp")
+    target_link_libraries(vtfpp PRIVATE miniz stb_image)
+
+    # Compressonator
+    if(MSVC)
+        if(SOURCEPP_USE_STATIC_MSVC_RUNTIME)
+            target_link_libraries(vtfpp PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/win64/Compressonator_MT$<$<CONFIG:Debug>:d>.lib")
+        else()
+            target_link_libraries(vtfpp PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/win64/Compressonator_MD$<$<CONFIG:Debug>:d>.lib")
+        endif()
+    elseif(UNIX)
+        target_link_libraries(vtfpp PRIVATE
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/linux64/libCMP_Compressonator.a"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/linux64/libCMP_Core.a"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/linux64/libCMP_Core_AVX.a"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/linux64/libCMP_Core_AVX512.a"
+                "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/lib/linux64/libCMP_Core_SSE.a")
+    else()
+        message(FATAL_ERROR "Unable to link to Compressonator library!")
+    endif()
+    target_include_directories(vtfpp PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/thirdparty/compressonator/include")
+endif()
+
+
 # Tests, part 2
 if(SOURCEPP_BUILD_TESTS)
     add_executable(${SOURCEPP_TEST_NAME} ${${SOURCEPP_TEST_NAME}_SOURCES})

README.md

@@ -8,7 +8,8 @@ Looking for more parsers in this vein? Try my other project which relies on this
 
 | Library Name  | Supports                                                                                                                                                                                                     | Read | Write | Author(s)                                                                                      |
 |---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:----:|:-----:|------------------------------------------------------------------------------------------------|
-| dmxpp         | [DMX](https://developer.valvesoftware.com/wiki/DMX) Binary v1-5                                                                                                                                              |  ✅   |   ❌   | [@craftablescience](https://github.com/craftablescience)                                       |
-| fgdpp         | &bull; [Valve FGD syntax](https://developer.valvesoftware.com/wiki/FGD)<br>&bull; [TeamSpen's Unified FGD syntax](https://github.com/TeamSpen210/HammerAddons/wiki/Unified-FGD)                              |  ✅   |   ❌   | [@Trico-Everfire](https://github.com/Trico-Everfire)                                           |
+| dmxpp         | &bull; [DMX](https://developer.valvesoftware.com/wiki/DMX) Binary v1-5                                                                                                                                       |  ✅   |   ❌   | [@craftablescience](https://github.com/craftablescience)                                       |
+| fgdpp         | &bull; [FGD](https://developer.valvesoftware.com/wiki/FGD)<br>&bull; [TeamSpen's Unified FGD](https://github.com/TeamSpen210/HammerAddons/wiki/Unified-FGD)                                                  |  ✅   |   ❌   | [@Trico-Everfire](https://github.com/Trico-Everfire)                                           |
 | studiomodelpp | &bull; [MDL](https://developer.valvesoftware.com/wiki/MDL_(Source)) v44-49<br>&bull; [VTX](https://developer.valvesoftware.com/wiki/VTX) v7<br>&bull; [VVD](https://developer.valvesoftware.com/wiki/VVD) v4 |  ✅   |   ❌   | [@craftablescience](https://github.com/craftablescience)                                       |
-| vmfpp         | Any [VMF](https://developer.valvesoftware.com/wiki/VMF_(Valve_Map_Format))                                                                                                                                   |  ✅   |   ❌   | [@Galaco](https://github.com/Galaco), [@craftablescience](https://github.com/craftablescience) |
+| vmfpp         | &bull; [VMF](https://developer.valvesoftware.com/wiki/VMF_(Valve_Map_Format))                                                                                                                                |  ✅   |   ❌   | [@Galaco](https://github.com/Galaco), [@craftablescience](https://github.com/craftablescience) |
+| vtfpp         | &bull; [VTF](https://developer.valvesoftware.com/wiki/VTF_(Valve_Texture_Format)) v7.0-7.6                                                                                                                   |  ✅   |   ❌   | [@craftablescience](https://github.com/craftablescience)                                       |

include/vtfpp/ImageConversion.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <cstddef>
+#include <span>
+#include <vector>
+
+#include "ImageFormats.h"
+
+namespace vtfpp::ImageConversion {
+
+[[nodiscard]] std::vector<std::byte> convertImageDataToFormat(std::span<const std::byte> imageData, ImageFormat oldFormat, ImageFormat newFormat, uint16_t width, uint16_t height);
+
+/// Converts image data to a PNG or HDR file. HDR output will be used for floating-point formats.
+[[nodiscard]] std::vector<std::byte> convertImageDataToFile(std::span<const std::byte> imageData, ImageFormat format, uint16_t width, uint16_t height);
+
+} // namespace vtfpp::ImageConversion