Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 49 files). Show all
Unified · Split
| @@ -459,12 +459,12 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 458 unmodified lines | ||
| 459 | 459 | |
| 460 | 460 | // connect this script engines printedMessage signal to the global ScriptEngines these various messages |
| 461 | 461 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |
| 462 | − connect(newManager.data(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage); | |
| 463 | − connect(newManager.data(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage); | |
| 464 | − connect(newManager.data(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage); | |
| 465 | − connect(newManager.data(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage); | |
| 462 | + connect(newManager.get(), &ScriptManager::printedMessage, scriptEngines, &ScriptEngines::onPrintedMessage); | |
| 463 | + connect(newManager.get(), &ScriptManager::errorMessage, scriptEngines, &ScriptEngines::onErrorMessage); | |
| 464 | + connect(newManager.get(), &ScriptManager::warningMessage, scriptEngines, &ScriptEngines::onWarningMessage); | |
| 465 | + connect(newManager.get(), &ScriptManager::infoMessage, scriptEngines, &ScriptEngines::onInfoMessage); | |
| 466 | 466 | |
| 467 | − connect(newManager.data(), &ScriptManager::update, this, [this] { | |
| 467 | + connect(newManager.get(), &ScriptManager::update, this, [this] { | |
| 468 | 468 | _entityViewer.queryOctree(); |
| 469 | 469 | _entityViewer.getTree()->preUpdate(); |
| 470 | 470 | _entityViewer.getTree()->update(); |
| @@ -472,18 +472,18 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 1 unmodified line | ||
| 472 | 472 | |
| 473 | 473 | scriptEngines->runScriptInitializers(newManager); |
| 474 | 474 | newManager->runInThread(); |
| 475 | − auto newEngineSP = qSharedPointerCast<EntitiesScriptEngineProvider>(newManager); | |
| 475 | + std::shared_ptr<EntitiesScriptEngineProvider> newEngineSP = newManager; | |
| 476 | 476 | // On the entity script server, these are the same |
| 477 | 477 | DependencyManager::get<EntityScriptingInterface>()->setPersistentEntitiesScriptEngine(newEngineSP); |
| 478 | 478 | DependencyManager::get<EntityScriptingInterface>()->setNonPersistentEntitiesScriptEngine(newEngineSP); |
| 479 | 479 | |
| 480 | 480 | if (_entitiesScriptManager) { |
| 481 | − disconnect(_entitiesScriptManager.data(), &ScriptManager::entityScriptDetailsUpdated, | |
| 481 | + disconnect(_entitiesScriptManager.get(), &ScriptManager::entityScriptDetailsUpdated, | |
| 482 | 482 | this, &EntityScriptServer::updateEntityPPS); |
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | _entitiesScriptManager.swap(newManager); |
| 486 | − connect(_entitiesScriptManager.data(), &ScriptManager::entityScriptDetailsUpdated, | |
| 486 | + connect(_entitiesScriptManager.get(), &ScriptManager::entityScriptDetailsUpdated, | |
| 487 | 487 | this, &EntityScriptServer::updateEntityPPS); |
| 488 | 488 | } |
| 489 | 489 | |
| @@ -516,7 +516,7 @@ void EntityScriptServer::shutdownScriptEngine() { · 26 unmodified lines | ||
| 516 | 516 | auto scriptEngines = DependencyManager::get<ScriptEngines>(); |
| 517 | 517 | scriptEngines->shutdownScripting(); |
| 518 | 518 | |
| 519 | − _entitiesScriptManager.clear(); | |
| 519 | + _entitiesScriptManager.reset(); | |
| 520 | 520 | |
| 521 | 521 | auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); |
| 522 | 522 | // our entity tree is going to go away so tell that to the EntityScriptingInterface |