sourcepp 2025.2.12.dev1__tar.gz → 2025.2.16.dev1__tar.gz

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/CMakeLists.txt

@@ -30,7 +30,7 @@ endif()
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 set(SOURCEPP_BUILD_PYTHON_WRAPPERS ON CACHE INTERNAL "" FORCE)
-set(SOURCEPP_VERSION "2025.2.12dev1")
+set(SOURCEPP_VERSION "2025.2.16dev1")
 
 # As weird as this looks, this is necessary for sdist wheel
 set(SOURCEPP_PYTHON_IS_SUBDIR OFF)
@@ -41,6 +41,6 @@ else()
     FetchContent_Declare(
             sourcepp
             GIT_REPOSITORY "https://github.com/craftablescience/sourcepp.git"
-            GIT_TAG "109a8cd7348af99447f9675c340df66cae2bf1b5")
+            GIT_TAG "c05d8a47b06affa5b60d35332bb0ce3c10ca744f")
     FetchContent_MakeAvailable(sourcepp)
 endif()

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sourcepp
-Version: 2025.2.12.dev1
+Version: 2025.2.16.dev1
 Summary: Several modern C++20 libraries for sanely parsing Valve formats.
 Home-page: https://github.com/craftablescience/sourcepp
 Author-Email: craftablescience <lauralewisdev@gmail.com>
@@ -180,17 +180,11 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
-    <td rowspan="29"><code>vpkpp</code></td>
+    <td rowspan="23"><code>vpkpp</code></td>
     <td>007 v1.1, v1.3 (007 - Nightfire)</td>
     <td align="center">✅</td>
     <td align="center">❌</td>
-    <td rowspan="29" align="center">C<br>C#</td>
-  </tr>
-  <tr><!-- empty row to disable github striped bg color --></tr>
-  <tr>
-    <td><a href="https://developer.valvesoftware.com/wiki/Bonus_Maps">BMZ</a></td>
-    <td align="center">✅</td>
-    <td align="center">✅</td>
+    <td rowspan="23" align="center">C<br>C#</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
@@ -238,18 +232,6 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
     <td align="center">✅</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
-  <tr>
-    <td><a href="https://doomwiki.org/wiki/PK3">PK3</a> (Quake III)</td>
-    <td align="center">✅</td>
-    <td align="center">✅</td>
-  </tr>
-  <tr><!-- empty row to disable github striped bg color --></tr>
-  <tr>
-    <td><a href="https://doomwiki.org/wiki/PK4">PK4</a> (Quake IV, Doom 3)</td>
-    <td align="center">✅</td>
-    <td align="center">✅</td>
-  </tr>
-  <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
     <td>
       <a href="https://developer.valvesoftware.com/wiki/VPK">VPK</a> pre-v1, v1-2, v54
@@ -273,17 +255,25 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
-    <td>ZIP</td>
+    <td>
+      ZIP, and some of its aliases:
+      <br> &bull; <a href="https://github.com/BEEmod/BEE2-items">BEE_PACK</a> (BEE2.4 Package)
+      <br> &bull; <a href="https://developer.valvesoftware.com/wiki/Bonus_Maps">BMZ</a> (Source 1 Bonus Maps)
+      <br> &bull; FPK (Tactical Intervention)
+      <br> &bull; <a href="https://doomwiki.org/wiki/PK3">PK3</a> (Quake III)
+      <br> &bull; <a href="https://doomwiki.org/wiki/PK4">PK4</a> (Quake IV, Doom 3)
+      <br> &bull; PKZ (Quake II RTX)
+    </td>
     <td align="center">✅</td>
     <td align="center">✅</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
-    <td rowspan="29"><code>vtfpp</code></td>
+    <td rowspan="31"><code>vtfpp</code></td>
     <td><a href="https://wiki.mozilla.org/APNG_Specification">APNG</a></td>
     <td align="center">✅</td>
     <td align="center">❌</td>
-    <td rowspan="29" align="center">Python</td>
+    <td rowspan="31" align="center">Python</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
@@ -358,6 +348,12 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
     <td align="center">✅</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
+  <tr>
+    <td>TTX (TTH, TTZ) v1.0</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+  </tr>
+  <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
     <td>
       <a href="https://developer.valvesoftware.com/wiki/VTF_(Valve_Texture_Format)">VTF</a> v7.0-7.6

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/README.md

@@ -157,17 +157,11 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
-    <td rowspan="29"><code>vpkpp</code></td>
+    <td rowspan="23"><code>vpkpp</code></td>
     <td>007 v1.1, v1.3 (007 - Nightfire)</td>
     <td align="center">✅</td>
     <td align="center">❌</td>
-    <td rowspan="29" align="center">C<br>C#</td>
-  </tr>
-  <tr><!-- empty row to disable github striped bg color --></tr>
-  <tr>
-    <td><a href="https://developer.valvesoftware.com/wiki/Bonus_Maps">BMZ</a></td>
-    <td align="center">✅</td>
-    <td align="center">✅</td>
+    <td rowspan="23" align="center">C<br>C#</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
@@ -215,18 +209,6 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
     <td align="center">✅</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
-  <tr>
-    <td><a href="https://doomwiki.org/wiki/PK3">PK3</a> (Quake III)</td>
-    <td align="center">✅</td>
-    <td align="center">✅</td>
-  </tr>
-  <tr><!-- empty row to disable github striped bg color --></tr>
-  <tr>
-    <td><a href="https://doomwiki.org/wiki/PK4">PK4</a> (Quake IV, Doom 3)</td>
-    <td align="center">✅</td>
-    <td align="center">✅</td>
-  </tr>
-  <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
     <td>
       <a href="https://developer.valvesoftware.com/wiki/VPK">VPK</a> pre-v1, v1-2, v54
@@ -250,17 +232,25 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
-    <td>ZIP</td>
+    <td>
+      ZIP, and some of its aliases:
+      <br> &bull; <a href="https://github.com/BEEmod/BEE2-items">BEE_PACK</a> (BEE2.4 Package)
+      <br> &bull; <a href="https://developer.valvesoftware.com/wiki/Bonus_Maps">BMZ</a> (Source 1 Bonus Maps)
+      <br> &bull; FPK (Tactical Intervention)
+      <br> &bull; <a href="https://doomwiki.org/wiki/PK3">PK3</a> (Quake III)
+      <br> &bull; <a href="https://doomwiki.org/wiki/PK4">PK4</a> (Quake IV, Doom 3)
+      <br> &bull; PKZ (Quake II RTX)
+    </td>
     <td align="center">✅</td>
     <td align="center">✅</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
-    <td rowspan="29"><code>vtfpp</code></td>
+    <td rowspan="31"><code>vtfpp</code></td>
     <td><a href="https://wiki.mozilla.org/APNG_Specification">APNG</a></td>
     <td align="center">✅</td>
     <td align="center">❌</td>
-    <td rowspan="29" align="center">Python</td>
+    <td rowspan="31" align="center">Python</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
@@ -335,6 +325,12 @@ Several modern C++20 libraries for sanely parsing Valve formats, rolled into one
     <td align="center">✅</td>
   </tr>
   <tr><!-- empty row to disable github striped bg color --></tr>
+  <tr>
+    <td>TTX (TTH, TTZ) v1.0</td>
+    <td align="center">✅</td>
+    <td align="center">✅</td>
+  </tr>
+  <tr><!-- empty row to disable github striped bg color --></tr>
   <tr>
     <td>
       <a href="https://developer.valvesoftware.com/wiki/VTF_(Valve_Texture_Format)">VTF</a> v7.0-7.6

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "sourcepp"
-version = "2025.2.12dev1"
+version = "2025.2.16dev1"
 authors = [{ name = "craftablescience", email = "lauralewisdev@gmail.com" }]
 maintainers = [{ name = "craftablescience", email = "lauralewisdev@gmail.com" }]
 description = "Several modern C++20 libraries for sanely parsing Valve formats."

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/src/sourcepp/__init__.py

@@ -1,5 +1,5 @@
 from ._sourcepp_impl import __doc__, bsppp, gamepp, sourcepp, steampp, toolpp, vcryptpp, vtfpp
 
 __author__ = "craftablescience"
-__version__ = "2025.2.12dev1"
+__version__ = "2025.2.16dev1"
 __all__ = ['__author__', '__doc__', '__version__', 'bsppp', 'gamepp', 'sourcepp', 'steampp', 'toolpp', 'vcryptpp', 'vtfpp']

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/src/vcryptpp.h

@@ -17,7 +17,7 @@ inline void register_python(py::module_& m) {
 		auto VFONT = vcryptpp.def_submodule("VFONT");
 		using namespace VFONT;
 
-		VFONT.attr("IDENTIFIER") = IDENTIFIER;
+		VFONT.attr("SIGNATURE") = SIGNATURE;
 
 		VFONT.attr("MAGIC") = MAGIC;
 

{sourcepp-2025.2.12.dev1 → sourcepp-2025.2.16.dev1}/src/vtfpp.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <tuple>
-
 #include <nanobind/nanobind.h>
 #include <nanobind/stl/array.h>
 #include <nanobind/stl/pair.h>
@@ -291,6 +289,33 @@ void register_python(py::module_& m) {
 		})
 		.def("bake_to_file", py::overload_cast<const std::string&>(&SHT::bake, py::const_), py::arg("sht_path"));
 
+	vtfpp.attr("TTH_SIGNATURE") = TTH_SIGNATURE;
+
+	auto cVTF = py::class_<VTF>(vtfpp, "VTF");
+
+	py::class_<TTX>(vtfpp, "TTX")
+		.def(py::init<VTF&&>(), py::arg("vtf"))
+		.def("__init__", [](TTX* self, const py::bytes& tthData, const py::bytes& ttzData) {
+			return new(self) TTX{{reinterpret_cast<const std::byte*>(tthData.data()), tthData.size()}, {reinterpret_cast<const std::byte*>(ttzData.data()), ttzData.size()}};
+		}, py::arg("tth_data"), py::arg("ttz_data"))
+		.def(py::init<const std::string&, const std::string&>(), py::arg("tth_path"), py::arg("ttz_path"))
+		.def("__bool__", &TTX::operator bool, py::is_operator())
+		.def_prop_rw("version_major", &TTX::getMajorVersion, &TTX::setMajorVersion)
+		.def_prop_rw("version_minor", &TTX::getMinorVersion, &TTX::setMinorVersion)
+		.def_prop_rw("aspect_ratio_type", &TTX::getAspectRatioType, &TTX::setAspectRatioType)
+		.def_prop_rw("mip_flags", py::overload_cast<>(&TTX::getMipFlags, py::const_), [](TTX& self, const std::vector<uint64_t>& mipFlags) {
+			self.getMipFlags() = mipFlags;
+		}, py::rv_policy::reference_internal)
+		.def_prop_rw("vtf", py::overload_cast<>(&TTX::getVTF, py::const_), [](TTX& self, const VTF& vtf) {
+			self.getVTF() = vtf;
+		}, py::rv_policy::reference_internal)
+		.def_prop_rw("compression_level", &TTX::getCompressionLevel, &TTX::setCompressionLevel)
+		.def("bake", [](const TTX& self) -> std::pair<py::bytes, py::bytes> {
+			const auto d = self.bake();
+			return {py::bytes{d.first.data(), d.first.size()}, py::bytes{d.second.data(), d.second.size()}};
+		})
+		.def("bake_to_file", py::overload_cast<const std::string&, const std::string&>(&TTX::bake, py::const_), py::arg("tth_path"), py::arg("ttz_path"));
+
 	vtfpp.attr("VTF_SIGNATURE") = VTF_SIGNATURE;
 
 	py::enum_<CompressionMethod>(vtfpp, "CompressionMethod", py::is_arithmetic())
@@ -330,43 +355,40 @@ void register_python(py::module_& m) {
 		.def("get_data_as_aux_compression_method", &Resource::getDataAsAuxCompressionMethod)
 		.def("get_data_as_aux_compression_length", &Resource::getDataAsAuxCompressionLength, py::arg("mip"), py::arg("mip_count"), py::arg("frame"), py::arg("frame_count"), py::arg("face"), py::arg("face_count"));
 
-	auto cVTF = py::class_<VTF>(vtfpp, "VTF");
-
 	py::enum_<VTF::Flags>(cVTF, "Flags", py::is_flag())
-		.value("NONE",                                    VTF::FLAG_NONE)
-		.value("POINT_SAMPLE",                            VTF::FLAG_POINT_SAMPLE)
-		.value("TRILINEAR",                               VTF::FLAG_TRILINEAR)
-		.value("CLAMP_S",                                 VTF::FLAG_CLAMP_S)
-		.value("CLAMP_T",                                 VTF::FLAG_CLAMP_T)
-		.value("ANISOTROPIC",                             VTF::FLAG_ANISOTROPIC)
-		.value("HINT_DXT5",                               VTF::FLAG_HINT_DXT5)
-		.value("SRGB",                                    VTF::FLAG_SRGB)
-		.value("NO_COMPRESS",                             VTF::FLAG_NO_COMPRESS)
-		.value("NORMAL",                                  VTF::FLAG_NORMAL)
-		.value("NO_MIP",                                  VTF::FLAG_NO_MIP)
-		.value("NO_LOD",                                  VTF::FLAG_NO_LOD)
-		.value("LOAD_LOWEST_MIPS",                        VTF::FLAG_LOAD_LOWEST_MIPS)
-		.value("PROCEDURAL",                              VTF::FLAG_PROCEDURAL)
-		.value("ONE_BIT_ALPHA",                           VTF::FLAG_ONE_BIT_ALPHA)
-		.value("MULTI_BIT_ALPHA",                         VTF::FLAG_MULTI_BIT_ALPHA)
-		.value("ENVMAP",                                  VTF::FLAG_ENVMAP)
-		.value("RENDERTARGET",                            VTF::FLAG_RENDERTARGET)
-		.value("DEPTH_RENDERTARGET",                      VTF::FLAG_DEPTH_RENDERTARGET)
-		.value("NO_DEBUG_OVERRIDE",                       VTF::FLAG_NO_DEBUG_OVERRIDE)
-		.value("SINGLE_COPY",                             VTF::FLAG_SINGLE_COPY)
-		.value("ONE_OVER_MIP_LEVEL_IN_ALPHA",             VTF::FLAG_ONE_OVER_MIP_LEVEL_IN_ALPHA)
-		.value("PREMULTIPLY_COLOR_BY_ONE_OVER_MIP_LEVEL", VTF::FLAG_PREMULTIPLY_COLOR_BY_ONE_OVER_MIP_LEVEL)
-		.value("NORMAL_TO_DUDV",                          VTF::FLAG_NORMAL_TO_DUDV)
-		.value("ALPHA_TEST_MIP_GENERATION",               VTF::FLAG_ALPHA_TEST_MIP_GENERATION)
-		.value("NO_DEPTH_BUFFER",                         VTF::FLAG_NO_DEPTH_BUFFER)
-		.value("NICE_FILTERED",                           VTF::FLAG_NICE_FILTERED)
-		.value("CLAMP_U",                                 VTF::FLAG_CLAMP_U)
-		.value("VERTEX_TEXTURE",                          VTF::FLAG_VERTEX_TEXTURE)
-		.value("SSBUMP",                                  VTF::FLAG_SSBUMP)
-		.value("UNFILTERABLE_OK",                         VTF::FLAG_UNFILTERABLE_OK)
-		.value("BORDER",                                  VTF::FLAG_BORDER)
-		.value("SPECVAR_RED",                             VTF::FLAG_SPECVAR_RED)
-		.value("SPECVAR_ALPHA",                           VTF::FLAG_SPECVAR_ALPHA)
+		.value("NONE",                       VTF::FLAG_NONE)
+		.value("POINT_SAMPLE",               VTF::FLAG_POINT_SAMPLE)
+		.value("TRILINEAR",                  VTF::FLAG_TRILINEAR)
+		.value("CLAMP_S",                    VTF::FLAG_CLAMP_S)
+		.value("CLAMP_T",                    VTF::FLAG_CLAMP_T)
+		.value("ANISOTROPIC",                VTF::FLAG_ANISOTROPIC)
+		.value("HINT_DXT5",                  VTF::FLAG_HINT_DXT5)
+		.value("PWL_CORRECTED",              VTF::FLAG_PWL_CORRECTED)
+		.value("NORMAL",                     VTF::FLAG_NORMAL)
+		.value("NO_MIP",                     VTF::FLAG_NO_MIP)
+		.value("NO_LOD",                     VTF::FLAG_NO_LOD)
+		.value("LOAD_ALL_MIPS",              VTF::FLAG_LOAD_ALL_MIPS)
+		.value("PROCEDURAL",                 VTF::FLAG_PROCEDURAL)
+		.value("ONE_BIT_ALPHA",              VTF::FLAG_ONE_BIT_ALPHA)
+		.value("MULTI_BIT_ALPHA",            VTF::FLAG_MULTI_BIT_ALPHA)
+		.value("ENVMAP",                     VTF::FLAG_ENVMAP)
+		.value("RENDERTARGET",               VTF::FLAG_RENDERTARGET)
+		.value("DEPTH_RENDERTARGET",         VTF::FLAG_DEPTH_RENDERTARGET)
+		.value("NO_DEBUG_OVERRIDE",          VTF::FLAG_NO_DEBUG_OVERRIDE)
+		.value("SINGLE_COPY",                VTF::FLAG_SINGLE_COPY)
+		.value("SRGB",                       VTF::FLAG_SRGB)
+		.value("DEFAULT_POOL",               VTF::FLAG_DEFAULT_POOL)
+		.value("COMBINED",                   VTF::FLAG_COMBINED)
+		.value("ASYNC_DOWNLOAD",             VTF::FLAG_ASYNC_DOWNLOAD)
+		.value("NO_DEPTH_BUFFER",            VTF::FLAG_NO_DEPTH_BUFFER)
+		.value("SKIP_INITIAL_DOWNLOAD",      VTF::FLAG_SKIP_INITIAL_DOWNLOAD)
+		.value("CLAMP_U",                    VTF::FLAG_CLAMP_U)
+		.value("VERTEX_TEXTURE",             VTF::FLAG_VERTEX_TEXTURE)
+		.value("SSBUMP",                     VTF::FLAG_SSBUMP)
+		.value("LOAD_MOST_MIPS",             VTF::FLAG_LOAD_MOST_MIPS)
+		.value("BORDER",                     VTF::FLAG_BORDER)
+		.value("YCOCG",                      VTF::FLAG_YCOCG)
+		.value("ASYNC_SKIP_INITIAL_LOW_RES", VTF::FLAG_ASYNC_SKIP_INITIAL_LOW_RES)
 		.export_values();
 
 	py::enum_<VTF::Platform>(cVTF, "Platform")
@@ -398,9 +420,11 @@ void register_python(py::module_& m) {
 		.def_rw("bumpmap_scale",        &VTF::CreationOptions::bumpMapScale);
 
 	cVTF
-		.def_ro_static("FLAG_MASK_GENERATED", &VTF::FLAG_MASK_GENERATED)
-		.def_ro_static("FORMAT_UNCHANGED",    &VTF::FORMAT_UNCHANGED)
-		.def_ro_static("FORMAT_DEFAULT",      &VTF::FORMAT_DEFAULT)
+		.def_ro_static("FLAG_MASK_AFTER_V7_3", &VTF::FLAG_MASK_AFTER_V7_3)
+		.def_ro_static("FLAG_MASK_GENERATED",  &VTF::FLAG_MASK_GENERATED)
+		.def_ro_static("FLAG_MASK_SRGB",       &VTF::FLAG_MASK_SRGB)
+		.def_ro_static("FORMAT_UNCHANGED",     &VTF::FORMAT_UNCHANGED)
+		.def_ro_static("FORMAT_DEFAULT",       &VTF::FORMAT_DEFAULT)
 		.def(py::init<>())
 		.def("__init__", [](VTF* self, const py::bytes& vtfData, bool parseHeaderOnly = false) {
 			return new(self) VTF{std::span{reinterpret_cast<const std::byte*>(vtfData.data()), vtfData.size()}, parseHeaderOnly};
@@ -469,7 +493,7 @@ void register_python(py::module_& m) {
 		.def("remove_particle_sheet_resource", &VTF::removeParticleSheetResource)
 		.def("set_crc_resource", &VTF::setCRCResource, py::arg("value"))
 		.def("remove_crc_resource", &VTF::removeCRCResource)
-		.def("set_lod_resource", &VTF::setLODResource, py::arg("u"), py::arg("v"))
+		.def("set_lod_resource", &VTF::setLODResource, py::arg("u"), py::arg("v"), py::arg("u360") = 0, py::arg("v360") = 0)
 		.def("remove_lod_resource", &VTF::removeLODResource)
 		.def("set_extended_flags_resource", &VTF::setExtendedFlagsResource, py::arg("value"))
 		.def("remove_extended_flags_resource", &VTF::removeExtendedFlagsResource)