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

Merge pull request #4821 from sethalves/fix-http-cache

Browse source 
Fix http cache
This commit is contained in:
Clément Brisset 2015-05-11 18:19:00 +02:00
commit d2046c0685
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/gpu/src/gpu/Texture.h
View file

@ -56,12 +56,12 @@ public:
glm::vec4 _borderColor{ 1.0f }; glm::vec4 _borderColor{ 1.0f };
uint32 _maxAnisotropy = 16; uint32 _maxAnisotropy = 16;
uint8 _filter = FILTER_MIN_MAG_POINT;
uint8 _comparisonFunc = ALWAYS;
uint8 _wrapModeU = WRAP_REPEAT; uint8 _wrapModeU = WRAP_REPEAT;
uint8 _wrapModeV = WRAP_REPEAT; uint8 _wrapModeV = WRAP_REPEAT;
uint8 _wrapModeW = WRAP_REPEAT; uint8 _wrapModeW = WRAP_REPEAT;
uint8 _filter = FILTER_MIN_MAG_POINT;
uint8 _comparisonFunc = ALWAYS;
uint8 _mipOffset = 0; uint8 _mipOffset = 0;
uint8 _minMip = 0; uint8 _minMip = 0;

3
libraries/networking/src/ResourceCache.cpp
View file

@ -241,7 +241,7 @@ float Resource::getLoadPriority() {
} }
void Resource::refresh() { void Resource::refresh() {
if (_reply == nullptr && !(_loaded || _failedToLoad)) { if (_reply && !(_loaded || _failedToLoad)) {
return; return;
} }
if (_reply) { if (_reply) {
@ -351,6 +351,7 @@ void Resource::maybeRefresh() {
QDateTime lastModifiedOld = metaData.lastModified(); QDateTime lastModifiedOld = metaData.lastModified();
if (lastModified.isValid() && lastModifiedOld.isValid() && if (lastModified.isValid() && lastModifiedOld.isValid() &&
lastModifiedOld == lastModified) { lastModifiedOld == lastModified) {
qCDebug(networking) << "Using cached version of" << _url.fileName();
// We don't need to update, return // We don't need to update, return
return; return;
} }