Merge pull request #7 from TAServers/expose-flags

Expose VTF texture flags
TAServers · Nov 10, 2024 · 1b598c1 · 1b598c1
2 parents d68e57f + f9a6541
commit 1b598c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/vtf.cpp b/src/vtf.cpp
@@ -101,9 +101,9 @@ namespace VtfParser {
       size_t size = 0;
       for (uint8_t mipLevel = 0; mipLevel < sizeInfo.mipLevels; mipLevel++) {
         ImageSizeInfo mipSizeInfo = sizeInfo;
-        mipSizeInfo.width = std::max(sizeInfo.width >> mipLevel, 1ull);
-        mipSizeInfo.height = std::max(sizeInfo.height >> mipLevel, 1ull);
-        mipSizeInfo.depth = std::max(sizeInfo.depth >> mipLevel, 1ull);
+        mipSizeInfo.width = std::max<size_t>(sizeInfo.width >> mipLevel, 1ul);
+        mipSizeInfo.height = std::max<size_t>(sizeInfo.height >> mipLevel, 1ul);
+        mipSizeInfo.depth = std::max<size_t>(sizeInfo.depth >> mipLevel, 1ul);
         size += getMipSizeBytes(mipSizeInfo);
       }
 
@@ -205,6 +205,10 @@ namespace VtfParser {
     return header.firstFrame;
   }
 
+  TextureFlags Vtf::getFlags() const {
+    return header.flags;
+  }
+
   std::span<const std::byte> Vtf::getHighResImageData() const {
     return highResImageData;
   }

diff --git a/src/vtf.hpp b/src/vtf.hpp
@@ -86,6 +86,12 @@ namespace VtfParser {
      */
     [[nodiscard]] uint16_t getFirstFrame() const;
 
+    /**
+     * Gets the flags set on the texture.
+     * @return TextureFlags packed together as a bitflag.
+     */
+    [[nodiscard]] TextureFlags getFlags() const;
+
     /**
      * Gets the high resolution image data.
      * @return View over the high-res data.