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

Properly disable appropriate code when compiled without globebrowsing support (closes #3146)

Browse Source
This commit is contained in:
Alexander Bock
2024-04-07 17:44:21 +02:00
parent 88decaf414
commit 2a88521795
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/server/src/topics/cameratopic.cpp
View File

@@ -24,7 +24,9 @@
#include <modules/server/include/topics/cameratopic.h>
#ifdef OPENSPACE_MODULE_SPACE_ENABLED
#include <modules/globebrowsing/globebrowsingmodule.h>
#endif // OPENSPACE_MODULE_SPACE_ENABLED
#include <modules/server/include/connection.h>
#include <modules/server/servermodule.h>
#include <openspace/engine/moduleengine.h>
@@ -79,6 +81,7 @@ void CameraTopic::handleJson(const nlohmann::json& json) {
}
void CameraTopic::sendCameraData() {
#ifdef OPENSPACE_MODULE_SPACE_ENABLED
GlobeBrowsingModule* module = global::moduleEngine->module<GlobeBrowsingModule>();
glm::dvec3 position = module->geoPosition();
std::pair<double, std::string_view> altSimplified = simplifyDistance(position.z);
@@ -91,6 +94,12 @@ void CameraTopic::sendCameraData() {
};
_connection->sendJson(wrappedPayload(jsonData));
#else // ^^^ OPENSPACE_MODULE_SPACE_ENABLED ||| !OPENSPACE_MODULE_SPACE_ENABLED vvv
LWARNINGC(
"CameraTopic",
"Cannot send camera data, compiled without globebrowsing support"
);
#endif // OPENSPACE_MODULE_SPACE_ENABLED
}
} // namespace openspace