Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 18:42:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clean the clean ups

Browse source
This commit is contained in:
sam 2017-02-23 02:17:18 -08:00
parent fbb0a24c4f
commit d7cb479dbe
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/model-networking/src/model-networking/TextureCache.cpp
View file

@ -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;

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

@ -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<storage::Storage>(new storage::FileStorage(cacheFilename.c_str())));
// returnedTexture->setKtxBacking(ktxFile);
#else
auto ktxFile = ktx::KTX::create(std::unique_ptr<storage::Storage>(new storage::FileStorage(cacheFilename.c_str())));
returnedTexture->setKtxBacking(ktxFile);
#endif
}
}