Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all
Unified · Split
| @@ -963,7 +963,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 962 unmodified lines | |||
| 963 | DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress); | 963 | DependencyManager::get<AddressManager>().data(), &AddressManager::storeCurrentAddress); |
| 964 | 964 | ||
| 965 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); | 965 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |
| 966 | scriptEngines->registerScriptInitializer([this](QSharedPointer<ScriptEngine> engine){ | 966 | scriptEngines->registerScriptInitializer([this](ScriptEnginePointer engine){ |
| 967 | registerScriptEngineWithApplicationServices(engine); | 967 | registerScriptEngineWithApplicationServices(engine); |
| 968 | }); | 968 | }); |
| 969 | 969 | ||
| @@ -5930,7 +5930,7 @@ int Application::processOctreeStats(ReceivedMessage& message, SharedNodePointer · 4960 unmodified lines | |||
| 5930 | void Application::packetSent(quint64 length) { | 5930 | void Application::packetSent(quint64 length) { |
| 5931 | } | 5931 | } |
| 5932 | 5932 | ||
| 5933 | void Application::registerScriptEngineWithApplicationServices(QSharedPointer<ScriptEngine> scriptEngine) { | 5933 | void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointer scriptEngine) { |
| 5934 | 5934 | ||
| 5935 | scriptEngine->setEmitScriptUpdatesFunction([this]() { | 5935 | scriptEngine->setEmitScriptUpdatesFunction([this]() { |
| 5936 | SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer); | 5936 | SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer); |
| @@ -5944,7 +5944,7 @@ void Application::registerScriptEngineWithApplicationServices(QSharedPointer<Scr · 7 unmodified lines | |||
| 5944 | entityScriptingInterface->setEntityTree(getEntities()->getTree()); | 5944 | entityScriptingInterface->setEntityTree(getEntities()->getTree()); |
| 5945 | 5945 | ||
| 5946 | // give the script engine to the RecordingScriptingInterface for its callbacks | 5946 | // give the script engine to the RecordingScriptingInterface for its callbacks |
| 5947 | DependencyManager::get<RecordingScriptingInterface>()->setScriptEngine(QSharedPointer<ScriptEngine>(scriptEngine)); | 5947 | DependencyManager::get<RecordingScriptingInterface>()->setScriptEngine(scriptEngine); |
| 5948 | 5948 | ||
| 5949 | if (property(hifi::properties::TEST).isValid()) { | 5949 | if (property(hifi::properties::TEST).isValid()) { |
| 5950 | scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance()); | 5950 | scriptEngine->registerGlobalObject("Test", TestScriptingInterface::getInstance()); |