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

namechange: fetchResource --> getGeometryResource

Browse source
This commit is contained in:
Andrew Meadows 2016-07-11 08:45:57 -07:00
parent c50d41c532
commit 4bebb682dc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,7 +250,7 @@ QSharedPointer<Resource> ModelCache::createResource(const QUrl& url, const QShar
return QSharedPointer<Resource>(resource, &Resource::deleter); return QSharedPointer<Resource>(resource, &Resource::deleter);
} }
GeometryResource::Pointer ModelCache::fetchResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) { GeometryResource::Pointer ModelCache::getGeometryResource(const QUrl& url, const QVariantHash& mapping, const QUrl& textureBaseUrl) {
GeometryExtra geometryExtra = { mapping, textureBaseUrl }; GeometryExtra geometryExtra = { mapping, textureBaseUrl };
GeometryResource::Pointer resource = getResource(url, QUrl(), &geometryExtra).staticCast<GeometryResource>(); GeometryResource::Pointer resource = getResource(url, QUrl(), &geometryExtra).staticCast<GeometryResource>();
if (resource) { if (resource) {

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

@ -127,7 +127,7 @@ class ModelCache : public ResourceCache, public Dependency {
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
public: public:
GeometryResource::Pointer fetchResource(const QUrl& url, GeometryResource::Pointer getGeometryResource(const QUrl& url,
const QVariantHash& mapping = QVariantHash(), const QUrl& textureBaseUrl = QUrl()); const QVariantHash& mapping = QVariantHash(), const QUrl& textureBaseUrl = QUrl());
protected: protected:

4
libraries/render-utils/src/Model.cpp
View file

@ -821,7 +821,7 @@ void Model::setURL(const QUrl& url) {
invalidCalculatedMeshBoxes(); invalidCalculatedMeshBoxes();
deleteGeometry(); deleteGeometry();
_renderWatcher.setResource(DependencyManager::get<ModelCache>()->fetchResource(url)); _renderWatcher.setResource(DependencyManager::get<ModelCache>()->getGeometryResource(url));
onInvalidate(); onInvalidate();
} }
@ -830,7 +830,7 @@ void Model::setCollisionModelURL(const QUrl& url) {
return; return;
} }
_collisionUrl = url; _collisionUrl = url;
_collisionWatcher.setResource(DependencyManager::get<ModelCache>()->fetchResource(url)); _collisionWatcher.setResource(DependencyManager::get<ModelCache>()->getGeometryResource(url));
} }
bool Model::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position) const { bool Model::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position) const {