Reducing compiler warnings (#3341)

2026-01-06 03:29:44 -06:00 · 2024-06-28 14:16:06 +02:00
parent 78e7c7e321
commit 0707829c7b
17 changed files with 28 additions and 73 deletions
--- a/modules/base/rendering/pointcloud/renderablepointcloud.cpp
+++ b/modules/base/rendering/pointcloud/renderablepointcloud.cpp
@@ -267,24 +267,6 @@ namespace {
        openspace::properties::Property::Visibility::AdvancedUser
    };

-    constexpr openspace::properties::Property::PropertyInfo SizeMappingEnabledInfo = {
-        "Enabled",
-        "Size Mapping Enabled",
-        "Decides whether size mapping should be enabled. If true and at least one column "
-        "was loaded as an option for size mapping, the chosen data column will be used "
-        "to scale the size of the points.",
-        openspace::properties::Property::Visibility::NoviceUser
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo SizeMappingOptionInfo = {
-        "Parameter",
-        "Parameter Option",
-        "The name of a data parameter used for scaling of the points. The parameter "
-        "value will be used as a multiplicative factor to scale the size of the points. "
-        "Note that they may still be scaled by max size adjustment effects.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
    constexpr openspace::properties::Property::PropertyInfo EnableOutlineInfo = {
        "EnableOutline",
        "Enable Point Outline",
@@ -653,8 +635,8 @@ RenderablePointCloud::RenderablePointCloud(const ghoul::Dictionary& dictionary)
    , _colorSettings(dictionary)
    , _fading(dictionary)
    , _useAdditiveBlending(UseAdditiveBlendingInfo, true)
-    , _drawElements(DrawElementsInfo, true)
    , _useRotation(UseOrientationDataInfo, false)
+    , _drawElements(DrawElementsInfo, true)
    , _renderOption(
        OrientationRenderOptionInfo,
        properties::OptionProperty::DisplayType::Dropdown
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -186,14 +186,14 @@ RenderableTrail::Appearance::Appearance()
    })
    , lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
    , useLineFade(EnableFadeInfo, true)
-    , lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
-    , lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
    , lineWidth(LineWidthInfo, 10.f, 1.f, 20.f)
    , pointSize(PointSizeInfo, 1, 1, 64)
    , renderingModes(
          RenderingModeInfo,
          properties::OptionProperty::DisplayType::Dropdown
    )
+    , lineLength(LineLengthInfo, 1.f, 0.f, 1.f)
+    , lineFadeAmount(LineFadeAmountInfo, 1.f, 0.f, 1.f)
 {
    renderingModes.addOptions({
        { RenderingModeLines, "Lines" },
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -156,16 +156,16 @@ documentation::Documentation RenderableTrailTrajectory::Documentation() {

 RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& dictionary)
    : RenderableTrail(dictionary)
+    , _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
+    , _enableSweepChunking(EnableSweepChunkingInfo, false)
    , _startTime(StartTimeInfo)
    , _endTime(EndTimeInfo)
    , _sampleInterval(SampleIntervalInfo, 2.0, 2.0, 1e6)
    , _timeStampSubsamplingFactor(TimeSubSampleInfo, 1, 1, 1000000000)
    , _renderFullTrail(RenderFullPathInfo, false)
+    , _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
    , _maxVertex(glm::vec3(-std::numeric_limits<float>::max()))
    , _minVertex(glm::vec3(std::numeric_limits<float>::max()))
-    , _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000)
-    , _enableSweepChunking(EnableSweepChunkingInfo, false)
-    , _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000)
 {
    const Parameters p = codegen::bake<Parameters>(dictionary);

--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -92,8 +92,6 @@ private:
    /// Dirty flag to determine whether the stride information needs to be changed
    bool _subsamplingIsDirty = true;

-    std::array<TrailVBOLayout<float>, 2> _auxiliaryVboData = {};
-
    /// The conversion of the _startTime into the internal time format
    double _start = 0.0;
    /// The conversion of the _endTime into the internal time format
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -48,6 +48,7 @@ documentation::Documentation ScreenSpaceFramebuffer::Documentation() {
    return {
        "ScreenSpaceFramebuffer",
        "base_screenspace_framebuffer",
+        "",
        {}
    };
 }
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -33,7 +33,7 @@ class RenderableDebugPlane : public RenderablePlane {
 public:
    RenderableDebugPlane(const ghoul::Dictionary& dictionary);

-    bool isReady() const;
+    bool isReady() const override;

    static documentation::Documentation Documentation();

--- a/modules/globebrowsing/src/geojson/geojsoncomponent.h
+++ b/modules/globebrowsing/src/geojson/geojsoncomponent.h
@@ -141,7 +141,6 @@ private:

    bool _dataIsDirty = true;
    bool _heightOffsetIsDirty = false;
-    bool _dataIsInitialized = false;
    bool _textureIsDirty = false;

    properties::Vec2Property _centerLatLong;
--- a/modules/globebrowsing/src/geojson/geojsonmanager.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonmanager.cpp
@@ -41,6 +41,7 @@ documentation::Documentation GeoJsonManager::Documentation() {
    return {
        "GeoJsonManager",
        "globebrowsing_geojsonmanager",
+        "",
        {}
    };
 }
--- a/modules/globebrowsing/src/geojson/geojsonproperties.cpp
+++ b/modules/globebrowsing/src/geojson/geojsonproperties.cpp
@@ -61,7 +61,7 @@ namespace geojson::propertykeys {
    constexpr std::string_view TessellationMaxDistance = "tessellationDistance";

    constexpr std::string_view AltitudeMode = "altitudeMode";
-    constexpr std::string_view AltitudeModeClamp = "clampToGround";
+    //constexpr std::string_view AltitudeModeClamp = "clampToGround";
    constexpr std::string_view AltitudeModeAbsolute = "absolute";
    constexpr std::string_view AltitudeModeRelative = "relativeToGround";

--- a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp
@@ -50,13 +50,6 @@ namespace {
        openspace::properties::Property::Visibility::AdvancedUser
    };

-    constexpr openspace::properties::Property::PropertyInfo CompressionInfo = {
-        "Compression",
-        "Compression Algorithm",
-        "The compression algorithm to use for MRF cached tiles.",
-        openspace::properties::Property::Visibility::AdvancedUser
-    };
-
    enum class [[codegen::stringify()]] Compression {
        PNG = 0,
        JPEG,
@@ -88,7 +81,7 @@ namespace {
            // Specifies whether to use caching or not
            std::optional<bool> enabled;

-            // [[codegen::verbatim(CompressionInfo.description)]]
+            // The compression algorithm to use for MRF cached tiles
            enum class [[codegen::map(Compression)]] Compression {
                PNG = 0,
                JPEG,
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -257,13 +257,13 @@ RenderableOrbitalKepler::Appearance::Appearance()
    , color(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
    , trailWidth(TrailWidthInfo, 2.f, 1.f, 20.f)
    , pointSizeExponent(PointSizeExponentInfo, 1.0f, 0.f, 11.f)
+    , enableMaxSize(EnableMaxSizeInfo, true)
+    , maxSize(MaxSizeInfo, 5.f, 0.f, 45.f)
    , renderingModes(
        RenderingModeInfo,
        properties::OptionProperty::DisplayType::Dropdown
    )
    , trailFade(TrailFadeInfo, 20.f, 0.f, 30.f)
-    , enableMaxSize(EnableMaxSizeInfo, true)
-    , maxSize(MaxSizeInfo, 5.f, 0.f, 45.f)
    , enableOutline(EnableOutlineInfo, true)
    , outlineColor(OutlineColorInfo, glm::vec3(0.f), glm::vec3(0.f), glm::vec3(1.f))
    , outlineWidth(OutlineWidthInfo, 0.2f, 0.f, 1.f)
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -446,21 +446,21 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
    )
    , _fixedColor(FixedColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
    , _filterOutOfRange(FilterOutOfRangeInfo, false)
-    , _core{
+    , _core {
        properties::PropertyOwner(CoreOwnerInfo),
        properties::StringProperty(TextureInfo),
        properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
        properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
    }
-    , _glare{
+    , _glare {
        properties::PropertyOwner(GlareOwnerInfo),
        properties::StringProperty(TextureInfo),
        properties::FloatProperty(MultiplierInfo, 1.f, 0.f, 20.f),
        properties::FloatProperty(GammaInfo, 1.f, 0.f, 5.f),
        properties::FloatProperty(ScaleInfo, 1.f, 0.f, 1.f)
    }
-    , _parameters{
+    , _parameters {
        properties::PropertyOwner(SizeCompositionInfo),
        properties::OptionProperty(
            SizeCompositionMethodInfo,
--- a/modules/space/rendering/renderabletravelspeed.cpp
+++ b/modules/space/rendering/renderabletravelspeed.cpp
@@ -101,7 +101,7 @@ namespace {
    // selected speed.
    struct [[codegen::Dictionary(RenderableTravelSpeed)]] Parameters {
        // [[codegen::verbatim(TargetInfo.description)]]
-        std::string target [[codegen::identifier()]];;
+        std::string target [[codegen::identifier()]];

        // [[codegen::verbatim(SpeedInfo.description)]]
        std::optional<double> travelSpeed [[codegen::greater(0.f)]];