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

Keep normal and dilatable textures in separate maps to fix crash on manly

Browse source 
"man" model.
This commit is contained in:
Andrzej Kapolka 2013-10-15 16:40:35 -07:00
parent 8631cc3264
commit 6a265eacf2
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
interface/src/renderer/TextureCache.cpp
View file

@ -107,10 +107,19 @@ GLuint TextureCache::getFileTextureID(const QString& filename) {
} }
QSharedPointer<NetworkTexture> TextureCache::getTexture(const QUrl& url, bool dilatable) { QSharedPointer<NetworkTexture> TextureCache::getTexture(const QUrl& url, bool dilatable) {
QSharedPointer<NetworkTexture> texture = _networkTextures.value(url); QSharedPointer<NetworkTexture> texture;
if (texture.isNull()) { if (dilatable) {
texture = QSharedPointer<NetworkTexture>(dilatable ? new DilatableNetworkTexture(url) : new NetworkTexture(url)); texture = _dilatableNetworkTextures.value(url);
_networkTextures.insert(url, texture); if (texture.isNull()) {
texture = QSharedPointer<NetworkTexture>(new DilatableNetworkTexture(url));
_dilatableNetworkTextures.insert(url, texture);
}
} else {
texture = _networkTextures.value(url);
if (texture.isNull()) {
texture = QSharedPointer<NetworkTexture>(new NetworkTexture(url));
_networkTextures.insert(url, texture);
}
} }
return texture; return texture;
} }

3
interface/src/renderer/TextureCache.h
View file

@ -73,7 +73,8 @@ private:
QHash<QString, GLuint> _fileTextureIDs; QHash<QString, GLuint> _fileTextureIDs;
QHash<QUrl, QWeakPointer<NetworkTexture> > _networkTextures; QHash<QUrl, QWeakPointer<NetworkTexture> > _networkTextures;
QHash<QUrl, QWeakPointer<NetworkTexture> > _dilatableNetworkTextures;
GLuint _primaryDepthTextureID; GLuint _primaryDepthTextureID;
QOpenGLFramebufferObject* _primaryFramebufferObject; QOpenGLFramebufferObject* _primaryFramebufferObject;
QOpenGLFramebufferObject* _secondaryFramebufferObject; QOpenGLFramebufferObject* _secondaryFramebufferObject;