mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] ColormapEnable not working

Browse Source 
Co-authored-by: Victor Lindquist <VLLindqvist@users.noreply.github.com>
This commit is contained in:
Jacob Molin
2022-05-24 17:07:57 -06:00
parent 193c7cdf3e
commit df79184faf
16 changed files with 348 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/softwareintegration/network/networkengine.cpp
View File

@@ -37,6 +37,8 @@ namespace {
namespace openspace {
using namespace softwareintegration;
NetworkEngine::NetworkEngine(const int port)
: _port{port}
{}

4
modules/softwareintegration/network/networkengine.h
View File

@@ -28,7 +28,7 @@
#include <modules/softwareintegration/network/softwareconnection.h>
#include <modules/softwareintegration/pointdatamessagehandler.h>
#include <modules/softwareintegration/interruptibleconcurrentqueue.h>
#include <modules/softwareintegration/simp.h>
#include <modules/softwareintegration/utils.h>
#include <ghoul/io/socket/tcpsocketserver.h>
namespace openspace {
@@ -40,7 +40,7 @@ public:
struct IncomingMessage {
size_t connection_id{1};
SoftwareConnection::Message message{ simp::MessageType::Unknown };
SoftwareConnection::Message message{ softwareintegration::simp::MessageType::Unknown };
};
void start();

8
modules/softwareintegration/network/softwareconnection.cpp
View File

@@ -266,11 +266,11 @@ SoftwareConnection::Message SoftwareConnection::receiveMessageFromSoftware() {
}
// Make sure that header matches the protocol version
if (protocolVersionIn != simp::ProtocolVersion) {
if (protocolVersionIn != softwareintegration::simp::ProtocolVersion) {
throw SoftwareConnectionLostError(fmt::format(
"Protocol versions do not match. Remote version: {}, Local version: {}",
protocolVersionIn,
simp::ProtocolVersion
softwareintegration::simp::ProtocolVersion
));
}
@@ -294,10 +294,10 @@ SoftwareConnection::Message SoftwareConnection::receiveMessageFromSoftware() {
// }
// LDEBUG(fmt::format("Message received with header: {}", rawHeader));
auto typeEnum = simp::getMessageType(type);
auto typeEnum = softwareintegration::simp::getMessageType(type);
// Receive the message data
if (typeEnum != simp::MessageType::Disconnection && typeEnum != simp::MessageType::Unknown) {
if (typeEnum != softwareintegration::simp::MessageType::Disconnection && typeEnum != softwareintegration::simp::MessageType::Unknown) {
subjectBuffer.resize(subjectSize);
if (!_socket->get(subjectBuffer.data(), subjectSize)) {
throw SoftwareConnectionLostError("Failed to read message from socket. Disconnecting.");

4
modules/softwareintegration/network/softwareconnection.h
View File

@@ -26,7 +26,7 @@
#define __OPENSPACE_MODULE_SOFTWAREINTEGRATION___SOFTWARECONNECTION___H__
#include <openspace/network/messagestructures.h>
#include <modules/softwareintegration/simp.h>
#include <modules/softwareintegration/utils.h>
#include <ghoul/io/socket/tcpsocket.h>
#include <openspace/properties/property.h>
@@ -44,7 +44,7 @@ public:
using SubscribedProperties = std::unordered_map<std::string, PropertySubscriptions>;
struct Message {
simp::MessageType type;
softwareintegration::simp::MessageType type;
std::vector<char> content{};
std::string rawMessageType{ "" };
};