History

add assignment dynamic factory to ESS

Stephen Birarda committed 8 years ago

Commit e1879bf1 parent 09065cf1 file · +5 −0Browse files

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

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+5−0
@@ -33,6 +33,7 @@ · 32 unmodified lines
33 33
34#include <EntityScriptClient.h> // for EntityScriptServerServices34#include <EntityScriptClient.h> // for EntityScriptServerServices
35 35
36#include "../AssignmentDynamicFactory.h"
36#include "EntityScriptServerLogging.h"37#include "EntityScriptServerLogging.h"
37#include "../entities/AssignmentParentFinder.h"38#include "../entities/AssignmentParentFinder.h"
38 39
@@ -56,6 +57,9 @@ int EntityScriptServer::_entitiesScriptEngineCount = 0; · 17 unmodified lines
56EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssignment(message) {57EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssignment(message) {
57 qInstallMessageHandler(messageHandler);58 qInstallMessageHandler(messageHandler);
58 59
60 DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
61 DependencyManager::set<AssignmentDynamicFactory>();
62
59 DependencyManager::set<EntityScriptingInterface>(false)->setPacketSender(&_entityEditSender);63 DependencyManager::set<EntityScriptingInterface>(false)->setPacketSender(&_entityEditSender);
60 DependencyManager::set<ResourceScriptingInterface>();64 DependencyManager::set<ResourceScriptingInterface>();
61 65
@@ -579,6 +583,7 @@ void EntityScriptServer::handleOctreePacket(QSharedPointer<ReceivedMessage> mess · 517 unmodified lines
579void EntityScriptServer::aboutToFinish() {583void EntityScriptServer::aboutToFinish() {
580 shutdownScriptEngine();584 shutdownScriptEngine();
581 585
586 DependencyManager::destroy<AssignmentDynamicFactory>();
582 DependencyManager::destroy<AssignmentParentFinder>();587 DependencyManager::destroy<AssignmentParentFinder>();
583 588
584 DependencyManager::get<ResourceManager>()->cleanup();589 DependencyManager::get<ResourceManager>()->cleanup();