mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-15 16:31:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.

Browse Source 
started rebase work on parallel connection
This commit is contained in:
Joakim Kilby
2015-06-24 11:23:36 +02:00
parent 466d9028f9
commit 9a74bd60b7
9 changed files with 127 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/openspaceengine.cpp
View File

@@ -47,7 +47,7 @@
#include <openspace/util/spicemanager.h>
#include <openspace/util/syncbuffer.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/network/osparallelconnection.h>
#include <openspace/network/parallelconnection.h>
#include <ghoul/ghoul.h>
#include <ghoul/cmdparser/commandlineparser.h>
@@ -111,7 +111,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName)
, _gui(new gui::GUI)
, _isMaster(false)
, _syncBuffer(nullptr)
, _parallelConnection(new network::OSParallelConnection)
, _parallelConnection(new network::ParallelConnection)
{
FactoryManager::initialize();
SpiceManager::initialize();
@@ -305,7 +305,7 @@ bool OpenSpaceEngine::initialize() {
_scriptEngine->addLibrary(interaction::InteractionHandler::luaLibrary());
_scriptEngine->addLibrary(LuaConsole::luaLibrary());
_scriptEngine->addLibrary(gui::GUI::luaLibrary());
_scriptEngine->addLibrary(network::OSParallelConnection::luaLibrary());
_scriptEngine->addLibrary(network::ParallelConnection::luaLibrary());
// TODO: Maybe move all scenegraph and renderengine stuff to initializeGL
scriptEngine()->initialize();
@@ -760,7 +760,7 @@ ModuleEngine* OpenSpaceEngine::moduleEngine() {
return _moduleEngine;
}
network::OSParallelConnection* OpenSpaceEngine::parallelConnection() {
network::ParallelConnection* OpenSpaceEngine::parallelConnection() {
ghoul_assert(_parallelConnection != nullptr, "ParallelConnection is nullptr");
return _parallelConnection;
}