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

Fix for handling nan values in data

Browse Source
This commit is contained in:
Emma Broman
2021-02-08 09:31:24 +01:00
parent 65d70c5965
commit e18f106084
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/softwareintegration/rendering/renderablepointscloud.cpp
+3 -2
View File
@@ -123,7 +123,8 @@ RenderablePointsCloud::RenderablePointsCloud(const ghoul::Dictionary& dictionary
ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(DataInfo.identifier);
for (int i = 0; i < static_cast<int>(d.size()); ++i) {
_pointData.push_back(d.value<glm::dvec3>(std::to_string(i + 1)));
const std::string key = std::to_string(i + 1);
_pointData.push_back(d.value<glm::dvec3>(key));
}
addProperty(_opacity);
@@ -287,7 +288,7 @@ void RenderablePointsCloud::createDataSlice() {
void RenderablePointsCloud::loadData() {
if (_pointData.empty()) {
LERROR("No point data found");
LWARNING("No point data found");
return;
}
modules/softwareintegration/softwareintegrationmodule.cpp
+9 -1
View File
@@ -252,9 +252,17 @@ void SoftwareIntegrationModule::handlePeerMessage(PeerMessage peerMessage) {
float x = xCoordinates[i];
float y = yCoordinates[i];
float z = zCoordinates[i];
glm::dvec3 point{ x, y, z };
const std::string key = fmt::format("[{}]", i + 1);
pointDataDictonary.setValue<glm::dvec3>(key, { x, y, z });
// Avoid passing nan values through dictionary
if (glm::any(glm::isnan(point))) {
point = glm::dvec3(0.0);
// @TODO Keep track of invalid indices?
}
pointDataDictonary.setValue<glm::dvec3>(key, point);
}
// Create a renderable