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

Merge pull request #7537 from zzmp/fix/fst

Browse source 
Keep textureBaseUrl for fst models
This commit is contained in:
Brad Hefta-Gaub 2016-04-01 12:28:23 -07:00
commit 830c7a90e1
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,10 @@ public:
const QUrl& textureBaseUrl; const QUrl& textureBaseUrl;
}; };
QUrl resolveTextureBaseUrl(const QUrl& url, const QUrl& textureBaseUrl) {
return textureBaseUrl.isValid() ? textureBaseUrl : url;
}
class GeometryMappingResource : public GeometryResource { class GeometryMappingResource : public GeometryResource {
Q_OBJECT Q_OBJECT
public: public:
@ -52,18 +56,17 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
finishedLoading(false); finishedLoading(false);
} else { } else {
QUrl url = _url.resolved(filename); QUrl url = _url.resolved(filename);
QUrl textureBaseUrl;
QString texdir = mapping.value("texdir").toString(); QString texdir = mapping.value("texdir").toString();
if (!texdir.isNull()) { if (!texdir.isNull()) {
if (!texdir.endsWith('/')) { if (!texdir.endsWith('/')) {
texdir += '/'; texdir += '/';
} }
textureBaseUrl = _url.resolved(texdir); _textureBaseUrl = resolveTextureBaseUrl(url, _url.resolved(texdir));
} }
auto modelCache = DependencyManager::get<ModelCache>(); auto modelCache = DependencyManager::get<ModelCache>();
GeometryExtra extra{ mapping, textureBaseUrl }; GeometryExtra extra{ mapping, _textureBaseUrl };
// Get the raw GeometryResource, not the wrapped NetworkGeometry // Get the raw GeometryResource, not the wrapped NetworkGeometry
_geometryResource = modelCache->getResource(url, QUrl(), false, &extra).staticCast<GeometryResource>(); _geometryResource = modelCache->getResource(url, QUrl(), false, &extra).staticCast<GeometryResource>();
@ -160,7 +163,7 @@ class GeometryDefinitionResource : public GeometryResource {
Q_OBJECT Q_OBJECT
public: public:
GeometryDefinitionResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) : GeometryDefinitionResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) :
GeometryResource(url, textureBaseUrl.isValid() ? textureBaseUrl : url), _mapping(mapping) {} GeometryResource(url, resolveTextureBaseUrl(url, textureBaseUrl)), _mapping(mapping) {}
virtual void downloadFinished(const QByteArray& data) override; virtual void downloadFinished(const QByteArray& data) override;

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

@ -95,7 +95,8 @@ class GeometryResource : public Resource, public Geometry {
public: public:
using Pointer = QSharedPointer<GeometryResource>; using Pointer = QSharedPointer<GeometryResource>;
GeometryResource(const QUrl& url, const QUrl& textureBaseUrl = QUrl()) : Resource(url) {} GeometryResource(const QUrl& url, const QUrl& textureBaseUrl = QUrl()) :
Resource(url), _textureBaseUrl(textureBaseUrl) {}
virtual bool areTexturesLoaded() const { return isLoaded() && Geometry::areTexturesLoaded(); } virtual bool areTexturesLoaded() const { return isLoaded() && Geometry::areTexturesLoaded(); }