mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-19 11:29:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ubuntu 22.04 and GCC11 fixes (#2163)

Browse Source 
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
This commit is contained in:
Alexander Bock
2022-06-28 00:46:01 +02:00
committed by GitHub
parent fd1589209d
commit 9b1143f02f
139 changed files with 172 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -1,8 +1,5 @@
# Build and editor thing
/build/
/build-ninja/
/build-xcode/
/build-make/
/build*/
*~
*.dir
*.idea/

2
CMakeLists.txt
View File

@@ -158,7 +158,6 @@ if (UNIX)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE" CACHE STRING "" FORCE)
endif()
endif ()
set(ASSIMP_BUILD_MINIZIP ON CACHE BOOL "Set to have assimp build minizip" FORCE)
endif ()
add_subdirectory(ext)
@@ -197,6 +196,7 @@ if (APPLE)
"~/Qt/5.11/clang_64/lib/cmake"
"~/Qt/5.12/clang_64/lib/cmake"
"~/Qt/5.15.1/clang_64/lib/cmake"
"~/Qt/6.2.3/macos/lib/cmake"
)
endif ()

4
apps/OpenSpace/ext/launcher/src/sgctedit/displaywindowunion.cpp
View File

@@ -48,8 +48,8 @@ void DisplayWindowUnion::createWidgets(int nMaxWindows,
std::array<QColor, 4> windowColors)
{
// Add all window controls (some will be hidden from GUI initially)
for (unsigned int i = 0; i < nMaxWindows; ++i) {
const unsigned int monitorNumForThisWindow = (nMaxWindows > 3 && i >= 2) ? 1 : 0;
for (int i = 0; i < nMaxWindows; ++i) {
const int monitorNumForThisWindow = (nMaxWindows > 3 && i >= 2) ? 1 : 0;
WindowControl* ctrl = new WindowControl(
monitorNumForThisWindow,

2
apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
View File

@@ -183,7 +183,7 @@ void SgctEdit::save() {
"window 2 has to be bigger than window 3 (if it exists), and window 3 has to "
"be bigger than window 4.\nOtherwise, rendering errors might occur.\n\nAre "
"you sure you want to continue?",
QMessageBox::StandardButtons(QMessageBox::Yes || QMessageBox::No)
QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No)
);
if (ret == QMessageBox::No) {
return;

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: 47167ca513...ad940a5c95

2
ext/ghoul

Submodule ext/ghoul updated: fd981861ba...7dc41a163e

4
include/openspace/interaction/sessionrecording.h
View File

@@ -101,7 +101,7 @@ public:
SessionRecording();
SessionRecording(bool isGlobal);
~SessionRecording();
~SessionRecording() override;
/**
* Used to de-initialize the session recording feature. Any recording or playback
@@ -837,7 +837,7 @@ protected:
class SessionRecording_legacy_0085 : public SessionRecording {
public:
SessionRecording_legacy_0085() : SessionRecording() {}
~SessionRecording_legacy_0085() {}
~SessionRecording_legacy_0085() override {}
char FileHeaderVersion[FileHeaderVersionLength+1] = "00.85";
char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
std::string fileFormatVersion() override {

2
include/openspace/interaction/tasks/convertrecfileversiontask.h
View File

@@ -37,7 +37,7 @@ namespace openspace::interaction {
class ConvertRecFileVersionTask : public Task {
public:
ConvertRecFileVersionTask(const ghoul::Dictionary& dictionary);
~ConvertRecFileVersionTask();
~ConvertRecFileVersionTask() override;
std::string description() override;
void perform(const Task::ProgressCallback& progressCallback) override;
static documentation::Documentation documentation();

2
include/openspace/interaction/tasks/convertrecformattask.h
View File

@@ -41,7 +41,7 @@ public:
ToBinary
};
ConvertRecFormatTask(const ghoul::Dictionary& dictionary);
~ConvertRecFormatTask();
~ConvertRecFormatTask() override;
std::string description() override;
void perform(const Task::ProgressCallback& progressCallback) override;
static documentation::Documentation documentation();

2
include/openspace/navigation/navigationhandler.h
View File

@@ -61,7 +61,7 @@ class PathNavigator;
class NavigationHandler : public properties::PropertyOwner {
public:
NavigationHandler();
~NavigationHandler();
virtual ~NavigationHandler() override;
void initialize();
void deinitialize();

2
include/openspace/navigation/pathnavigator.h
View File

@@ -51,7 +51,7 @@ class Path;
class PathNavigator : public properties::PropertyOwner {
public:
PathNavigator();
~PathNavigator();
virtual ~PathNavigator() override;
// Accessors
Camera* camera() const;

2
include/openspace/network/parallelpeer.h
View File

@@ -47,7 +47,7 @@ namespace scripting { struct LuaLibrary; }
class ParallelPeer : public properties::PropertyOwner {
public:
ParallelPeer();
~ParallelPeer();
~ParallelPeer() override;
void connect();
void setPort(std::string port);

2
include/openspace/properties/listproperty.h
View File

@@ -35,7 +35,7 @@ class ListProperty : public TemplateProperty<std::vector<T>> {
public:
ListProperty(Property::PropertyInfo info, std::vector<T> values);
virtual ~ListProperty() = 0;
virtual ~ListProperty() override = 0;
};
} // namespace openspace::properties

2
include/openspace/properties/propertyowner.h
View File

@@ -77,7 +77,7 @@ public:
* The destructor will remove all Propertys and PropertyOwners it owns along with
* itself.
*/
virtual ~PropertyOwner();
virtual ~PropertyOwner() override;
/**
* Sets the identifier for this PropertyOwner. If the PropertyOwner does not have an

2
include/openspace/rendering/dashboard.h
View File

@@ -41,7 +41,7 @@ namespace scripting { struct LuaLibrary; }
class Dashboard : public properties::PropertyOwner {
public:
Dashboard();
~Dashboard() = default;
virtual ~Dashboard() override = default;
void render(glm::vec2& penPosition);

2
include/openspace/rendering/framebufferrenderer.h
View File

@@ -58,7 +58,7 @@ class FramebufferRenderer : public RaycasterListener,
public DeferredcasterListener
{
public:
virtual ~FramebufferRenderer() = default;
virtual ~FramebufferRenderer() override final = default;
void initialize();
void deinitialize();

2
include/openspace/rendering/luaconsole.h
View File

@@ -46,7 +46,7 @@ namespace openspace {
class LuaConsole : public properties::PropertyOwner {
public:
LuaConsole();
~LuaConsole();
~LuaConsole() override;
void initialize();
void deinitialize();

2
include/openspace/rendering/renderable.h
View File

@@ -65,7 +65,7 @@ public:
ghoul::Dictionary dictionary);
Renderable(const ghoul::Dictionary& dictionary);
virtual ~Renderable() = default;
virtual ~Renderable() override = default;
virtual void initialize();
virtual void initializeGL();

2
include/openspace/rendering/renderengine.h
View File

@@ -66,7 +66,7 @@ struct ShutdownInformation;
class RenderEngine : public properties::PropertyOwner {
public:
RenderEngine();
~RenderEngine();
virtual ~RenderEngine() override;
void initialize();
void initializeGL();

2
include/openspace/rendering/screenspacerenderable.h
View File

@@ -58,7 +58,7 @@ public:
static constexpr const char* KeyIdentifier = "Identifier";
ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
virtual ~ScreenSpaceRenderable();
virtual ~ScreenSpaceRenderable() override;
virtual void render();

2
include/openspace/scene/lightsource.h
View File

@@ -47,7 +47,7 @@ public:
LightSource();
LightSource(const ghoul::Dictionary& dictionary);
virtual ~LightSource() = default;
~LightSource() override = default;
virtual glm::vec3 directionViewSpace(const RenderData& renderData) const = 0;

2
include/openspace/scene/rotation.h
View File

@@ -45,7 +45,7 @@ public:
const ghoul::Dictionary& dictionary);
Rotation();
virtual ~Rotation() = default;
virtual ~Rotation() override = default;
virtual bool initialize();

2
include/openspace/scene/scale.h
View File

@@ -45,7 +45,7 @@ public:
const ghoul::Dictionary& dictionary);
Scale();
virtual ~Scale() = default;
virtual ~Scale() override = default;
virtual bool initialize();

2
include/openspace/scene/scene.h
View File

@@ -82,7 +82,7 @@ public:
// constructors & destructor
Scene(std::unique_ptr<SceneInitializer> initializer);
~Scene();
virtual ~Scene() override;
/**
* Clear the scene graph,

2
include/openspace/scene/scenegraphnode.h
View File

@@ -81,7 +81,7 @@ public:
static constexpr const char* KeyTag = "Tag";
SceneGraphNode();
~SceneGraphNode();
virtual ~SceneGraphNode() override;
static ghoul::mm_unique_ptr<SceneGraphNode> createFromDictionary(
const ghoul::Dictionary& dictionary);

2
include/openspace/scene/timeframe.h
View File

@@ -45,7 +45,7 @@ public:
const ghoul::Dictionary& dictionary);
TimeFrame();
virtual ~TimeFrame() = default;
virtual ~TimeFrame() override = default;
virtual bool initialize();

2
include/openspace/scene/translation.h
View File

@@ -47,7 +47,7 @@ public:
const ghoul::Dictionary& dictionary);
Translation();
virtual ~Translation() = default;
virtual ~Translation() override = default;
virtual bool initialize();
virtual void update(const UpdateData& data);

4
include/openspace/util/httprequest.h
View File

@@ -375,7 +375,7 @@ public:
* This destructor will cancel any ongoing download and wait for its completion, so it
* might not block for a short amount of time.
*/
virtual ~HttpFileDownload() = default;
virtual ~HttpFileDownload() override = default;
/**
* Returns the path where the contents of the URL provided in the constructor will be
@@ -443,7 +443,7 @@ public:
* This destructor will cancel any ongoing download and wait for its completion, so it
* might not block for a short amount of time.
*/
virtual ~HttpMemoryDownload() = default;
virtual ~HttpMemoryDownload() override = default;
/**
* Returns a reference to the buffer that is used to store the contents of the URL

2
include/openspace/util/openspacemodule.h
View File

@@ -58,7 +58,7 @@ public:
OpenSpaceModule(std::string name);
/// Default destructor
virtual ~OpenSpaceModule() = default;
virtual ~OpenSpaceModule() override = default;
/**
* Initialization method that will register a token of the form

2
include/openspace/util/screenlog.h
View File

@@ -82,7 +82,7 @@ public:
/**
* Destructor
*/
~ScreenLog() = default;
~ScreenLog() override = default;
/**
* Overwritten ghoul::loggling::Log method that is called whenever a new log message

2
modules/atmosphere/rendering/atmospheredeferredcaster.h
View File

@@ -59,7 +59,7 @@ class AtmosphereDeferredcaster : public Deferredcaster {
public:
AtmosphereDeferredcaster(float textureScale,
std::vector<ShadowConfiguration> shadowConfigArray, bool saveCalculatedTextures);
virtual ~AtmosphereDeferredcaster() = default;
~AtmosphereDeferredcaster() override = default;
void initialize();
void deinitialize();

2
modules/base/basemodule.h
View File

@@ -37,7 +37,7 @@ public:
constexpr static const char* Name = "Base";
BaseModule();
virtual ~BaseModule() = default;
~BaseModule() override = default;
std::vector<documentation::Documentation> documentations() const override;
std::vector<scripting::LuaLibrary> luaLibraries() const override;

2
modules/base/dashboard/dashboarditemangle.h
View File

@@ -40,7 +40,7 @@ namespace documentation { struct Documentation; }
class DashboardItemAngle : public DashboardTextItem {
public:
DashboardItemAngle(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemAngle() = default;
~DashboardItemAngle() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemdate.h
View File

@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
class DashboardItemDate : public DashboardTextItem {
public:
DashboardItemDate(const ghoul::Dictionary& dictionary);
~DashboardItemDate() = default;
~DashboardItemDate() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemdistance.h
View File

@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
class DashboardItemDistance : public DashboardTextItem {
public:
DashboardItemDistance(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemDistance() = default;
~DashboardItemDistance() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemmission.h
View File

@@ -34,7 +34,7 @@ namespace documentation { struct Documentation; }
class DashboardItemMission : public DashboardTextItem {
public:
DashboardItemMission(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemMission() = default;
~DashboardItemMission() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemparallelconnection.h
View File

@@ -34,7 +34,7 @@ namespace documentation { struct Documentation; }
class DashboardItemParallelConnection : public DashboardTextItem {
public:
DashboardItemParallelConnection(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemParallelConnection() = default;
~DashboardItemParallelConnection() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditempropertyvalue.h
View File

@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
class DashboardItemPropertyValue : public DashboardTextItem {
public:
DashboardItemPropertyValue(const ghoul::Dictionary& dictionary);
~DashboardItemPropertyValue() = default;
~DashboardItemPropertyValue() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemsimulationincrement.h
View File

@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
class DashboardItemSimulationIncrement : public DashboardTextItem {
public:
DashboardItemSimulationIncrement(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemSimulationIncrement() = default;
~DashboardItemSimulationIncrement() override = default;
void render(glm::vec2& penPosition) override;
glm::vec2 size() const override;

2
modules/base/dashboard/dashboarditemspacing.h
View File

@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
class DashboardItemSpacing : public DashboardItem {
public:
DashboardItemSpacing(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemSpacing() = default;
~DashboardItemSpacing() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemtext.h
View File

@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
class DashboardItemText : public DashboardTextItem {
public:
DashboardItemText(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemText() = default;
~DashboardItemText() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/dashboard/dashboarditemvelocity.h
View File

@@ -40,7 +40,7 @@ namespace documentation { struct Documentation; }
class DashboardItemVelocity : public DashboardTextItem {
public:
DashboardItemVelocity(const ghoul::Dictionary& dictionary);
virtual ~DashboardItemVelocity() = default;
~DashboardItemVelocity() override = default;
void render(glm::vec2& penPosition) override;

2
modules/base/rendering/grids/renderableradialgrid.h
View File

@@ -44,7 +44,7 @@ namespace openspace {
class RenderableRadialGrid : public Renderable {
public:
RenderableRadialGrid(const ghoul::Dictionary& dictionary);
~RenderableRadialGrid() = default;
~RenderableRadialGrid() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/base/rendering/grids/renderablesphericalgrid.h
View File

@@ -41,7 +41,7 @@ namespace openspace {
class RenderableSphericalGrid : public Renderable {
public:
RenderableSphericalGrid(const ghoul::Dictionary& dictionary);
~RenderableSphericalGrid() = default;
~RenderableSphericalGrid() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/base/rendering/renderablecartesianaxes.h
View File

@@ -43,7 +43,7 @@ namespace openspace {
class RenderableCartesianAxes : public Renderable {
public:
RenderableCartesianAxes(const ghoul::Dictionary& dictionary);
~RenderableCartesianAxes() = default;
~RenderableCartesianAxes() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/base/rendering/renderablemodel.h
View File

@@ -57,7 +57,7 @@ namespace documentation { struct Documentation; }
class RenderableModel : public Renderable {
public:
RenderableModel(const ghoul::Dictionary& dictionary);
~RenderableModel() = default;
~RenderableModel() override = default;
void initialize() override;
void initializeGL() override;

2
modules/base/rendering/renderablenodeline.h
View File

@@ -46,7 +46,7 @@ class Translation;
class RenderableNodeLine : public Renderable {
public:
RenderableNodeLine(const ghoul::Dictionary& dictionary);
~RenderableNodeLine() = default;
~RenderableNodeLine() override = default;
static documentation::Documentation Documentation();

2
modules/base/rendering/renderabletrail.h
View File

@@ -91,7 +91,7 @@ struct Appearance : properties::PropertyOwner {
properties::OptionProperty renderingModes;
};
~RenderableTrail() = default;
virtual ~RenderableTrail() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/base/rendering/screenspacedashboard.h
View File

@@ -43,7 +43,7 @@ namespace scripting { struct LuaLibrary; }
class ScreenSpaceDashboard: public ScreenSpaceFramebuffer {
public:
ScreenSpaceDashboard(const ghoul::Dictionary& dictionary);
~ScreenSpaceDashboard() = default;
virtual ~ScreenSpaceDashboard() override = default;
bool initializeGL() override;
bool deinitializeGL() override;

2
modules/base/rendering/screenspaceframebuffer.h
View File

@@ -51,7 +51,7 @@ public:
using RenderFunction = std::function<void()>;
ScreenSpaceFramebuffer(const ghoul::Dictionary& dictionary = ghoul::Dictionary());
~ScreenSpaceFramebuffer();
virtual ~ScreenSpaceFramebuffer() override;
bool initializeGL() override;
bool deinitializeGL() override;

2
modules/base/rendering/screenspaceimageonline.h
View File

@@ -39,7 +39,7 @@ namespace documentation { struct Documentation; }
class ScreenSpaceImageOnline : public ScreenSpaceRenderable {
public:
ScreenSpaceImageOnline(const ghoul::Dictionary& dictionary);
~ScreenSpaceImageOnline();
virtual ~ScreenSpaceImageOnline() override;
bool deinitializeGL() override;

4
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -239,8 +239,8 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
ZoneScopedN("CefWebGuiModule")
if (_endpointCallback != -1) {
WebGuiModule* webGuiModule = global::moduleEngine->module<WebGuiModule>();
webGuiModule->removeEndpointChangeCallback(_endpointCallback);
WebGuiModule* m = global::moduleEngine->module<WebGuiModule>();
m->removeEndpointChangeCallback(_endpointCallback);
_endpointCallback = -1;
}
_enabled = false;

2
modules/cefwebgui/include/guikeyboardhandler.h
View File

@@ -32,7 +32,7 @@ namespace openspace {
class GUIKeyboardHandler : public WebKeyboardHandler {
public:
GUIKeyboardHandler();
virtual ~GUIKeyboardHandler() = default;
~GUIKeyboardHandler() override = default;
};
} // namespace openspace

2
modules/cefwebgui/include/guirenderhandler.h
View File

@@ -37,7 +37,7 @@ namespace openspace {
class GUIRenderHandler : public WebRenderHandler {
public:
GUIRenderHandler();
virtual ~GUIRenderHandler();
~GUIRenderHandler() override;
void draw() override;
void render() override;

2
modules/debugging/rendering/renderabledebugplane.h
View File

@@ -48,7 +48,7 @@ struct UpdateStructure;
class RenderableDebugPlane : public Renderable {
public:
RenderableDebugPlane(const ghoul::Dictionary& dictionary);
~RenderableDebugPlane() = default;
~RenderableDebugPlane() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/digitaluniverse/digitaluniversemodule.h
View File

@@ -37,7 +37,7 @@ public:
constexpr static const char* Name = "DigitalUniverse";
DigitalUniverseModule();
virtual ~DigitalUniverseModule() = default;
~DigitalUniverseModule() override = default;
std::vector<documentation::Documentation> documentations() const override;
static ghoul::opengl::ProgramObjectManager ProgramObjectManager;

2
modules/digitaluniverse/rendering/renderablebillboardscloud.h
View File

@@ -56,7 +56,7 @@ namespace documentation { struct Documentation; }
class RenderableBillboardsCloud : public Renderable {
public:
explicit RenderableBillboardsCloud(const ghoul::Dictionary& dictionary);
~RenderableBillboardsCloud() = default;
~RenderableBillboardsCloud() override = default;
void initialize() override;
void initializeGL() override;

2
modules/digitaluniverse/rendering/renderabledumeshes.h
View File

@@ -53,7 +53,7 @@ namespace documentation { struct Documentation; }
class RenderableDUMeshes : public Renderable {
public:
explicit RenderableDUMeshes(const ghoul::Dictionary& dictionary);
~RenderableDUMeshes() = default;
~RenderableDUMeshes() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/digitaluniverse/rendering/renderableplanescloud.h
View File

@@ -57,7 +57,7 @@ namespace documentation { struct Documentation; }
class RenderablePlanesCloud : public Renderable {
public:
explicit RenderablePlanesCloud(const ghoul::Dictionary& dictionary);
~RenderablePlanesCloud() = default;
~RenderablePlanesCloud() override = default;
void initialize() override;
void initializeGL() override;

2
modules/digitaluniverse/rendering/renderablepoints.h
View File

@@ -52,7 +52,7 @@ namespace documentation { struct Documentation; }
class RenderablePoints : public Renderable {
public:
explicit RenderablePoints(const ghoul::Dictionary& dictionary);
~RenderablePoints() = default;
~RenderablePoints() override = default;
void initialize() override;
void initializeGL() override;

5
modules/exoplanets/exoplanetsmodule.h
View File

@@ -39,7 +39,7 @@ public:
constexpr static const char* Name = "Exoplanets";
ExoplanetsModule();
virtual ~ExoplanetsModule() = default;
~ExoplanetsModule() override = default;
bool hasDataFiles() const;
std::string exoplanetsDataPath() const;
@@ -61,6 +61,7 @@ public:
protected:
void internalInitialize(const ghoul::Dictionary& dict) override;
properties::BoolProperty _enabled;
properties::StringProperty _exoplanetsDataFolder;
properties::StringProperty _bvColorMapPath;
properties::StringProperty _starTexturePath;
@@ -74,8 +75,6 @@ protected:
properties::BoolProperty _useOptimisticZone;
properties::FloatProperty _habitableZoneOpacity;
properties::BoolProperty _enabled;
};
} // namespace openspace

2
modules/gaia/gaiamodule.h
View File

@@ -36,7 +36,7 @@ public:
constexpr static const char* Name = "Gaia";
GaiaModule();
virtual ~GaiaModule() = default;
~GaiaModule() override = default;
std::vector<documentation::Documentation> documentations() const override;
scripting::LuaLibrary luaLibrary() const override;

2
modules/gaia/rendering/renderablegaiastars.h
View File

@@ -53,7 +53,7 @@ namespace documentation { struct Documentation; }
class RenderableGaiaStars : public Renderable {
public:
explicit RenderableGaiaStars(const ghoul::Dictionary& dictionary);
virtual ~RenderableGaiaStars() = default;
~RenderableGaiaStars() override = default;
void initializeGL() override;
void deinitializeGL() override;

2
modules/gaia/tasks/constructoctreetask.h
View File

@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
class ConstructOctreeTask : public Task {
public:
ConstructOctreeTask(const ghoul::Dictionary& dictionary);
virtual ~ConstructOctreeTask() = default;
~ConstructOctreeTask() override = default;
std::string description() override;
void perform(const Task::ProgressCallback& onProgress) override;

2
modules/gaia/tasks/readfilejob.h
View File

@@ -48,7 +48,7 @@ struct ReadFileJob : public Job<std::vector<std::vector<float>>> {
int lastRow, size_t nDefaultCols, int nValuesPerStar,
std::shared_ptr<FitsFileReader> fitsReader);
~ReadFileJob() = default;
~ReadFileJob() override = default;
void execute() override;

2
modules/gaia/tasks/readfitstask.h
View File

@@ -39,7 +39,7 @@ namespace documentation { struct Documentation; }
class ReadFitsTask : public Task {
public:
ReadFitsTask(const ghoul::Dictionary& dictionary);
virtual ~ReadFitsTask() = default;
~ReadFitsTask() override = default;
std::string description() override;
void perform(const Task::ProgressCallback& onProgress) override;

2
modules/gaia/tasks/readspecktask.h
View File

@@ -37,7 +37,7 @@ namespace documentation { struct Documentation; }
class ReadSpeckTask : public Task {
public:
ReadSpeckTask(const ghoul::Dictionary& dictionary);
virtual ~ReadSpeckTask() = default;
~ReadSpeckTask() override = default;
std::string description() override;
void perform(const Task::ProgressCallback& onProgress) override;

4
modules/galaxy/rendering/galaxyraycaster.h
View File

@@ -46,8 +46,8 @@ struct RaycastData;
class GalaxyRaycaster : public VolumeRaycaster {
public:
GalaxyRaycaster(ghoul::opengl::Texture& texture);
virtual ~GalaxyRaycaster() = default;
~GalaxyRaycaster() override = default;
void initialize();
void renderEntryPoints(const RenderData& data,

2
modules/galaxy/rendering/renderablegalaxy.h
View File

@@ -45,7 +45,7 @@ struct RenderData;
class RenderableGalaxy : public Renderable {
public:
explicit RenderableGalaxy(const ghoul::Dictionary& dictionary);
virtual ~RenderableGalaxy() = default;
~RenderableGalaxy() override = default;
void initialize() override;
void initializeGL() override;

2
modules/galaxy/tasks/milkywayconversiontask.h
View File

@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
class MilkywayConversionTask : public Task {
public:
MilkywayConversionTask(const ghoul::Dictionary& dictionary);
virtual ~MilkywayConversionTask() = default;
~MilkywayConversionTask() override = default;
std::string description() override;
void perform(const Task::ProgressCallback& onProgress) override;

2
modules/galaxy/tasks/milkywaypointsconversiontask.h
View File

@@ -42,7 +42,7 @@ namespace documentation { struct Documentation; }
class MilkywayPointsConversionTask : public Task {
public:
MilkywayPointsConversionTask(const ghoul::Dictionary& dictionary);
virtual ~MilkywayPointsConversionTask() = default;
~MilkywayPointsConversionTask() override = default;
std::string description() override;
void perform(const Task::ProgressCallback& progressCallback) override;

2
modules/globebrowsing/src/dashboarditemglobelocation.h
View File

@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
class DashboardItemGlobeLocation : public DashboardItem {
public:
DashboardItemGlobeLocation(const ghoul::Dictionary& dictionary);
~DashboardItemGlobeLocation() = default;
~DashboardItemGlobeLocation() override = default;
void render(glm::vec2& penPosition) override;

2
modules/globebrowsing/src/gdalwrapper.h
View File

@@ -55,7 +55,7 @@ public:
private:
GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize);
~GdalWrapper() = default;
~GdalWrapper() override = default;
void setGdalProxyConfiguration();

2
modules/globebrowsing/src/globelabelscomponent.h
View File

@@ -50,7 +50,7 @@ namespace globebrowsing { class RenderableGlobe; }
class GlobeLabelsComponent : public properties::PropertyOwner {
public:
GlobeLabelsComponent();
~GlobeLabelsComponent() = default;
~GlobeLabelsComponent() override = default;
void initialize(const ghoul::Dictionary& dictionary,
globebrowsing::RenderableGlobe* globe);

2
modules/globebrowsing/src/layeradjustment.h
View File

@@ -39,7 +39,7 @@ namespace openspace::globebrowsing {
class LayerAdjustment : public properties::PropertyOwner {
public:
LayerAdjustment();
~LayerAdjustment() = default;
~LayerAdjustment() override = default;
void setValuesFromDictionary(const ghoul::Dictionary& adjustmentDict);

2
modules/globebrowsing/src/renderableglobe.h
View File

@@ -95,7 +95,7 @@ enum class ShadowCompType {
class RenderableGlobe : public Renderable {
public:
RenderableGlobe(const ghoul::Dictionary& dictionary);
~RenderableGlobe() = default;
~RenderableGlobe() override = default;
void initializeGL() override;
void deinitialize() override;

2
modules/globebrowsing/src/tileloadjob.h
View File

@@ -47,7 +47,7 @@ struct TileLoadJob : public Job<RawTile> {
* Destroys the allocated data pointer if it has been allocated and the TileLoadJob
* has ownership of it.
*/
~TileLoadJob();
~TileLoadJob() override;
/**
* If the TileLoadJob has been created using PBO, this is the address that the

2
modules/globebrowsing/src/tileprovider/temporaltileprovider.h
View File

@@ -65,7 +65,7 @@ private:
struct InterpolateTileProvider : public TileProvider {
InterpolateTileProvider(const ghoul::Dictionary&);
virtual ~InterpolateTileProvider();
~InterpolateTileProvider() override;
Tile tile(const TileIndex& tileIndex) override final;
Tile::Status tileStatus(const TileIndex& index) override final;

2
modules/globebrowsing/src/tileprovider/texttileprovider.h
View File

@@ -32,7 +32,7 @@ namespace openspace::globebrowsing {
class TextTileProvider : public TileProvider {
public:
TextTileProvider(TileTextureInitData initData, size_t fontSize = 48);
virtual ~TextTileProvider();
~TextTileProvider() override;
void reset() override;

2
modules/globebrowsing/src/tileprovider/tileprovider.h
View File

@@ -80,7 +80,7 @@ struct TileProvider : public properties::PropertyOwner {
static void deinitializeDefaultTile();
TileProvider();
virtual ~TileProvider() = default;
~TileProvider() override = default;
void initialize();
void deinitialize();

64
modules/imgui/imguimodule.cpp
View File

@@ -52,70 +52,6 @@ namespace {
constexpr const std::array<const char*, 2> UniformNames = { "tex", "ortho" };
void addScreenSpaceRenderableLocal(std::string identifier, std::string texturePath) {
if (!std::filesystem::is_regular_file(absPath(texturePath))) {
LWARNING(fmt::format("Could not find image '{}'", texturePath));
return;
}
std::string script;
if (identifier.empty()) {
script = fmt::format(
"openspace.addScreenSpaceRenderable({{\
Type = 'ScreenSpaceImageLocal',\
TexturePath = openspace.absPath('{}')\
}});",
texturePath
);
}
else {
script = fmt::format(
"openspace.addScreenSpaceRenderable({{\
Type = 'ScreenSpaceImageLocal',\
TexturePath = openspace.absPath('{0}'),\
Identifier = '{1}',\
Name = '{1}'\
}});",
texturePath, identifier
);
}
openspace::global::scriptEngine->queueScript(
script,
openspace::scripting::ScriptEngine::RemoteScripting::Yes
);
}
void addScreenSpaceRenderableOnline(std::string identifier, std::string texturePath) {
std::string script;
if (identifier.empty()) {
script = fmt::format(
"openspace.addScreenSpaceRenderable({{\
Type = 'ScreenSpaceImageOnline',\
URL = '{}'\
}});",
texturePath
);
}
else {
script = fmt::format(
"openspace.addScreenSpaceRenderable({{\
Type = 'ScreenSpaceImageOnline',\
URL = '{0}',\
Identifier = '{1}',\
Name = '{1}'\
}});",
texturePath,
identifier
);
}
openspace::global::scriptEngine->queueScript(
script,
openspace::scripting::ScriptEngine::RemoteScripting::Yes
);
}
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",

4
modules/imgui/src/guiscenecomponent.cpp
View File

@@ -68,8 +68,8 @@ namespace {
ImGui::Checkbox("Is Ready", &isReady);
Renderable::RenderBin bin = renderable->renderBin();
std::string binStr = [](Renderable::RenderBin bin) {
switch (bin) {
std::string binStr = [](Renderable::RenderBin b) {
switch (b) {
case Renderable::RenderBin::Background:
return "Background";
case Renderable::RenderBin::Opaque:

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

@@ -51,7 +51,7 @@ public:
static constexpr const char* Name = "Server";
ServerModule();
virtual ~ServerModule();
virtual ~ServerModule() override;
ServerInterface* serverInterfaceByIdentifier(const std::string& identifier);

7
modules/skybrowser/ext/tinyxml2/tinyxml2.cpp
View File

@@ -21,6 +21,11 @@ must not be misrepresented as being the original software.
distribution.
*/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
#include "tinyxml2.h"
#include <new> // yes, this one new style header, is in the Android SDK.
@@ -2984,3 +2989,5 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
}
} // namespace tinyxml2
#pragma GCC diagnostic pop

2
modules/skybrowser/include/screenspaceskybrowser.h
View File

@@ -38,7 +38,7 @@ namespace openspace {
class ScreenSpaceSkyBrowser : public ScreenSpaceRenderable, public WwtCommunicator {
public:
explicit ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary);
~ScreenSpaceSkyBrowser();
~ScreenSpaceSkyBrowser() override;
bool initializeGL() override;
bool deinitializeGL() override;

5
modules/skybrowser/include/utility.h
View File

@@ -199,11 +199,12 @@ glm::dmat4 incrementalAnimationMatrix(const glm::dvec3& start, const glm::dvec3&
*/
double sizeFromFov(double fov, glm::dvec3 worldPosition);
template<typename T>
template <typename T>
class Animation {
public:
Animation(T start, T goal, double time)
: _start(start), _goal(goal)
: _goal(std::move(goal))
, _start(std::move(start))
{
_animationTime = std::chrono::milliseconds(static_cast<int>(time * 1000));
}

Some files were not shown because too many files have changed in this diff Show More