Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 12:47:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move the ResourceManager init back to where it was, to prevent problems

Browse source
This commit is contained in:
Thijs Wenker 2017-06-29 00:52:51 +02:00
parent 794495c197
commit 93679f7c3b
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assignment-client/src/Agent.cpp
View file

@ -62,6 +62,8 @@ Agent::Agent(ReceivedMessage& message) :
_entityEditSender.setPacketsPerSecond(DEFAULT_ENTITY_PPS_PER_SCRIPT); _entityEditSender.setPacketsPerSecond(DEFAULT_ENTITY_PPS_PER_SCRIPT);
DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender); DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
DependencyManager::set<ResourceManager>();
DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>(); DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
DependencyManager::set<ResourceCacheSharedItems>(); DependencyManager::set<ResourceCacheSharedItems>();
@ -79,7 +81,6 @@ Agent::Agent(ReceivedMessage& message) :
DependencyManager::set<RecordingScriptingInterface>(); DependencyManager::set<RecordingScriptingInterface>();
DependencyManager::set<UsersScriptingInterface>(); DependencyManager::set<UsersScriptingInterface>();
DependencyManager::set<ResourceManager>();
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();

2
assignment-client/src/entities/EntityServer.cpp
View file

@ -31,9 +31,9 @@ EntityServer::EntityServer(ReceivedMessage& message) :
OctreeServer(message), OctreeServer(message),
_entitySimulation(NULL) _entitySimulation(NULL)
{ {
DependencyManager::set<ResourceManager>();
DependencyManager::set<ResourceCacheSharedItems>(); DependencyManager::set<ResourceCacheSharedItems>();
DependencyManager::set<ScriptCache>(); DependencyManager::set<ScriptCache>();
DependencyManager::set<ResourceManager>();
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver(); auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
packetReceiver.registerListenerForTypes({ PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase, PacketType::EntityPhysics }, packetReceiver.registerListenerForTypes({ PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase, PacketType::EntityPhysics },

3
tests/render-perf/src/main.cpp
View file

@ -494,7 +494,6 @@ public:
DependencyManager::set<PathUtils>(); DependencyManager::set<PathUtils>();
DependencyManager::set<SceneScriptingInterface>(); DependencyManager::set<SceneScriptingInterface>();
DependencyManager::set<TestActionFactory>(); DependencyManager::set<TestActionFactory>();
DependencyManager::set<ResourceManager>();
} }
QTestWindow() { QTestWindow() {
@ -520,6 +519,8 @@ public:
_octree->getTree()->setSimulation(simpleSimulation); _octree->getTree()->setSimulation(simpleSimulation);
_entitySimulation = simpleSimulation; _entitySimulation = simpleSimulation;
} }
DependencyManager::set<ResourceManager>();
setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint); setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
_size = QSize(800, 600); _size = QSize(800, 600);

4
tests/render-texture-load/src/main.cpp
View file

@ -289,7 +289,6 @@ public:
DependencyManager::set<GeometryCache>(); DependencyManager::set<GeometryCache>();
DependencyManager::set<ModelCache>(); DependencyManager::set<ModelCache>();
DependencyManager::set<PathUtils>(); DependencyManager::set<PathUtils>();
DependencyManager::set<ResourceManager>();
} }
struct TextureLoad { struct TextureLoad {
@ -329,7 +328,8 @@ public:
installEventFilter(this); installEventFilter(this);
QThreadPool::globalInstance()->setMaxThreadCount(2); QThreadPool::globalInstance()->setMaxThreadCount(2);
QThread::currentThread()->setPriority(QThread::HighestPriority); QThread::currentThread()->setPriority(QThread::HighestPriority);
DependencyManager::set<ResourceManager>();
setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint); setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
_size = QSize(800, 600); _size = QSize(800, 600);
_renderThread._size = _size; _renderThread._size = _size;