mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:49:24 +02:00
move AssignmentDynamicFactory to entity-server only
This commit is contained in:
parent
cd05d9335a
commit
7e127749f7
2 changed files with 6 additions and 4 deletions
|
@ -52,7 +52,6 @@
|
||||||
#include <WebSocketServerClass.h>
|
#include <WebSocketServerClass.h>
|
||||||
#include <EntityScriptingInterface.h> // TODO: consider moving to scriptengine.h
|
#include <EntityScriptingInterface.h> // TODO: consider moving to scriptengine.h
|
||||||
|
|
||||||
#include "AssignmentDynamicFactory.h"
|
|
||||||
#include "entities/AssignmentParentFinder.h"
|
#include "entities/AssignmentParentFinder.h"
|
||||||
#include "RecordingScriptingInterface.h"
|
#include "RecordingScriptingInterface.h"
|
||||||
#include "AbstractAudioInterface.h"
|
#include "AbstractAudioInterface.h"
|
||||||
|
@ -72,9 +71,6 @@ Agent::Agent(ReceivedMessage& message) :
|
||||||
DependencyManager::set<AnimationCacheScriptingInterface>();
|
DependencyManager::set<AnimationCacheScriptingInterface>();
|
||||||
DependencyManager::set<EntityScriptingInterface>(false);
|
DependencyManager::set<EntityScriptingInterface>(false);
|
||||||
|
|
||||||
DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
|
|
||||||
DependencyManager::set<AssignmentDynamicFactory>();
|
|
||||||
|
|
||||||
DependencyManager::set<ResourceScriptingInterface>();
|
DependencyManager::set<ResourceScriptingInterface>();
|
||||||
DependencyManager::set<UserActivityLoggerScriptingInterface>();
|
DependencyManager::set<UserActivityLoggerScriptingInterface>();
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <NetworkingConstants.h>
|
#include <NetworkingConstants.h>
|
||||||
#include <AddressManager.h>
|
#include <AddressManager.h>
|
||||||
|
|
||||||
|
#include "../AssignmentDynamicFactory.h"
|
||||||
#include "AssignmentParentFinder.h"
|
#include "AssignmentParentFinder.h"
|
||||||
#include "EntityNodeData.h"
|
#include "EntityNodeData.h"
|
||||||
#include "EntityServerConsts.h"
|
#include "EntityServerConsts.h"
|
||||||
|
@ -42,6 +43,9 @@ EntityServer::EntityServer(ReceivedMessage& message) :
|
||||||
DependencyManager::set<ResourceCacheSharedItems>();
|
DependencyManager::set<ResourceCacheSharedItems>();
|
||||||
DependencyManager::set<ScriptCache>();
|
DependencyManager::set<ScriptCache>();
|
||||||
|
|
||||||
|
DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
|
||||||
|
DependencyManager::set<AssignmentDynamicFactory>();
|
||||||
|
|
||||||
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
|
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
|
||||||
packetReceiver.registerListenerForTypes({ PacketType::EntityAdd,
|
packetReceiver.registerListenerForTypes({ PacketType::EntityAdd,
|
||||||
PacketType::EntityClone,
|
PacketType::EntityClone,
|
||||||
|
@ -71,6 +75,8 @@ EntityServer::~EntityServer() {
|
||||||
void EntityServer::aboutToFinish() {
|
void EntityServer::aboutToFinish() {
|
||||||
DependencyManager::get<ResourceManager>()->cleanup();
|
DependencyManager::get<ResourceManager>()->cleanup();
|
||||||
|
|
||||||
|
DependencyManager::destroy<AssignmentDynamicFactory>();
|
||||||
|
|
||||||
OctreeServer::aboutToFinish();
|
OctreeServer::aboutToFinish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue