diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h index 70428667c8..80009b2392 100644 --- a/include/openspace/properties/propertyowner.h +++ b/include/openspace/properties/propertyowner.h @@ -52,9 +52,9 @@ public: static constexpr char URISeparator = '.'; struct PropertyOwnerInfo { - std::string identifier; - std::string guiName; - std::string description; + std::string identifier = ""; + std::string guiName = ""; + std::string description = ""; }; /** diff --git a/modules/base/rendering/pointcloud/renderablepointcloud.cpp b/modules/base/rendering/pointcloud/renderablepointcloud.cpp index e8842b4a9b..4f144c7dd4 100644 --- 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 diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 207d026d9c..9cf7518ecd 100644 --- 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" }, diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp index 64c8647ea1..f664d8dbc2 100644 --- 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::max())) , _minVertex(glm::vec3(std::numeric_limits::max())) - , _sweepChunkSize(SweepChunkSizeInfo, 200, 50, 5000) - , _enableSweepChunking(EnableSweepChunkingInfo, false) - , _numberOfReplacementPoints(AccurateTrailPositionsInfo, 100, 0, 1000) { const Parameters p = codegen::bake(dictionary); diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h index baab782c9a..86e7beed27 100644 --- 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, 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 diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index 02071eb730..8437077e6b 100644 --- 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", + "", {} }; } diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h index 161908ae0c..9ff16d651e 100644 --- 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(); diff --git a/modules/globebrowsing/src/geojson/geojsoncomponent.h b/modules/globebrowsing/src/geojson/geojsoncomponent.h index c33107855c..81c53c1d9c 100644 --- 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; diff --git a/modules/globebrowsing/src/geojson/geojsonmanager.cpp b/modules/globebrowsing/src/geojson/geojsonmanager.cpp index 3a6dc63545..c0a4c61f2a 100644 --- 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", + "", {} }; } diff --git a/modules/globebrowsing/src/geojson/geojsonproperties.cpp b/modules/globebrowsing/src/geojson/geojsonproperties.cpp index b4f358fee1..98fdd97c1c 100644 --- 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"; diff --git a/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/src/tileprovider/defaulttileprovider.cpp index 4dc51a7e41..ab1ee7b025 100644 --- 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 enabled; - // [[codegen::verbatim(CompressionInfo.description)]] + // The compression algorithm to use for MRF cached tiles enum class [[codegen::map(Compression)]] Compression { PNG = 0, JPEG, diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp index 7fa6033957..4ab04176e8 100644 --- 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) diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 3d31c916d4..bae9fe64c5 100644 --- 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, diff --git a/modules/space/rendering/renderabletravelspeed.cpp b/modules/space/rendering/renderabletravelspeed.cpp index 19eaa6fff6..d143d8d264 100644 --- 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 travelSpeed [[codegen::greater(0.f)]]; diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp index 4e406eae29..044ab77bb8 100644 --- a/src/documentation/documentationengine.cpp +++ b/src/documentation/documentationengine.cpp @@ -50,8 +50,6 @@ #include namespace { - constexpr std::string_view _loggerCat = "DocumentationEngine"; - // General keys constexpr const char* NameKey = "name"; constexpr const char* IdentifierKey = "identifier"; @@ -68,12 +66,10 @@ namespace { constexpr const char* CommandKey = "command"; // Factory - constexpr const char* FactoryTitle = "Asset Components"; constexpr const char* MembersKey = "members"; constexpr const char* OptionalKey = "optional"; constexpr const char* ReferenceKey = "reference"; constexpr const char* FoundKey = "found"; - constexpr const char* RestrictionsKey = "restrictions"; constexpr const char* ClassesKey = "classes"; constexpr const char* OtherName = "Other"; @@ -90,7 +86,6 @@ namespace { constexpr const char* UriKey = "uri"; // Scripting - constexpr const char* ScriptingTitle = "Scripting API"; constexpr const char* DefaultValueKey = "defaultValue"; constexpr const char* ArgumentsKey = "arguments"; constexpr const char* ReturnTypeKey = "returnType"; @@ -116,7 +111,6 @@ namespace { constexpr const char* AuthorKey = "author"; constexpr const char* UrlKey = "url"; constexpr const char* LicenseKey = "license"; - constexpr const char* NoLicenseKey = "noLicense"; constexpr const char* IdentifiersKey = "identifiers"; constexpr const char* PathKey = "path"; constexpr const char* AssetKey = "assets"; @@ -131,17 +125,19 @@ namespace { constexpr const char* FiltersKey = "filters"; constexpr const char* ActionsKey = "actions"; - nlohmann::json documentationToJson(const openspace::documentation::Documentation& d) { + nlohmann::json documentationToJson( + const openspace::documentation::Documentation& documentation) + { using namespace openspace::documentation; nlohmann::json json; - json[NameKey] = d.name; - json[IdentifierKey] = d.id; - json[DescriptionKey] = d.description; + json[NameKey] = documentation.name; + json[IdentifierKey] = documentation.id; + json[DescriptionKey] = documentation.description; json[MembersKey] = nlohmann::json::array(); - for (const DocumentationEntry& p : d.entries) { + for (const DocumentationEntry& p : documentation.entries) { nlohmann::json entry; entry[NameKey] = p.key; entry[OptionalKey] = p.optional.value; @@ -156,7 +152,7 @@ namespace { auto it = std::find_if( doc.begin(), doc.end(), - [rv](const Documentation& doc) { return doc.id == rv->identifier; } + [rv](const Documentation& d) { return d.id == rv->identifier; } ); if (it == doc.end()) { diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp index 5730487bfa..52c7e47def 100644 --- a/src/interaction/tasks/convertrecformattask.cpp +++ b/src/interaction/tasks/convertrecformattask.cpp @@ -39,17 +39,6 @@ namespace { constexpr std::string_view KeyInFilePath = "InputFilePath"; constexpr std::string_view KeyOutFilePath = "OutputFilePath"; - - std::string addFileSuffix(const std::string& filePath, const std::string& suffix) { - const size_t lastdot = filePath.find_last_of('.'); - const std::string extension = filePath.substr(0, lastdot); - if (lastdot == std::string::npos) { - return filePath + suffix; - } - else { - return filePath.substr(0, lastdot) + suffix + extension; - } - } } // namespace namespace openspace::interaction { diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp index 335eefb264..f9c87ec804 100644 --- a/src/util/boxgeometry.cpp +++ b/src/util/boxgeometry.cpp @@ -28,10 +28,6 @@ #include #include -namespace { - constexpr std::string_view _loggerCat = "BoxGeometry"; -} // namespace - namespace openspace { BoxGeometry::BoxGeometry(glm::vec3 size) : _size(std::move(size)) {}