mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 13:38:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simp 1.9. Added linear size.

Browse Source
This commit is contained in:
Victor Lindquist
2022-05-21 13:34:03 -06:00
parent 47a5c8e299
commit 193c7cdf3e
11 changed files with 488 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/softwareintegration/network/softwareconnection.cpp
+39 -3
View File
@@ -70,7 +70,7 @@ SoftwareConnection::~SoftwareConnection() {
}
void SoftwareConnection::addPropertySubscription(
const std::string propertyName,
const std::string& propertyName,
const std::string& identifier,
std::function<void()> newHandler
) {
@@ -101,7 +101,7 @@ void SoftwareConnection::addPropertySubscription(
auto propertySubscription = propertySubscriptions->second.find(propertyName);
if (propertySubscription != propertySubscriptions->second.end()) {
// Property subscription already exists
removeExistingPropertySubscription(identifier, property, onChangeHandle);
removeExistingPropertySubscription(identifier, property, propertySubscription->second);
propertySubscription->second = onChangeHandle;
}
else {
@@ -112,7 +112,7 @@ void SoftwareConnection::addPropertySubscription(
else {
// No properties have been subscribed to on this SGN
PropertySubscriptions newPropertySubscriptionMap{ { propertyName, onChangeHandle } };
_subscribedProperties.emplace(identifier, std::move(newPropertySubscriptionMap));
_subscribedProperties.emplace(identifier, newPropertySubscriptionMap);
}
}
@@ -161,6 +161,42 @@ void SoftwareConnection::removeExistingPropertySubscription(
propertySubscriptions->second.erase(property->identifier());
}
void SoftwareConnection::PointDataMessageHandlerFriends::removePropertySubscription(
std::shared_ptr<SoftwareConnection> connectionPtr,
const std::string& propertyName,
const std::string& identifier
) {
// Get renderable
auto r = renderable(identifier);
if (!r) {
LWARNING(fmt::format(
"Couldn't remove property subscription. Renderable \"{}\" doesn't exist",
identifier
));
return;
}
if (!r->hasProperty(propertyName)) {
LWARNING(fmt::format(
"Couldn't remove property subscription. Property \"{}\" doesn't exist on \"{}\"",
propertyName, identifier
));
return;
}
auto property = r->property(propertyName);
auto propertySubscriptions = connectionPtr->_subscribedProperties.find(identifier);
if (propertySubscriptions != connectionPtr->_subscribedProperties.end()) {
// At least one property have been subscribed to on this SGN
auto propertySubscription = propertySubscriptions->second.find(propertyName);
if (propertySubscription != propertySubscriptions->second.end()) {
// Property subscription already exists
connectionPtr->removeExistingPropertySubscription(identifier, property, propertySubscription->second);
}
}
}
void SoftwareConnection::disconnect() {
_socket->disconnect();
}