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

Started the process of creating a callback in our module for property changes in our renderable

Browse Source
This commit is contained in:
johannagranstrom
2020-09-17 17:04:51 +02:00
parent b0403489ac
commit 29a42e2c55
2 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/softwareintegration/softwareintegrationmodule.cpp
+48 -59
View File
@@ -52,8 +52,6 @@
using namespace std::string_literals;
#pragma optimize {"",off}
namespace {
constexpr const char* _loggerCat = "SoftwareIntegrationModule";
} // namespace
@@ -137,9 +135,6 @@ namespace openspace {
throw SoftwareConnectionLostError();
}
// TESTING SENDING MESSAGE
handleProperties();
// Read message type: Byte 1-4
std::string type;
for(int i = 1; i < 5; i++)
@@ -188,77 +183,67 @@ namespace openspace {
return true;
}
void SoftwareConnection::handleProperties() {
void SoftwareConnection::handleProperties(std::string identifier) {
std::string messageType;
std::string propertyValue;
std::string identifier = "testtesttest";
std::string subject;
std::string lengthOfSubject;
std::string lengthOfIdentifier = std::to_string(identifier.length());
std::string lengthOfValue;
/*std::string message;
std::string message;
const Renderable* myRenderable = renderable(identifier);
properties::Property* colorProperty = myRenderable->property("Color");
properties::Property* opacityProperty = myRenderable->property("Opacity");
properties::Property* sizeProperty = myRenderable->property("Size");
// Update color of renderable
/*const Renderable* myrenderable = renderable("RenderablePointsCloud");
properties::Property* colorProperty = myrenderable->property("Color");
// colorProperty->onChange([&]() {
propertyValue = colorProperty->getStringValue();
lengthOfValue = std::to_string(propertyValue.length());
messageType = "UPCO";
subject = lengthOfIdentifier + identifier + lengthOfValue + propertyValue;
//auto onChange =
colorProperty->onChange([&colorProperty, identifier, &message]() {
std::string lengthOfIdentifier = std::to_string(identifier.length());
std::string propertyValue = colorProperty->getStringValue();
std::string lengthOfValue = std::to_string(propertyValue.length());
std::string messageType = "UPCO";
std::string subject = lengthOfIdentifier + identifier + lengthOfValue + propertyValue;
// Format length of subject to always be 4 digits
std::ostringstream os;
os << std::setfill('0') << std::setw(4) << subject.length();
lengthOfSubject = os.str();
// Format length of subject to always be 4 digits
std::ostringstream os;
os << std::setfill('0') << std::setw(4) << subject.length();
std::string lengthOfSubject = os.str();
message = messageType + lengthOfSubject + subject;
message = messageType + lengthOfSubject + subject;
});
sendMessage(message);
LERROR(fmt::format("Meddelandet som skickas {}", message));
// Update opacity of renderable
const Renderable* myrenderable = renderable("RenderablePointsCloud");
properties::Property* opacityProperty = myrenderable->property("Opacity");
//opacityProperty->onChange([&]() {
propertyValue = opacityProperty->getStringValue();
lengthOfValue = std::to_string(propertyValue.length());
messageType = "UPOP";
subject = lengthOfIdentifier + identifier + lengthOfValue + propertyValue;
opacityProperty->onChange([&]() {
propertyValue = opacityProperty->getStringValue();
lengthOfValue = std::to_string(propertyValue.length());
messageType = "UPOP";
subject = lengthOfIdentifier + identifier + lengthOfValue + propertyValue;
// Format length of subject to always be 4 digits
std::ostringstream os;
os << std::setfill('0') << std::setw(4) << subject.length();
lengthOfSubject = os.str();
std::ostringstream os;
os << std::setfill('0') << std::setw(4) << subject.length();
lengthOfSubject = os.str();
message = messageType + lengthOfSubject + subject;
message = messageType + lengthOfSubject + subject;
sendMessage(message);
LERROR(fmt::format("Meddelandet som skickas {}", message));*/
sendMessage(message);
LERROR(fmt::format("Meddelandet som skickas {}", message));
});
// Update size of renderable
const Renderable* myrenderable = renderable("RenderablePointsCloud");
properties::Property* sizeProperty = myrenderable->property("Size");;
//opacityProperty->onChange([&]() {
propertyValue = sizeProperty->getStringValue();
lengthOfValue = std::to_string(propertyValue.length());
messageType = "UPSI";
subject = lengthOfIdentifier + identifier + lengthOfValue + propertyValue;
sizeProperty->onChange([&]() {
propertyValue = sizeProperty->getStringValue();
lengthOfValue = std::to_string(propertyValue.length());
messageType = "UPSI";
subject = lengthOfIdentifier + identifier + lengthOfValue + propertyValue;
// Format length of subject to always be 4 digits
std::ostringstream os;
os << std::setfill('0') << std::setw(4) << subject.length();
lengthOfSubject = os.str();
std::ostringstream os;
os << std::setfill('0') << std::setw(4) << subject.length();
lengthOfSubject = os.str();
message = messageType + lengthOfSubject + subject;
message = messageType + lengthOfSubject + subject;
sendMessage(message);
LERROR(fmt::format("Meddelandet som skickas {}", message));
sendMessage(message);
LERROR(fmt::format("Meddelandet som skickas {}", message));
});*/
}
// Server
@@ -404,6 +389,10 @@ namespace openspace {
e.what())
);
}
//SoftwareConnection prop;
//prop.handleProperties(identifier);
break;
}
case SoftwareConnection::MessageType::RemoveSceneGraphNode: {
@@ -442,7 +431,7 @@ namespace openspace {
float size = readFloatValue(message);
// Update size of renderable
const Renderable * myrenderable = renderable(identifier);
const Renderable* myrenderable = renderable(identifier);
properties::Property* sizeProperty = myrenderable->property("Size");
sizeProperty->set(size);
break;
modules/softwareintegration/softwareintegrationmodule.h
+2 -1
View File
@@ -71,6 +71,7 @@ public:
explicit SoftwareConnectionLostError();
};
SoftwareConnection() = default;
SoftwareConnection(std::unique_ptr<ghoul::io::TcpSocket> socket);
// Connection
@@ -80,7 +81,7 @@ public:
bool sendMessage(std::string message);
//bool sendMessage(const SoftwareConnection::Message& message);
void handleProperties();
void handleProperties(std::string identifier);
SoftwareConnection::Message receiveMessage();