mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 00:44:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move all network namespace members into the openspace namespace

Browse Source
This commit is contained in:
Emil Axelsson
2016-09-30 14:13:36 +02:00
parent 4f61479190
commit b448b0ec5e
15 changed files with 153 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/documentation/core_registration.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ void registerCoreClasses(scripting::ScriptEngine& engine) {
engine.addLibrary(interaction::InteractionHandler::luaLibrary());
engine.addLibrary(LuaConsole::luaLibrary());
engine.addLibrary(gui::GUI::luaLibrary());
engine.addLibrary(network::ParallelConnection::luaLibrary());
engine.addLibrary(ParallelConnection::luaLibrary());
engine.addLibrary(ModuleEngine::luaLibrary());
engine.addLibrary(scripting::ScriptScheduler::luaLibrary());
engine.addLibrary(WindowWrapper::luaLibrary());
src/engine/openspaceengine.cpp
+2 -2
View File
@@ -146,7 +146,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
#ifdef OPENSPACE_MODULE_ONSCREENGUI_ENABLED
, _gui(new gui::GUI)
#endif
, _parallelConnection(new network::ParallelConnection)
, _parallelConnection(new ParallelConnection)
, _windowWrapper(std::move(windowWrapper))
, _globalPropertyNamespace(new properties::PropertyOwner)
, _isMaster(false)
@@ -1151,7 +1151,7 @@ gui::GUI& OpenSpaceEngine::gui() {
}
#endif
network::ParallelConnection& OpenSpaceEngine::parallelConnection() {
ParallelConnection& OpenSpaceEngine::parallelConnection() {
ghoul_assert(_parallelConnection, "ParallelConnection must not be nullptr");
return *_parallelConnection;
}
src/interaction/interactionhandler.cpp
+2 -2
View File
@@ -148,7 +148,7 @@ InteractionHandler::~InteractionHandler() {
void InteractionHandler::initialize() {
OsEng.parallelConnection().connectionEvent()->subscribe("interactionHandler", "statusChanged", [this]() {
if (OsEng.parallelConnection().status() == network::ParallelConnection::Status::ClientWithHost) {
if (OsEng.parallelConnection().status() == ParallelConnection::Status::ClientWithHost) {
setInteractionMode("Keyframe");
} else {
auto keyframeModeIter = _interactionModes.find("Keyframe");
@@ -581,7 +581,7 @@ scripting::LuaLibrary InteractionHandler::luaLibrary() {
};
}
void InteractionHandler::addKeyframe(const network::datamessagestructures::CameraKeyframe &kf) {
void InteractionHandler::addKeyframe(const datamessagestructures::CameraKeyframe &kf) {
_inputState->addKeyframe(kf);
}
src/interaction/interactionmode.cpp
+6 -6
View File
@@ -57,15 +57,15 @@ namespace interaction {
}
const std::vector<network::datamessagestructures::CameraKeyframe>& InputState::keyframes() const {
const std::vector<datamessagestructures::CameraKeyframe>& InputState::keyframes() const {
return _keyframes;
}
void InputState::addKeyframe(const network::datamessagestructures::CameraKeyframe &kf) {
void InputState::addKeyframe(const datamessagestructures::CameraKeyframe &kf) {
clearOldKeyframes();
auto compareTimestamps = [](const network::datamessagestructures::CameraKeyframe a,
network::datamessagestructures::CameraKeyframe b) {
auto compareTimestamps = [](const datamessagestructures::CameraKeyframe a,
datamessagestructures::CameraKeyframe b) {
return a._timestamp < b._timestamp;
};
@@ -77,7 +77,7 @@ namespace interaction {
void InputState::clearOldKeyframes() {
double now = OsEng.runTime();
auto isLater = [now](const network::datamessagestructures::CameraKeyframe kf) {
auto isLater = [now](const datamessagestructures::CameraKeyframe kf) {
return kf._timestamp > now;
};
@@ -201,7 +201,7 @@ void KeyframeInteractionMode::updateCameraStateFromMouseStates(Camera& camera) {
}
double now = OsEng.runTime();
auto isLater = [now](const network::datamessagestructures::CameraKeyframe kf) {
auto isLater = [now](const datamessagestructures::CameraKeyframe kf) {
return kf._timestamp > now;
};
src/interaction/luaconsole.cpp
+3 -3
View File
@@ -94,7 +94,7 @@ void LuaConsole::initialize() {
OsEng.parallelConnection().connectionEvent()->subscribe("luaConsole",
"statusChanged", [this]() {
network::ParallelConnection::Status status = OsEng.parallelConnection().status();
ParallelConnection::Status status = OsEng.parallelConnection().status();
parallelConnectionChanged(status);
});
@@ -431,8 +431,8 @@ void LuaConsole::toggleMode() {
}
}
void LuaConsole::parallelConnectionChanged(const network::ParallelConnection::Status& status) {
_remoteScripting = status == network::ParallelConnection::Status::Host;
void LuaConsole::parallelConnectionChanged(const ParallelConnection::Status& status) {
_remoteScripting = status == ParallelConnection::Status::Host;
}
src/network/parallelconnection.cpp
+16 -20
View File
@@ -76,8 +76,6 @@ namespace {
namespace openspace {
namespace network {
ParallelConnection::ParallelConnection()
: _passCode(0)
, _port("20501")
@@ -525,25 +523,25 @@ void ParallelConnection::dataMessageReceived(const std::vector<char>& messageCon
uint32_t type = *(reinterpret_cast<const uint32_t*>(messageContent.data()));
std::vector<char> buffer(messageContent.begin() + sizeof(uint32_t), messageContent.end());
switch(static_cast<network::datamessagestructures::Type>(type)) {
case network::datamessagestructures::Type::CameraData: {
switch(static_cast<datamessagestructures::Type>(type)) {
case datamessagestructures::Type::CameraData: {
network::datamessagestructures::CameraKeyframe kf(buffer);
datamessagestructures::CameraKeyframe kf(buffer);
kf._timestamp = calculateBufferedKeyframeTime(kf._timestamp);
OsEng.interactionHandler().addKeyframe(kf);
break;
}
case network::datamessagestructures::Type::TimeData: {
case datamessagestructures::Type::TimeData: {
network::datamessagestructures::TimeKeyframe kf(buffer);
datamessagestructures::TimeKeyframe kf(buffer);
kf._timestamp = calculateBufferedKeyframeTime(kf._timestamp);
OsEng.timeManager().addKeyframe(kf);
break;
}
case network::datamessagestructures::Type::ScriptData: {
network::datamessagestructures::ScriptMessage sm;
case datamessagestructures::Type::ScriptData: {
datamessagestructures::ScriptMessage sm;
sm.deserialize(buffer);
OsEng.scriptEngine().queueScript(sm._script, scripting::ScriptEngine::RemoteScripting::No);
@@ -638,7 +636,7 @@ void ParallelConnection::connectionStatusMessageReceived(const std::vector<char>
}
size_t pointer = 0;
uint32_t statusIn = *(reinterpret_cast<const uint32_t*>(&message[pointer]));
network::ParallelConnection::Status status = static_cast<network::ParallelConnection::Status>(statusIn);
ParallelConnection::Status status = static_cast<ParallelConnection::Status>(statusIn);
pointer += sizeof(uint32_t);
size_t hostNameSize = *(reinterpret_cast<const uint32_t*>(&message[pointer]));
@@ -731,7 +729,7 @@ void ParallelConnection::nConnectionsMessageReceived(const std::vector<char>& me
//serialize and encode all scripts into scriptbuffer
std::vector<std::string>::iterator script_it;
network::datamessagestructures::ScriptMessage sm;
datamessagestructures::ScriptMessage sm;
for(script_it = scripts.begin();
script_it != scripts.end();
++script_it){
@@ -913,13 +911,13 @@ bool ParallelConnection::initNetworkAPI(){
void ParallelConnection::sendScript(const std::string& script) {
if (!isHost()) return;
network::datamessagestructures::ScriptMessage sm;
datamessagestructures::ScriptMessage sm;
sm._script = script;
std::vector<char> buffer;
sm.serialize(buffer);
queueOutDataMessage(DataMessage(network::datamessagestructures::Type::ScriptData, buffer));
queueOutDataMessage(DataMessage(datamessagestructures::Type::ScriptData, buffer));
}
void ParallelConnection::preSynchronization(){
@@ -977,7 +975,7 @@ const std::string& ParallelConnection::hostName() {
void ParallelConnection::sendCameraKeyframe() {
//create a keyframe with current position and orientation of camera
network::datamessagestructures::CameraKeyframe kf;
datamessagestructures::CameraKeyframe kf;
kf._position = OsEng.interactionHandler().camera()->positionVec3();
kf._rotation = OsEng.interactionHandler().camera()->rotationQuaternion();
@@ -991,12 +989,12 @@ void ParallelConnection::sendCameraKeyframe() {
kf.serialize(buffer);
//send message
queueOutDataMessage(DataMessage(network::datamessagestructures::Type::CameraData, buffer));
queueOutDataMessage(DataMessage(datamessagestructures::Type::CameraData, buffer));
}
void ParallelConnection::sendTimeKeyframe() {
//create a keyframe with current position and orientation of camera
network::datamessagestructures::TimeKeyframe kf;
datamessagestructures::TimeKeyframe kf;
kf._dt = Time::ref().deltaTime();
kf._paused = Time::ref().paused();
@@ -1013,7 +1011,7 @@ void ParallelConnection::sendTimeKeyframe() {
kf.serialize(buffer);
//send message
queueOutDataMessage(DataMessage(network::datamessagestructures::Type::TimeData, buffer));
queueOutDataMessage(DataMessage(datamessagestructures::Type::TimeData, buffer));
_timeJumped = false;
}
@@ -1107,7 +1105,5 @@ scripting::LuaLibrary ParallelConnection::luaLibrary() {
}
};
}
} // namespace network
} // namespace openspace
src/rendering/renderengine.cpp
+6 -6
View File
@@ -1328,28 +1328,28 @@ void RenderEngine::renderInformation() {
break;
}
network::ParallelConnection::Status status = OsEng.parallelConnection().status();
ParallelConnection::Status status = OsEng.parallelConnection().status();
size_t nConnections = OsEng.parallelConnection().nConnections();
const std::string& hostName = OsEng.parallelConnection().hostName();
std::string connectionInfo = "";
int nClients = nConnections;
if (status == network::ParallelConnection::Status::Host) {
if (status == ParallelConnection::Status::Host) {
nClients--;
if (nClients == 1) {
connectionInfo = "Hosting session with 1 client";
} else {
connectionInfo = "Hosting session with " + std::to_string(nClients) + " clients";
}
} else if (status == network::ParallelConnection::Status::ClientWithHost) {
} else if (status == ParallelConnection::Status::ClientWithHost) {
nClients--;
connectionInfo = "Session hosted by '" + hostName + "'";
} else if (status == network::ParallelConnection::Status::ClientWithoutHost) {
} else if (status == ParallelConnection::Status::ClientWithoutHost) {
connectionInfo = "Host is disconnected";
}
if (status == network::ParallelConnection::Status::ClientWithHost ||
status == network::ParallelConnection::Status::ClientWithoutHost) {
if (status == ParallelConnection::Status::ClientWithHost ||
status == ParallelConnection::Status::ClientWithoutHost) {
connectionInfo += "\n";
if (nClients > 2) {
connectionInfo += "You and " + std::to_string(nClients - 1) + " more clients are tuned in";
src/util/timemanager.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ namespace {
namespace openspace {
using network::datamessagestructures::TimeKeyframe;
using datamessagestructures::TimeKeyframe;
void TimeManager::preSynchronization(double dt) {
double now = OsEng.runTime();
@@ -135,7 +135,7 @@ void TimeManager::addKeyframe(const TimeKeyframe& kf) {
void TimeManager::removeKeyframesBefore(double timestamp) {
network::datamessagestructures::TimeKeyframe kf;
datamessagestructures::TimeKeyframe kf;
kf._timestamp = timestamp;
auto iter = std::upper_bound(_keyframes.begin(), _keyframes.end(), kf, &TimeManager::compareKeyframeTimes);
_keyframes.erase(_keyframes.begin(), iter);