diff --git a/interface/src/scripting/TestScriptingInterface.cpp b/interface/src/scripting/TestScriptingInterface.cpp index c3aeb2643b..efee9cefdd 100644 --- a/interface/src/scripting/TestScriptingInterface.cpp +++ b/interface/src/scripting/TestScriptingInterface.cpp @@ -199,3 +199,9 @@ void TestScriptingInterface::setOtherAvatarsReplicaCount(int count) { int TestScriptingInterface::getOtherAvatarsReplicaCount() { return qApp->getOtherAvatarsReplicaCount(); } + +bool TestScriptingInterface::isTextureLoadingComplete() { + bool result; + QMetaObject::invokeMethod(qApp, "gpuTextureMemSizeStable", Qt::DirectConnection, Q_RETURN_ARG(bool, result)); + return result; +} diff --git a/interface/src/scripting/TestScriptingInterface.h b/interface/src/scripting/TestScriptingInterface.h index 4a1d1a3eeb..1fc1bdd930 100644 --- a/interface/src/scripting/TestScriptingInterface.h +++ b/interface/src/scripting/TestScriptingInterface.h @@ -163,6 +163,13 @@ public slots: */ Q_INVOKABLE int getOtherAvatarsReplicaCount(); + /**jsdoc + * Check whether all textures have been loaded. + * @function Entities.areTexturesLoaded + * @returns {boolean} true texture memory usage is not increasing false. + */ + Q_INVOKABLE bool isTextureLoadingComplete(); + private: bool waitForCondition(qint64 maxWaitMs, std::function condition); QString _testResultsLocation; diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 7ed0d73130..ca914731b5 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -1026,12 +1026,6 @@ bool EntityScriptingInterface::isLoaded(const QUuid& id) { return toReturn; } -bool EntityScriptingInterface::isTextureLoadingComplete() { - bool result; - QMetaObject::invokeMethod(qApp, "gpuTextureMemSizeStable", Qt::DirectConnection, Q_RETURN_ARG(bool, result)); - return result; -} - bool EntityScriptingInterface::isAddedEntity(const QUuid& id) { bool toReturn = false; _entityTree->withReadLock([&] { diff --git a/libraries/entities/src/EntityScriptingInterface.h b/libraries/entities/src/EntityScriptingInterface.h index 38d601a6c6..f6aedac3fc 100644 --- a/libraries/entities/src/EntityScriptingInterface.h +++ b/libraries/entities/src/EntityScriptingInterface.h @@ -395,13 +395,6 @@ public slots: */ Q_INVOKABLE bool isLoaded(const QUuid& id); - /**jsdoc - * Check whether all textures have been loaded. - * @function Entities.areTexturesLoaded - * @returns {boolean} true texture memory usage is not increasing false. - */ - Q_INVOKABLE bool isTextureLoadingComplete(); - /**jsdoc * Check if there is an object of a given ID. * @function Entities.isAddedEntity