From d7cb479dbe21547c56eb5e4007ce496cb097c299 Mon Sep 17 00:00:00 2001 From: sam Date: Thu, 23 Feb 2017 02:17:18 -0800 Subject: [PATCH] clean the clean ups --- .../src/model-networking/TextureCache.cpp | 4 ---- libraries/model/src/model/TextureMap.cpp | 10 ++++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/model-networking/src/model-networking/TextureCache.cpp b/libraries/model-networking/src/model-networking/TextureCache.cpp index f4bb3707e8..1f21e9e78d 100644 --- a/libraries/model-networking/src/model-networking/TextureCache.cpp +++ b/libraries/model-networking/src/model-networking/TextureCache.cpp @@ -232,10 +232,6 @@ NetworkTexture::TextureLoaderFunc getTextureLoaderForType(NetworkTexture::Type t return model::TextureUsage::createMetallicTextureFromImage; break; } - case Type::OCCLUSION_TEXTURE: { - return model::TextureUsage::create2DTextureFromImage; - break; - } case Type::STRICT_TEXTURE: { return model::TextureUsage::createStrict2DTextureFromImage; break; diff --git a/libraries/model/src/model/TextureMap.cpp b/libraries/model/src/model/TextureMap.cpp index c2bca9d1be..a3bd5fc7c1 100755 --- a/libraries/model/src/model/TextureMap.cpp +++ b/libraries/model/src/model/TextureMap.cpp @@ -132,6 +132,8 @@ gpu::Texture* cacheTexture(const std::string& name, gpu::Texture* srcTexture, bo } if (read && QFileInfo(cacheFilename.c_str()).exists()) { +#define DEBUG_KTX_LOADING 1 +#ifdef DEBUG_KTX_LOADING { FILE* file = fopen(cacheFilename.c_str(), "rb"); if (file != nullptr) { @@ -154,10 +156,10 @@ gpu::Texture* cacheTexture(const std::string& name, gpu::Texture* srcTexture, bo } } } - - // auto ktxFile = ktx::KTX::create(std::unique_ptr(new storage::FileStorage(cacheFilename.c_str()))); - // returnedTexture->setKtxBacking(ktxFile); - +#else + auto ktxFile = ktx::KTX::create(std::unique_ptr(new storage::FileStorage(cacheFilename.c_str()))); + returnedTexture->setKtxBacking(ktxFile); +#endif } }