Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Patch interface redirect code

Browse source
This commit is contained in:
Atlante45 2019-04-12 15:49:34 -07:00 committed by Clement
parent b1f00d6f22
commit 3605b3d560
3 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -218,7 +218,7 @@ GeometryResource::GeometryResource(const GeometryResource& other) :
} }
void GeometryResource::downloadFinished(const QByteArray& data) { void GeometryResource::downloadFinished(const QByteArray& data) {
if (_activeUrl.fileName().toLower().endsWith(".fst")) { if (_effectiveBaseURL.fileName().toLower().endsWith(".fst")) {
PROFILE_ASYNC_BEGIN(resource_parse_geometry, "GeometryResource::downloadFinished", _url.toString(), { { "url", _url.toString() } }); PROFILE_ASYNC_BEGIN(resource_parse_geometry, "GeometryResource::downloadFinished", _url.toString(), { { "url", _url.toString() } });
// store parsed contents of FST file // store parsed contents of FST file
@ -291,19 +291,6 @@ void GeometryResource::downloadFinished(const QByteArray& data) {
} }
} }
bool GeometryResource::handleFailedRequest(ResourceRequest::Result result) {
if (_shouldFailOnRedirect && result == ResourceRequest::Result::RedirectFail) {
auto newPath = _request->getRelativePathUrl();
if (newPath.fileName().toLower().endsWith(".fst")) {
_activeUrl = newPath;
_shouldFailOnRedirect = false;
makeRequest();
return true;
}
}
return Resource::handleFailedRequest(result);
}
void GeometryResource::onGeometryMappingLoaded(bool success) { void GeometryResource::onGeometryMappingLoaded(bool success) {
if (success && _geometryResource) { if (success && _geometryResource) {
_hfmModel = _geometryResource->_hfmModel; _hfmModel = _geometryResource->_hfmModel;

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

@ -80,7 +80,7 @@ class GeometryResource : public Resource, public Geometry {
public: public:
using Pointer = QSharedPointer<GeometryResource>; using Pointer = QSharedPointer<GeometryResource>;
GeometryResource(const QUrl& url, const ModelLoader& modelLoader) : Resource(url), _modelLoader(modelLoader) { _shouldFailOnRedirect = !url.fileName().toLower().endsWith(".fst"); } GeometryResource(const QUrl& url, const ModelLoader& modelLoader) : Resource(url), _modelLoader(modelLoader) {}
GeometryResource(const GeometryResource& other); GeometryResource(const GeometryResource& other);
QString getType() const override { return "Geometry"; } QString getType() const override { return "Geometry"; }
@ -88,7 +88,6 @@ public:
virtual void deleter() override; virtual void deleter() override;
virtual void downloadFinished(const QByteArray& data) override; virtual void downloadFinished(const QByteArray& data) override;
bool handleFailedRequest(ResourceRequest::Result result) override;
void setExtra(void* extra) override; void setExtra(void* extra) override;
virtual bool areTexturesLoaded() const override { return isLoaded() && Geometry::areTexturesLoaded(); } virtual bool areTexturesLoaded() const override { return isLoaded() && Geometry::areTexturesLoaded(); }

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

@ -577,6 +577,7 @@ Resource::Resource(const Resource& other) :
Resource::Resource(const QUrl& url) : Resource::Resource(const QUrl& url) :
_url(url), _url(url),
_activeUrl(url), _activeUrl(url),
_effectiveBaseURL(url),
_requestID(++requestID) { _requestID(++requestID) {
init(); init();
} }