mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 21:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/getting-started-tour

Browse Source 
# Conflicts:
#	modules/skybrowser/skybrowsermodule.cpp
This commit is contained in:
Ylva Selling
2022-06-29 05:21:45 -04:00
parent 817fad60c3 4cb75f5820
commit b6e4f6dcaf
216 changed files with 1007 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/server/include/serverinterface.h
View File

@@ -42,7 +42,7 @@ public:
const ghoul::Dictionary& dictionary);
ServerInterface(const ghoul::Dictionary& dictionary);
~ServerInterface();
virtual ~ServerInterface() override;
void initialize();
void deinitialize();

2
modules/server/include/topics/bouncetopic.h
View File

@@ -34,7 +34,7 @@ class Connection;
class BounceTopic : public Topic {
public:
BounceTopic() = default;
virtual ~BounceTopic() = default;
~BounceTopic() override = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/documentationtopic.h
View File

@@ -32,7 +32,7 @@ namespace openspace {
class DocumentationTopic : public Topic {
public:
DocumentationTopic() = default;
virtual ~DocumentationTopic() = default;
~DocumentationTopic() override = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/enginemodetopic.h
View File

@@ -34,7 +34,7 @@ namespace openspace {
class EngineModeTopic : public Topic {
public:
EngineModeTopic();
virtual ~EngineModeTopic();
~EngineModeTopic() override;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/flightcontrollertopic.h
View File

@@ -39,7 +39,7 @@ namespace openspace {
class FlightControllerTopic : public Topic {
public:
FlightControllerTopic();
~FlightControllerTopic();
~FlightControllerTopic() override;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/getpropertytopic.h
View File

@@ -32,7 +32,7 @@ namespace openspace {
class GetPropertyTopic : public Topic {
public:
GetPropertyTopic() = default;
virtual ~GetPropertyTopic() = default;
~GetPropertyTopic() override = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/sessionrecordingtopic.h
View File

@@ -34,7 +34,7 @@ namespace openspace {
class SessionRecordingTopic : public Topic {
public:
SessionRecordingTopic();
virtual ~SessionRecordingTopic();
~SessionRecordingTopic() override;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/setpropertytopic.h
View File

@@ -32,7 +32,7 @@ namespace openspace {
class SetPropertyTopic : public Topic {
public:
SetPropertyTopic() = default;
virtual ~SetPropertyTopic() = default;
~SetPropertyTopic() override = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/shortcuttopic.h
View File

@@ -31,7 +31,7 @@ namespace openspace {
class ShortcutTopic : public Topic {
public:
virtual ~ShortcutTopic() = default;
~ShortcutTopic() override = default;
void handleJson(const nlohmann::json& input) override;
bool isDone() const override;

2
modules/server/include/topics/skybrowsertopic.h
View File

@@ -33,7 +33,7 @@ namespace openspace {
class SkyBrowserTopic : public Topic {
public:
SkyBrowserTopic();
virtual ~SkyBrowserTopic();
~SkyBrowserTopic() override;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/subscriptiontopic.h
View File

@@ -34,7 +34,7 @@ namespace openspace {
class SubscriptionTopic : public Topic {
public:
SubscriptionTopic() = default;
~SubscriptionTopic();
~SubscriptionTopic() override;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/timetopic.h
View File

@@ -33,7 +33,7 @@ namespace openspace {
class TimeTopic : public Topic {
public:
TimeTopic();
virtual ~TimeTopic();
~TimeTopic() override;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/triggerpropertytopic.h
View File

@@ -32,7 +32,7 @@ namespace openspace {
class TriggerPropertyTopic : public Topic {
public:
TriggerPropertyTopic() = default;
virtual ~TriggerPropertyTopic() = default;
~TriggerPropertyTopic() override = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/include/topics/versiontopic.h
View File

@@ -31,7 +31,7 @@ namespace openspace {
class VersionTopic : public Topic {
public:
virtual ~VersionTopic() = default;
~VersionTopic() override = default;
void handleJson(const nlohmann::json& json) override;
bool isDone() const override;

2
modules/server/servermodule.h
View File

@@ -53,7 +53,7 @@ public:
using CallbackFunction = std::function<void()>;
ServerModule();
virtual ~ServerModule();
virtual ~ServerModule() override;
ServerInterface* serverInterfaceByIdentifier(const std::string& identifier);