Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 23 files). Show all
Unified · Split
| @@ -54,7 +54,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 53 unmodified lines | |||
| 54 | 54 | ||
| 55 | DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender); | 55 | DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender); |
| 56 | 56 | ||
| 57 | ResourceManager::init(); | 57 | DependencyManager::set<ResourceManager>(); |
| 58 | 58 | ||
| 59 | DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>(); | 59 | DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>(); |
| 60 | 60 | ||
| @@ -67,7 +67,6 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 6 unmodified lines | |||
| 67 | DependencyManager::set<ScriptCache>(); | 67 | DependencyManager::set<ScriptCache>(); |
| 68 | DependencyManager::set<ScriptEngines>(ScriptEngine::ENTITY_SERVER_SCRIPT); | 68 | DependencyManager::set<ScriptEngines>(ScriptEngine::ENTITY_SERVER_SCRIPT); |
| 69 | 69 | ||
| 70 | |||
| 71 | auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); | 70 | auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); |
| 72 | packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase }, | 71 | packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase }, |
| 73 | this, "handleOctreePacket"); | 72 | this, "handleOctreePacket"); |
| @@ -493,7 +492,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, bool · 419 unmodified lines | |||
| 493 | if (entity && (reload || notRunning || details.scriptText != entity->getServerScripts())) { | 492 | if (entity && (reload || notRunning || details.scriptText != entity->getServerScripts())) { |
| 494 | QString scriptUrl = entity->getServerScripts(); | 493 | QString scriptUrl = entity->getServerScripts(); |
| 495 | if (!scriptUrl.isEmpty()) { | 494 | if (!scriptUrl.isEmpty()) { |
| 496 | scriptUrl = ResourceManager::normalizeURL(scriptUrl); | 495 | scriptUrl = DependencyManager::get<ResourceManager>()->normalizeURL(scriptUrl); |
| 497 | qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID; | 496 | qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID; |
| 498 | _entitiesScriptEngine->loadEntityScript(entityID, scriptUrl, reload); | 497 | _entitiesScriptEngine->loadEntityScript(entityID, scriptUrl, reload); |
| 499 | } | 498 | } |
| @@ -551,7 +550,7 @@ void EntityScriptServer::aboutToFinish() { · 51 unmodified lines | |||
| 551 | // our entity tree is going to go away so tell that to the EntityScriptingInterface | 550 | // our entity tree is going to go away so tell that to the EntityScriptingInterface |
| 552 | DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr); | 551 | DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr); |
| 553 | 552 | ||
| 554 | ResourceManager::cleanup(); | 553 | DependencyManager::get<ResourceManager>()->cleanup(); |
| 555 | 554 | ||
| 556 | // cleanup the AudioInjectorManager (and any still running injectors) | 555 | // cleanup the AudioInjectorManager (and any still running injectors) |
| 557 | DependencyManager::destroy<AudioInjectorManager>(); | 556 | DependencyManager::destroy<AudioInjectorManager>(); |