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

Merge pull request #8552 from AndrewMeadows/invoke-updateModel

Browse source 
eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()
This commit is contained in:
Brad Hefta-Gaub 2016-09-02 09:17:57 -07:00 committed by GitHub
commit 667137f951
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -556,14 +556,13 @@ ModelPointer EntityTreeRenderer::allocateModel(const QString& url, float loading
return model; return model;
} }
ModelPointer EntityTreeRenderer::updateModel(ModelPointer model, const QString& newUrl, const QString& collisionUrl) { ModelPointer EntityTreeRenderer::updateModel(ModelPointer model, const QString& newUrl) {
// Only create and delete models on the thread that owns the EntityTreeRenderer // Only create and delete models on the thread that owns the EntityTreeRenderer
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "updateModel", Qt::BlockingQueuedConnection, QMetaObject::invokeMethod(this, "updateModel", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(ModelPointer, model), Q_RETURN_ARG(ModelPointer, model),
Q_ARG(ModelPointer, model), Q_ARG(ModelPointer, model),
Q_ARG(const QString&, newUrl), Q_ARG(const QString&, newUrl));
Q_ARG(const QString&, collisionUrl));
return model; return model;
} }

2
libraries/entities-renderer/src/EntityTreeRenderer.h
View file

@ -76,7 +76,7 @@ public:
Q_INVOKABLE ModelPointer allocateModel(const QString& url, float loadingPriority = 0.0f); Q_INVOKABLE ModelPointer allocateModel(const QString& url, float loadingPriority = 0.0f);
/// if a renderable entity item needs to update the URL of a model, we will handle that for the entity /// if a renderable entity item needs to update the URL of a model, we will handle that for the entity
Q_INVOKABLE ModelPointer updateModel(ModelPointer original, const QString& newUrl, const QString& collisionUrl); Q_INVOKABLE ModelPointer updateModel(ModelPointer original, const QString& newUrl);
/// if a renderable entity item is done with a model, it should return it to us /// if a renderable entity item is done with a model, it should return it to us
void releaseModel(ModelPointer model); void releaseModel(ModelPointer model);