Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:36:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix ktx file location, unique->shared pointer

Browse source
This commit is contained in:
Brad Davis 2017-02-23 10:26:59 -08:00
parent f32817beac
commit a168bbf2dd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/model/src/model/TextureMap.cpp
View file

@ -96,7 +96,7 @@ gpu::Texture* cacheTexture(const std::string& name, gpu::Texture* srcTexture, bo
// Prepare cache directory // Prepare cache directory
static const QString HIFI_KTX_FOLDER("hifi_ktx"); static const QString HIFI_KTX_FOLDER("hifi_ktx");
QString docsLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); QString docsLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
ktxCacheFolder = docsLocation + "/" + HIFI_KTX_FOLDER; ktxCacheFolder = docsLocation + "/" + HIFI_KTX_FOLDER + "/";
QFileInfo info(ktxCacheFolder); QFileInfo info(ktxCacheFolder);
if (!info.exists()) { if (!info.exists()) {
QDir(docsLocation).mkpath(HIFI_KTX_FOLDER); QDir(docsLocation).mkpath(HIFI_KTX_FOLDER);
@ -132,8 +132,8 @@ gpu::Texture* cacheTexture(const std::string& name, gpu::Texture* srcTexture, bo
} }
if (read && QFileInfo(cacheFilename.c_str()).exists()) { if (read && QFileInfo(cacheFilename.c_str()).exists()) {
#define DEBUG_KTX_LOADING 1 #define DEBUG_KTX_LOADING 0
#ifdef DEBUG_KTX_LOADING #if DEBUG_KTX_LOADING
{ {
FILE* file = fopen(cacheFilename.c_str(), "rb"); FILE* file = fopen(cacheFilename.c_str(), "rb");
if (file != nullptr) { if (file != nullptr) {
@ -157,12 +157,12 @@ gpu::Texture* cacheTexture(const std::string& name, gpu::Texture* srcTexture, bo
} }
} }
#else #else
auto ktxFile = ktx::KTX::create(std::unique_ptr<storage::Storage>(new storage::FileStorage(cacheFilename.c_str()))); ktx::StoragePointer storage = std::make_shared<storage::FileStorage>(cacheFilename.c_str());
auto ktxFile = ktx::KTX::create(storage);
returnedTexture->setKtxBacking(ktxFile); returnedTexture->setKtxBacking(ktxFile);
#endif #endif
} }
} }
return returnedTexture; return returnedTexture;
} }