mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 15:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/websocketnavigation (#882)

Browse Source 
* Upgrade JSON Library
* Added support for navigation based on websocket communication
This commit is contained in:
Alexander Bock
2019-07-31 11:07:25 +02:00
committed by GitHub
parent 0e1bc9950d
commit f2a0cb18b0
20 changed files with 16449 additions and 7371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/server/src/connection.cpp
+5 -2
View File
@@ -27,6 +27,7 @@
#include <modules/server/include/topics/authorizationtopic.h>
#include <modules/server/include/topics/bouncetopic.h>
#include <modules/server/include/topics/documentationtopic.h>
#include <modules/server/include/topics/flightcontrollertopic.h>
#include <modules/server/include/topics/getpropertytopic.h>
#include <modules/server/include/topics/luascripttopic.h>
#include <modules/server/include/topics/sessionrecordingtopic.h>
@@ -64,6 +65,7 @@ namespace {
constexpr const char* TimeTopicKey = "time";
constexpr const char* TriggerPropertyTopicKey = "trigger";
constexpr const char* BounceTopicKey = "bounce";
constexpr const char* FlightControllerTopicKey = "flightcontroller";
} // namespace
namespace openspace {
@@ -95,6 +97,7 @@ Connection::Connection(std::unique_ptr<ghoul::io::Socket> s,
_topicFactory.registerClass<TimeTopic>(TimeTopicKey);
_topicFactory.registerClass<TriggerPropertyTopic>(TriggerPropertyTopicKey);
_topicFactory.registerClass<BounceTopic>(BounceTopicKey);
_topicFactory.registerClass<FlightControllerTopic>(FlightControllerTopicKey);
_topicFactory.registerClass<VersionTopic>(VersionTopicKey);
}
@@ -125,8 +128,8 @@ void Connection::handleMessage(const std::string& message) {
message.begin(),
message.end(),
sanitizedString.begin(),
[](const unsigned char& c) {
return std::isprint(c) ? c : ' ';
[](wchar_t c) {
return std::isprint(c, std::locale("")) ? c : ' ';
}
);
LERROR(fmt::format("Could not parse JSON: '{}'", sanitizedString));