From 49620655fd14fe4dfc9e1270b766db64329168d7 Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Wed, 19 Oct 2022 22:34:48 -0700 Subject: [PATCH] KRTexture::getFaceCount() is now const Implemented KRTextureKTX::getFaceCount() Implemented KRTextureCube::getFaceCount() --- kraken/KRTexture.h | 1 + kraken/KRTextureCube.cpp | 5 +++++ kraken/KRTextureCube.h | 2 +- kraken/KRTextureKTX.cpp | 4 ++++ kraken/KRTextureKTX.h | 1 + kraken/KRTextureKTX2.cpp | 2 +- kraken/KRTextureKTX2.h | 2 +- 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/kraken/KRTexture.h b/kraken/KRTexture.h index 1eec4a5..550a767 100755 --- a/kraken/KRTexture.h +++ b/kraken/KRTexture.h @@ -83,6 +83,7 @@ public: int getMaxMipMap(); int getMinMipMap(); bool hasMipmaps(); + virtual int getFaceCount() const; kraken_stream_level getStreamLevel(KRTexture::texture_usage_t textureUsage); float getLastFrameLodCoverage() const; diff --git a/kraken/KRTextureCube.cpp b/kraken/KRTextureCube.cpp index dd5a902..a88a525 100755 --- a/kraken/KRTextureCube.cpp +++ b/kraken/KRTextureCube.cpp @@ -167,3 +167,8 @@ bool KRTextureCube::save(KRDataBlock& data) { return true; // Cube maps are just references; there are no files to output } + +int KRTextureCube::getFaceCount() const +{ + return 6; +} diff --git a/kraken/KRTextureCube.h b/kraken/KRTextureCube.h index af64aab..76fb302 100755 --- a/kraken/KRTextureCube.h +++ b/kraken/KRTextureCube.h @@ -46,7 +46,7 @@ public: virtual long getMemRequiredForSize(int max_dim); virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage); - virtual int getFaceCount() override; + virtual int getFaceCount() const override; private: bool createGPUTexture(int lod_max_dim) override; diff --git a/kraken/KRTextureKTX.cpp b/kraken/KRTextureKTX.cpp index f4e3a89..a452602 100755 --- a/kraken/KRTextureKTX.cpp +++ b/kraken/KRTextureKTX.cpp @@ -130,6 +130,10 @@ Vector2i KRTextureKTX::getDimensions() const return Vector2i::Create(Vector2i::Create(m_header.pixelWidth, m_header.pixelHeight)); } +int KRTextureKTX::getFaceCount() const +{ + return m_header.numberOfFaces; +} long KRTextureKTX::getMemRequiredForSize(int max_dim) { int target_dim = max_dim; diff --git a/kraken/KRTextureKTX.h b/kraken/KRTextureKTX.h index a7243c7..a886a2f 100755 --- a/kraken/KRTextureKTX.h +++ b/kraken/KRTextureKTX.h @@ -45,6 +45,7 @@ public: virtual long getMemRequiredForSize(int max_dim); virtual Vector2i getDimensions() const override; + virtual int getFaceCount() const override; protected: diff --git a/kraken/KRTextureKTX2.cpp b/kraken/KRTextureKTX2.cpp index 47c27ed..cc8066f 100644 --- a/kraken/KRTextureKTX2.cpp +++ b/kraken/KRTextureKTX2.cpp @@ -180,7 +180,7 @@ std::string KRTextureKTX2::getExtension() } -int KRTextureKTX2::getFaceCount() +int KRTextureKTX2::getFaceCount() const { return m_header.faceCount; } diff --git a/kraken/KRTextureKTX2.h b/kraken/KRTextureKTX2.h index 4baba4b..13264af 100644 --- a/kraken/KRTextureKTX2.h +++ b/kraken/KRTextureKTX2.h @@ -44,7 +44,7 @@ public: virtual long getMemRequiredForSize(int max_dim); virtual Vector2i getDimensions() const override; - virtual int getFaceCount() override; + virtual int getFaceCount() const override; protected: