From 1e582f11af349f434d74e92f672d97d474608849 Mon Sep 17 00:00:00 2001 From: Emma Broman Date: Mon, 1 Feb 2021 17:09:33 +0100 Subject: [PATCH] More cleanup --- .../softwareintegrationmodule.cpp | 112 +++++++++--------- .../softwareintegrationmodule.h | 10 +- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/modules/softwareintegration/softwareintegrationmodule.cpp b/modules/softwareintegration/softwareintegrationmodule.cpp index 8c49a6b342..0073eeb57a 100644 --- a/modules/softwareintegration/softwareintegrationmodule.cpp +++ b/modules/softwareintegration/softwareintegrationmodule.cpp @@ -211,36 +211,36 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) { break; } case SoftwareConnection::MessageType::ReadPointData: { - messageOffset = 0; // Resets message offset + _messageOffset = 0; // Resets message offset std::vector xCoordinates = readData(message); std::vector yCoordinates = readData(message); std::vector zCoordinates = readData(message); int size = xCoordinates.size(); - pointData.clear(); + _pointData.clear(); for (int i = 0; i < size; i++) { float x = xCoordinates[i]; float y = yCoordinates[i]; float z = zCoordinates[i]; - pointData.push_back({ x, y, z }); + _pointData.push_back({ x, y, z }); } break; } case SoftwareConnection::MessageType::ReadLuminosityData: { - messageOffset = 0; // Resets message offset + _messageOffset = 0; // Resets message offset - luminosityData.clear(); - luminosityData = readData(message); + _luminosityData.clear(); + _luminosityData = readData(message); break; } case SoftwareConnection::MessageType::ReadVelocityData: { - messageOffset = 0; // Resets message offset + _messageOffset = 0; // Resets message offset - velocityData.clear(); - velocityData = readData(message); + _velocityData.clear(); + _velocityData = readData(message); break; } case SoftwareConnection::MessageType::AddSceneGraphNode: { @@ -256,8 +256,8 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) { std::string guiName = readGUI(message); ghoul::Dictionary pointDataDictonary; - for (int i = 0; i < pointData.size(); ++i) { - pointDataDictonary.setValue(fmt::format("[{}]", i + 1), pointData[i]); + for (int i = 0; i < _pointData.size(); ++i) { + pointDataDictonary.setValue(fmt::format("[{}]", i + 1), _pointData[i]); } // Create a renderable depending on what data was received @@ -268,21 +268,21 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) { renderable.setValue("Size", static_cast(size)); renderable.setValue("Data", pointDataDictonary); - bool hasLuminosityData = !luminosityData.empty(); - bool hasVelocityData = !velocityData.empty(); + bool hasLuminosityData = !_luminosityData.empty(); + bool hasVelocityData = !_velocityData.empty(); if (hasLuminosityData) { ghoul::Dictionary luminosityDataDictonary; - for (int i = 0; i < luminosityData.size(); ++i) { - luminosityDataDictonary.setValue(fmt::format("[{}]", i + 1), luminosityData[i]); + for (int i = 0; i < _luminosityData.size(); ++i) { + luminosityDataDictonary.setValue(fmt::format("[{}]", i + 1), _luminosityData[i]); } renderable.setValue("Luminosity", luminosityDataDictonary); } if (hasVelocityData) { ghoul::Dictionary velocityDataDictionary; - for (int i = 0; i < velocityData.size(); ++i) { - velocityDataDictionary.setValue(fmt::format("[{}]", i + 1), velocityData[i]); + for (int i = 0; i < _velocityData.size(); ++i) { + velocityDataDictionary.setValue(fmt::format("[{}]", i + 1), _velocityData[i]); } renderable.setValue("Velocity", velocityDataDictionary); } @@ -398,7 +398,7 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) { LDEBUG(fmt::format("Message recieved.. New Visibility: {}", visibilityMessage)); std::string identifier = readIdentifier(message); std::string visibility; - visibility.push_back(message[messageOffset]); + visibility.push_back(message[_messageOffset]); bool boolValue = (visibility == "F") ? false : true; // Toggle visibility of renderable @@ -526,15 +526,15 @@ void SoftwareIntegrationModule::subscribeToRenderableUpdates(std::string identif // Read size value or opacity value float SoftwareIntegrationModule::readFloatValue(std::vector& message) { std::string length; - length.push_back(message[messageOffset]); - messageOffset++; + length.push_back(message[_messageOffset]); + _messageOffset++; int lengthOfValue = stoi(length); std::string value; int counter = 0; while (counter != lengthOfValue) { - value.push_back(message[messageOffset]); - messageOffset++; + value.push_back(message[_messageOffset]); + _messageOffset++; counter++; } return std::stof(value); @@ -542,39 +542,39 @@ float SoftwareIntegrationModule::readFloatValue(std::vector& message) { glm::vec3 SoftwareIntegrationModule::readColor(std::vector& message) { std::string lengthOfColor; // Not used for now, but sent in message - lengthOfColor.push_back(message[messageOffset]); - messageOffset++; - lengthOfColor.push_back(message[messageOffset]); - messageOffset++; + lengthOfColor.push_back(message[_messageOffset]); + _messageOffset++; + lengthOfColor.push_back(message[_messageOffset]); + _messageOffset++; // Color is recieved in a string-format of (redValue, greenValue, blueValue) // Therefore, we have to iterate through the message and ignore characters // "( , )" and separate the values in the string std::string red; - while (message[messageOffset] != ',') { - if (message[messageOffset] == '(') { - messageOffset++; + while (message[_messageOffset] != ',') { + if (message[_messageOffset] == '(') { + _messageOffset++; } else { - red.push_back(message[messageOffset]); - messageOffset++; + red.push_back(message[_messageOffset]); + _messageOffset++; } } - messageOffset++; + _messageOffset++; std::string green; - while (message[messageOffset] != ',') { - green.push_back(message[messageOffset]); - messageOffset++; + while (message[_messageOffset] != ',') { + green.push_back(message[_messageOffset]); + _messageOffset++; } - messageOffset++; + _messageOffset++; std::string blue; - while (message[messageOffset] != ')') { - blue.push_back(message[messageOffset]); - messageOffset++; + while (message[_messageOffset] != ')') { + blue.push_back(message[_messageOffset]); + _messageOffset++; } - messageOffset++; + _messageOffset++; // Convert red, green, blue strings to floats float r = std::stof(red); @@ -586,17 +586,17 @@ glm::vec3 SoftwareIntegrationModule::readColor(std::vector& message) { std::string SoftwareIntegrationModule::readGUI(std::vector& message) { std::string length; - length.push_back(message[messageOffset]); - messageOffset++; - length.push_back(message[messageOffset]); - messageOffset++; + length.push_back(message[_messageOffset]); + _messageOffset++; + length.push_back(message[_messageOffset]); + _messageOffset++; int lengthOfGuiName = stoi(length); std::string guiName; int counter = 0; while (counter != lengthOfGuiName) { - guiName.push_back(message[messageOffset]); - messageOffset++; + guiName.push_back(message[_messageOffset]); + _messageOffset++; counter++; } @@ -610,12 +610,12 @@ std::string SoftwareIntegrationModule::readIdentifier(std::vector& message int lengthOfIdentifier = stoi(length); int counter = 0; - messageOffset = 2; // Resets messageOffset + _messageOffset = 2; // Resets messageOffset std::string identifier; while (counter != lengthOfIdentifier) { - identifier.push_back(message[messageOffset]); - messageOffset++; + identifier.push_back(message[_messageOffset]); + _messageOffset++; counter++; } @@ -624,11 +624,11 @@ std::string SoftwareIntegrationModule::readIdentifier(std::vector& message std::vector SoftwareIntegrationModule::readData(std::vector& message) { std::string length; - int lengthOffset = messageOffset + 9; // 9 first bytes is the length of the data + int lengthOffset = _messageOffset + 9; // 9 first bytes is the length of the data - for (int i = messageOffset; i < lengthOffset; i++) { + for (int i = _messageOffset; i < lengthOffset; i++) { length.push_back(message[i]); - messageOffset++; + _messageOffset++; } int lengthOfData = stoi(length); @@ -638,15 +638,15 @@ std::vector SoftwareIntegrationModule::readData(std::vector& messag std::string value; while (counter != lengthOfData) { - while (message[messageOffset] != ',') { - value.push_back(message[messageOffset]); - messageOffset++; + while (message[_messageOffset] != ',') { + value.push_back(message[_messageOffset]); + _messageOffset++; counter++; } float dataValue = stof(value); data.push_back(dataValue); value = ""; - messageOffset++; + _messageOffset++; counter++; } diff --git a/modules/softwareintegration/softwareintegrationmodule.h b/modules/softwareintegration/softwareintegrationmodule.h index da9a670fc9..157fe18939 100644 --- a/modules/softwareintegration/softwareintegrationmodule.h +++ b/modules/softwareintegration/softwareintegrationmodule.h @@ -46,8 +46,6 @@ public: size_t nConnections() const; - size_t messageOffset = 0; - std::vector documentations() const override; private: @@ -86,9 +84,11 @@ private: std::string readIdentifier(std::vector& message); std::vector readData(std::vector& message); - std::vector pointData; - std::vector luminosityData; - std::vector velocityData; + size_t _messageOffset = 0; + + std::vector _pointData; + std::vector _luminosityData; + std::vector _velocityData; std::unordered_map> _peers; mutable std::mutex _peerListMutex;