mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-04 02:29:49 -06:00
Remove some more warnings
This commit is contained in:
@@ -78,7 +78,7 @@ public:
|
||||
};
|
||||
|
||||
OpenSpaceEngine();
|
||||
~OpenSpaceEngine();
|
||||
~OpenSpaceEngine() override;
|
||||
|
||||
void registerPathTokens();
|
||||
void initialize();
|
||||
|
||||
@@ -54,11 +54,10 @@ struct RaycasterTask;
|
||||
class Scene;
|
||||
struct UpdateStructures;
|
||||
|
||||
class FramebufferRenderer : public RaycasterListener,
|
||||
public DeferredcasterListener
|
||||
class FramebufferRenderer final : public RaycasterListener, public DeferredcasterListener
|
||||
{
|
||||
public:
|
||||
virtual ~FramebufferRenderer() override final = default;
|
||||
virtual ~FramebufferRenderer() override = default;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -28,6 +28,13 @@ distribution.
|
||||
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wold-style-cast"
|
||||
#pragma clang diagnostic ignored "-Wsuggest-override"
|
||||
#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
|
||||
#endif
|
||||
|
||||
#include "tinyxml2.h"
|
||||
|
||||
#include <new> // yes, this one new style header, is in the Android SDK.
|
||||
@@ -2995,3 +3002,7 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
|
||||
#if defined(__GNUC__) && !defined(__clang__)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
@@ -285,6 +285,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
|
||||
glm::vec3(glm::pi<float>())
|
||||
)
|
||||
, _scale(ScaleInfo, 0.25f, 0.f, 2.f)
|
||||
, _gamma(GammaInfo, 1.f, 0.000001f, 10.f)
|
||||
, _multiplyColor(MultiplyColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
|
||||
, _backgroundColor(
|
||||
BackgroundColorInfo,
|
||||
@@ -295,7 +296,6 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
|
||||
, _opacity(OpacityInfo, 1.f, 0.f, 1.f)
|
||||
, _fade(FadeInfo, 1.f, 0.f, 1.f)
|
||||
, _delete(DeleteInfo)
|
||||
, _gamma(GammaInfo, 1.f, 0.000001f, 10.f)
|
||||
{
|
||||
const Parameters p = codegen::bake<Parameters>(dictionary);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user