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

Don't cache nested geometries

Browse source
This commit is contained in:
Zach Pomerantz 2016-03-24 14:26:03 -07:00
parent 4d47126ae4
commit aa038bac58
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -67,7 +67,15 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
// Get the raw GeometryResource, not the wrapped NetworkGeometry // Get the raw GeometryResource, not the wrapped NetworkGeometry
_geometryResource = modelCache->getResource(url, QUrl(), true, &extra).staticCast<GeometryResource>(); _geometryResource = modelCache->getResource(url, QUrl(), true, &extra).staticCast<GeometryResource>();
connect(_geometryResource.data(), &Resource::finished, this, &GeometryMappingResource::onGeometryMappingLoaded);
if (_geometryResource->isLoaded()) {
onGeometryMappingLoaded(!_geometryResource->getURL().isEmpty());
} else {
connect(_geometryResource.data(), &Resource::finished, this, &GeometryMappingResource::onGeometryMappingLoaded);
}
// Avoid caching nested resources - their references will be held by the parent
_geometryResource->_isCacheable = false;
} }
} }
@ -290,7 +298,7 @@ NetworkGeometry::NetworkGeometry(const GeometryResource::Pointer& networkGeometr
connect(_resource.data(), &Resource::finished, this, &NetworkGeometry::resourceFinished); connect(_resource.data(), &Resource::finished, this, &NetworkGeometry::resourceFinished);
connect(_resource.data(), &Resource::onRefresh, this, &NetworkGeometry::resourceRefreshed); connect(_resource.data(), &Resource::onRefresh, this, &NetworkGeometry::resourceRefreshed);
if (_resource->isLoaded()) { if (_resource->isLoaded()) {
resourceFinished(true); resourceFinished(!_resource->getURL().isEmpty());
} }
} }

6
libraries/model-networking/src/model-networking/ModelCache.h
View file

@ -101,7 +101,11 @@ public:
virtual bool areTexturesLoaded() const { return isLoaded() && Geometry::areTexturesLoaded(); } virtual bool areTexturesLoaded() const { return isLoaded() && Geometry::areTexturesLoaded(); }
protected: protected:
virtual bool isCacheable() const override { return _loaded; } friend class GeometryMappingResource;
virtual bool isCacheable() const override { return _loaded && _isCacheable; }
bool _isCacheable { true };
}; };
class NetworkGeometry : public QObject { class NetworkGeometry : public QObject {