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

Point data has correct postion in OpenSpace. Speckfile code removed from module and renderable.

Browse Source
This commit is contained in:
aniisaaden
2020-10-08 15:02:32 +02:00
parent c71465f507
commit 064a01281b
4 changed files with 5 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/softwareintegration/softwareintegrationmodule.cpp
View File

@@ -191,16 +191,14 @@ namespace openspace {
case SoftwareConnection::MessageType::AddSceneGraphNode: {
std::string identifier = readIdentifier(message);
glm::vec3 color = readColor(message);
std::string file = readString(message);
float opacity = readFloatValue(message);
float size = readFloatValue(message);
std::string guiName = readString(message);
std::string guiName = readGUI(message);
ghoul::Dictionary renderable = {
{ "Type", "RenderablePointsCloud"s },
{ "Color", static_cast<glm::dvec3>(color)},
{ "Data", pointData },
//{ "File", file },
{ "Opacity", static_cast<double>(opacity) },
{ "Size", static_cast<double>(size)}
};
@@ -528,8 +526,7 @@ namespace openspace {
return identifier;
}
// Read File path or GUI Name
std::string SoftwareIntegrationModule::readString(std::vector<char>& message) {
std::string SoftwareIntegrationModule::readGUI(std::vector<char>& message) {
std::string length;
length.push_back(message[messageOffset]);
messageOffset++;