From 2d199fe3d007f3a6fb7f9c1099aac08c583e416d Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Tue, 26 Jul 2016 08:08:32 -0700 Subject: [PATCH] rename function for better clarity --- interface/src/Application.cpp | 2 +- libraries/script-engine/src/ScriptEngine.cpp | 2 +- libraries/script-engine/src/ScriptEngine.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index faa1229cad..eba400ebc5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4679,7 +4679,7 @@ void Application::packetSent(quint64 length) { void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) { - scriptEngine->setPhysicsEnabledFunction([this]() { + scriptEngine->setEmitScriptUpdatesFunction([this]() { return isPhysicsEnabled(); }); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index fd09e9a018..21eae99307 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -894,7 +894,7 @@ void ScriptEngine::run() { qint64 now = usecTimestampNow(); // we check for 'now' in the past in case people set their clock back - if (_isPhysicsEnabledFunc() && _lastUpdate < now) { + if (_emitScriptUpdates() && _lastUpdate < now) { float deltaTime = (float) (now - _lastUpdate) / (float) USECS_PER_SECOND; if (!_isFinished) { auto preUpdate = clock::now(); diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index a62f6e1a88..e093f0393b 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -168,7 +168,7 @@ public: // NOTE - this is used by the TypedArray implemetation. we need to review this for thread safety ArrayBufferClass* getArrayBufferClass() { return _arrayBufferClass; } - void setPhysicsEnabledFunction(std::function func) { _isPhysicsEnabledFunc = func; } + void setEmitScriptUpdatesFunction(std::function func) { _emitScriptUpdates = func; } public slots: void callAnimationStateHandler(QScriptValue callback, AnimVariantMap parameters, QStringList names, bool useNames, AnimVariantResultHandler resultHandler); @@ -239,7 +239,7 @@ protected: void doWithEnvironment(const EntityItemID& entityID, const QUrl& sandboxURL, std::function operation); void callWithEnvironment(const EntityItemID& entityID, const QUrl& sandboxURL, QScriptValue function, QScriptValue thisObject, QScriptValueList args); - std::function _isPhysicsEnabledFunc{ [](){ return true; } }; + std::function _emitScriptUpdates{ [](){ return true; } }; };