History

split entity script engines into two

HifiExperiments committed 6 years ago

Commit 2a1857e1 parent c9c8e5f5 files · +176 −112Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 5 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+3−1
@@ -465,7 +465,9 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 464 unmodified lines
465 scriptEngines->runScriptInitializers(newEngine);465 scriptEngines->runScriptInitializers(newEngine);
466 newEngine->runInThread();466 newEngine->runInThread();
467 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);467 auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newEngine);
468 DependencyManager::get<EntityScriptingInterface>()->setEntitiesScriptEngine(newEngineSP);468 // On the entity script server, these are the same
469 DependencyManager::get<EntityScriptingInterface>()->setPersistentEntitiesScriptEngine(newEngineSP);
470 DependencyManager::get<EntityScriptingInterface>()->setNonPersistentEntitiesScriptEngine(newEngineSP);
469 471
470 if (_entitiesScriptEngine) {472 if (_entitiesScriptEngine) {
471 disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,473 disconnect(_entitiesScriptEngine.data(), &ScriptEngine::entityScriptDetailsUpdated,