diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp index 7b735c6c16..41c286aa14 100644 --- a/modules/atmosphere/rendering/renderableatmosphere.cpp +++ b/modules/atmosphere/rendering/renderableatmosphere.cpp @@ -81,107 +81,111 @@ namespace { const char* keyTextureScale = "PreCalculatedTextureScale"; const char* keySaveTextures = "SaveCalculatedTextures"; - const openspace::properties::Property::PropertyInfo AtmosphereHeightInfo = { + constexpr openspace::properties::Property::PropertyInfo AtmosphereHeightInfo = { "atmmosphereHeight", "Atmosphere Height (KM)", "The thickness of the atmosphere in Km" }; - const openspace::properties::Property::PropertyInfo AverageGroundReflectanceInfo = { + constexpr openspace::properties::Property::PropertyInfo AverageGroundReflectanceInfo = + { "AverageGroundReflectance", "Average Ground Reflectance (%)", "Average percentage of light reflected by the ground during the pre-calculation " "phase" }; - const openspace::properties::Property::PropertyInfo GroundRadianceEmittioninfo = { + constexpr openspace::properties::Property::PropertyInfo GroundRadianceEmittioninfo = { "GroundRadianceEmittion", "Percentage of initial radiance emitted from ground", "Multiplier of the ground radiance color during the rendering phase" }; - const openspace::properties::Property::PropertyInfo RayleighHeightScaleInfo = { + constexpr openspace::properties::Property::PropertyInfo RayleighHeightScaleInfo = { "RayleighHeightScale", "Rayleigh Scale Height (KM)", "It is the vertical distance over which the density and pressure fall by a " "constant factor" }; - const openspace::properties::Property::PropertyInfo RayleighScatteringCoeffXInfo = { + constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffXInfo = + { "RayleighScatteringCoeffX", "Rayleigh Scattering Coeff X (x10e-3)", "Rayleigh sea-level scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo RayleighScatteringCoeffYInfo = { + constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffYInfo = + { "RayleighScatteringCoeffY", "Rayleigh Scattering Coeff Y (x10e-3)", "Rayleigh sea-level scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo RayleighScatteringCoeffZInfo = { + constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffZInfo = + { "RayleighScatteringCoeffZ", "Rayleigh Scattering Coeff Z (x10e-3)", "Rayleigh sea-level scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo OzoneLayerInfo = { + constexpr openspace::properties::Property::PropertyInfo OzoneLayerInfo = { "Ozone", "Ozone Layer Enabled", "Enables/Disable Ozone Layer during pre-calculation phase" }; - const openspace::properties::Property::PropertyInfo OzoneHeightScaleInfo = { + constexpr openspace::properties::Property::PropertyInfo OzoneHeightScaleInfo = { "OzoneLayerHeightScale", "Ozone Scale Height (KM)", "It is the vertical distance over which the density and pressure fall by a " "constant factor" }; - const openspace::properties::Property::PropertyInfo OzoneLayerCoeffXInfo = { + constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffXInfo = { "OzoneLayerCoeffX", "Ozone Layer Extinction Coeff X (x10e-5)", "Ozone scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo OzoneLayerCoeffYInfo = { + constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffYInfo = { "OzoneLayerCoeffY", "Ozone Layer Extinction Coeff Y (x10e-5)", "Ozone scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo OzoneLayerCoeffZInfo = { + constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffZInfo = { "OzoneLayerCoeffZ", "Ozone Layer Extinction Coeff Z (x10e-5)", "Ozone scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo MieHeightScaleInfo = { + constexpr openspace::properties::Property::PropertyInfo MieHeightScaleInfo = { "MieHeightScale", "Mie Scale Height (KM)", "It is the vertical distance over which the density and pressure fall by a " "constant factor" }; - const openspace::properties::Property::PropertyInfo MieScatteringCoeffXInfo = { + constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffXInfo = { "MieScatteringCoeffX", "Mie Scattering Coeff X (x10e-3)", "Mie sea-level scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo MieScatteringCoeffYInfo = { + constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffYInfo = { "MieScatteringCoeffY", "Mie Scattering Coeff Y (x10e-3)", "Mie sea-level scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo MieScatteringCoeffZInfo = { + constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffZInfo = { "MieScatteringCoeffZ", "Mie Scattering Coeff Z (x10e-3)", "Mie sea-level scattering coefficients in meters" }; - const openspace::properties::Property::PropertyInfo + constexpr openspace::properties::Property::PropertyInfo MieScatteringExtinctionPropCoeffInfo = { "MieScatteringExtinctionPropCoefficient", @@ -189,37 +193,39 @@ namespace { "Mie Scattering/Extinction Proportion Coefficient (%)" }; - const openspace::properties::Property::PropertyInfo MieAsymmetricFactorGInfo = { + constexpr openspace::properties::Property::PropertyInfo MieAsymmetricFactorGInfo = { "MieAsymmetricFactorG", "Mie Asymmetric Factor G", "Averaging of the scattering angle over a high number of scattering events" }; - const openspace::properties::Property::PropertyInfo SunIntensityInfo = { + constexpr openspace::properties::Property::PropertyInfo SunIntensityInfo = { "SunIntensity", "Sun Intensity", "Unitless for now" }; - const openspace::properties::Property::PropertyInfo AtmosphereExposureInfo = { + constexpr openspace::properties::Property::PropertyInfo AtmosphereExposureInfo = { "HdrExposure", "Atmosphere Exposure", "Constant to controls the exposure of the radiance range" }; - const openspace::properties::Property::PropertyInfo AtmosphereGammaInfo = { + constexpr openspace::properties::Property::PropertyInfo AtmosphereGammaInfo = { "Gamma", "Gamma Correction", "Gamma Correction" }; - const openspace::properties::Property::PropertyInfo EnableSunOnCameraPositionInfo = { + constexpr openspace::properties::Property::PropertyInfo + EnableSunOnCameraPositionInfo = + { "SunFollowingCamera", "Enable Sun On Camera Position", "When selected the Sun is artificially positioned behind the observer all times" }; - const openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = { + constexpr openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = { "EclipseHardShadowsInfo", "Enable Hard Shadows for Eclipses", "Enable/Disables hard shadows through the atmosphere" diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp index 71dbc3c312..d8376f70f7 100644 --- a/modules/base/dashboard/dashboarditemangle.cpp +++ b/modules/base/dashboard/dashboarditemangle.cpp @@ -42,27 +42,27 @@ namespace { constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." }; - const openspace::properties::Property::PropertyInfo SourceTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo SourceTypeInfo = { "SourceType", "Source Type", "The type of position that is used as the triangle apex used to calculate the " "angle. The default value is 'Camera'." }; - const openspace::properties::Property::PropertyInfo SourceNodeNameInfo = { + constexpr openspace::properties::Property::PropertyInfo SourceNodeNameInfo = { "SourceNodeName", "Source Node Name", "If a scene graph node is selected as type, this value specifies the name of the " @@ -71,7 +71,7 @@ namespace { "Source, Reference, Destination)." }; - const openspace::properties::Property::PropertyInfo ReferenceTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo ReferenceTypeInfo = { "ReferenceType", "Reference Type", "The type of position that is used as the destination of the reference line used " @@ -79,14 +79,14 @@ namespace { "the triangle (Source, Reference, Destination)." }; - const openspace::properties::Property::PropertyInfo ReferenceNodeNameInfo = { + constexpr openspace::properties::Property::PropertyInfo ReferenceNodeNameInfo = { "ReferenceNodeName", "Reference Node Name", "If a scene graph node is selected as type, this value specifies the name of the " "node that is to be used as the reference direction to compute the angle." }; - const openspace::properties::Property::PropertyInfo DestinationTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo DestinationTypeInfo = { "DestinationType", "Destination Type", "The type of position that is used as the destination to calculate the angle. " @@ -94,7 +94,7 @@ namespace { "Source, Reference, Destination). The default value for this is 'Focus'." }; - const openspace::properties::Property::PropertyInfo DestinationNodeNameInfo = { + constexpr openspace::properties::Property::PropertyInfo DestinationNodeNameInfo = { "DestinationNodeName", "Destination Node Name", "If a scene graph node is selected as type, this value specifies the name of the " diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp index d45bbe8f58..7276ba06f2 100644 --- a/modules/base/dashboard/dashboarditemdate.cpp +++ b/modules/base/dashboard/dashboarditemdate.cpp @@ -36,14 +36,14 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 15.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp index 78a05cc9a1..32dba742db 100644 --- a/modules/base/dashboard/dashboarditemdistance.cpp +++ b/modules/base/dashboard/dashboarditemdistance.cpp @@ -43,48 +43,48 @@ namespace { constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." }; - const openspace::properties::Property::PropertyInfo SourceTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo SourceTypeInfo = { "SourceType", "Source Type", "The type of position that is used as the source to calculate the distance. The " "default value is 'Camera'." }; - const openspace::properties::Property::PropertyInfo SourceNodeNameInfo = { + constexpr openspace::properties::Property::PropertyInfo SourceNodeNameInfo = { "SourceNodeName", "Source Node Name", "If a scene graph node is selected as type, this value specifies the name of the " "node that is to be used as the source for computing the distance." }; - const openspace::properties::Property::PropertyInfo DestinationTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo DestinationTypeInfo = { "DestinationType", "Destination Type", "The type of position that is used as the destination to calculate the distance. " "The default value for this is 'Focus'." }; - const openspace::properties::Property::PropertyInfo DestinationNodeNameInfo = { + constexpr openspace::properties::Property::PropertyInfo DestinationNodeNameInfo = { "DestinationNodeName", "Destination Node Name", "If a scene graph node is selected as type, this value specifies the name of the " "node that is to be used as the destination for computing the distance." }; - const openspace::properties::Property::PropertyInfo SimplificationInfo = { + constexpr openspace::properties::Property::PropertyInfo SimplificationInfo = { "Simplification", "Simplification", "If this value is enabled, the distace is displayed in nuanced units, such as " @@ -92,7 +92,7 @@ namespace { "displayed in meters." }; - const openspace::properties::Property::PropertyInfo RequestedUnitInfo = { + constexpr openspace::properties::Property::PropertyInfo RequestedUnitInfo = { "RequestedUnit", "Requested Unit", "If the simplification is disabled, this distance unit is used as a destination " diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp index fab7e7cb29..4cb683499e 100644 --- a/modules/base/dashboard/dashboarditemframerate.cpp +++ b/modules/base/dashboard/dashboarditemframerate.cpp @@ -36,20 +36,20 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." }; - const openspace::properties::Property::PropertyInfo FrametimeInfo = { + constexpr openspace::properties::Property::PropertyInfo FrametimeInfo = { "FrametimeType", "Type of the frame time display", "This value determines the units in which the frame time is displayed." diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp index 021e541714..9c50bba9a0 100644 --- a/modules/base/dashboard/dashboarditemmission.cpp +++ b/modules/base/dashboard/dashboarditemmission.cpp @@ -39,14 +39,14 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 15.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp index 0fc2a479dc..3b248df780 100644 --- a/modules/base/dashboard/dashboarditemparallelconnection.cpp +++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp @@ -39,14 +39,14 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp index 8a39d2e856..63f2ace82a 100644 --- a/modules/base/dashboard/dashboarditempropertyvalue.cpp +++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp @@ -37,26 +37,26 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." }; - const openspace::properties::Property::PropertyInfo PropertyUriInfo = { + constexpr openspace::properties::Property::PropertyInfo PropertyUriInfo = { "URI", "Property URI", "The URI of the property that is displayed in this dashboarditem" }; - const openspace::properties::Property::PropertyInfo DisplayStringInfo = { + constexpr openspace::properties::Property::PropertyInfo DisplayStringInfo = { "DisplayString", "Display String", "The String that is being displayed. It must either be empty (in which case only " diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp index e431a5ae6a..40cc69d81f 100644 --- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp +++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp @@ -37,20 +37,20 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." }; - const openspace::properties::Property::PropertyInfo SimplificationInfo = { + constexpr openspace::properties::Property::PropertyInfo SimplificationInfo = { "Simplification", "Time Simplification", "If this value is enabled, the time is displayed in nuanced units, such as " @@ -58,7 +58,7 @@ namespace { "displayed in seconds." }; - const openspace::properties::Property::PropertyInfo RequestedUnitInfo = { + constexpr openspace::properties::Property::PropertyInfo RequestedUnitInfo = { "RequestedUnit", "Requested Unit", "If the simplification is disabled, this time unit is used as a destination to " diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp index 7f414e6ac7..c7815adb6d 100644 --- a/modules/base/dashboard/dashboarditemspacing.cpp +++ b/modules/base/dashboard/dashboarditemspacing.cpp @@ -28,7 +28,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo SpacingInfo = { + constexpr openspace::properties::Property::PropertyInfo SpacingInfo = { "Spacing", "Spacing", "This value determines the spacing (in pixels) that this item represents. The " diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 12ab591dc3..ae6c7bf734 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -45,21 +45,21 @@ namespace { constexpr const char* ProgramName = "ModelProgram"; constexpr const char* KeyGeometry = "Geometry"; - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "ColorTexture", "Color Texture", "This value points to a color texture file that is applied to the geometry " "rendered in this object." }; - const openspace::properties::Property::PropertyInfo ShadingInfo = { + constexpr openspace::properties::Property::PropertyInfo ShadingInfo = { "PerformShading", "Perform Shading", "This value determines whether this model should be shaded by using the position " "of the Sun." }; - const openspace::properties::Property::PropertyInfo ModelTransformInfo = { + constexpr openspace::properties::Property::PropertyInfo ModelTransformInfo = { "ModelTransform", "Model Transform", "This value specifies the model transform that is applied to the model before " diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp index 0af822a325..60abcb2cbd 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -49,7 +49,7 @@ namespace { BlendModeAdditive }; - const openspace::properties::Property::PropertyInfo BillboardInfo = { + constexpr openspace::properties::Property::PropertyInfo BillboardInfo = { "Billboard", "Billboard mode", "This value specifies whether the plane is a billboard, which means that it is " @@ -57,13 +57,13 @@ namespace { "transformations." }; - const openspace::properties::Property::PropertyInfo SizeInfo = { + constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", "This value specifies the size of the plane in meters." }; - const openspace::properties::Property::PropertyInfo BlendModeInfo = { + constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blending Mode", "This determines the blending mode that is applied to this plane." diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp index f3ffe8e5fb..ce1cdb2b93 100644 --- a/modules/base/rendering/renderableplaneimagelocal.cpp +++ b/modules/base/rendering/renderableplaneimagelocal.cpp @@ -33,7 +33,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "Texture", "Texture", "This value specifies an image that is loaded from disk and is used as a texture " diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp index 560000917e..5c3b61a9a0 100644 --- a/modules/base/rendering/renderableplaneimageonline.cpp +++ b/modules/base/rendering/renderableplaneimageonline.cpp @@ -34,7 +34,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "URL", "Image URL", "Sets the URL of the texture that is displayed on this screen space plane. If " diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp index 3623745156..83d44bc38b 100644 --- a/modules/base/rendering/renderablesphere.cpp +++ b/modules/base/rendering/renderablesphere.cpp @@ -48,7 +48,7 @@ namespace { Inside = 2 }; - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "Texture", "Texture", "This value specifies an image that is loaded from disk and is used as a texture " @@ -56,40 +56,40 @@ namespace { "projection." }; - const openspace::properties::Property::PropertyInfo OrientationInfo = { + constexpr openspace::properties::Property::PropertyInfo OrientationInfo = { "Orientation", "Orientation", "Specifies whether the texture is applied to the inside of the sphere, the " "outside of the sphere, or both." }; - const openspace::properties::Property::PropertyInfo SegmentsInfo = { + constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Number of Segments", "This value specifies the number of segments that the sphere is separated in." }; - const openspace::properties::Property::PropertyInfo SizeInfo = { + constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", "This value specifies the radius of the sphere in meters." }; - const openspace::properties::Property::PropertyInfo FadeOutThreshouldInfo = { + constexpr openspace::properties::Property::PropertyInfo FadeOutThreshouldInfo = { "FadeOutThreshould", "Fade-Out Threshould", "This value determines percentage of the sphere is visible before starting " "fading-out it." }; - const openspace::properties::Property::PropertyInfo FadeInThreshouldInfo = { + constexpr openspace::properties::Property::PropertyInfo FadeInThreshouldInfo = { "FadeInThreshould", "Fade-In Threshould", "Distance from center of MilkyWay from where the astronomical object starts to " "fade in." }; - const openspace::properties::Property::PropertyInfo DisableFadeInOuInfo = { + constexpr openspace::properties::Property::PropertyInfo DisableFadeInOuInfo = { "DisableFadeInOu", "Disable Fade-In/Fade-Out effects", "Enables/Disables the Fade-In/Out effects." diff --git a/modules/base/rendering/renderablesphericalgrid.cpp b/modules/base/rendering/renderablesphericalgrid.cpp index 034c7aa337..5f07668d06 100644 --- a/modules/base/rendering/renderablesphericalgrid.cpp +++ b/modules/base/rendering/renderablesphericalgrid.cpp @@ -37,33 +37,33 @@ namespace { constexpr const char* ProgramName = "GridProgram"; - const openspace::properties::Property::PropertyInfo GridColorInfo = { + constexpr openspace::properties::Property::PropertyInfo GridColorInfo = { "GridColor", "Grid Color", "This value determines the color of the grid lines that are rendered." }; - const openspace::properties::Property::PropertyInfo GridMatrixInfo = { + constexpr openspace::properties::Property::PropertyInfo GridMatrixInfo = { "GridMatrix", "Grid Matrix", "This value specifies the local transformation matrix that defines the " "orientation of this grid relative to the parent's rotation." }; - const openspace::properties::Property::PropertyInfo SegmentsInfo = { + constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Number of Segments", "This value specifies the number of segments that are used to render the " "surrounding sphere." }; - const openspace::properties::Property::PropertyInfo LineWidthInfo = { + constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", "This value specifies the line width of the spherical grid." }; - const openspace::properties::Property::PropertyInfo RadiusInfo = { + constexpr openspace::properties::Property::PropertyInfo RadiusInfo = { "Radius", "Radius", "This value specifies the radius of the grid." diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index 96c4dd351c..dc67969781 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -53,13 +53,13 @@ namespace { { "Points+Lines", RenderingModeLinesPoints } }; - const openspace::properties::Property::PropertyInfo LineColorInfo = { + constexpr openspace::properties::Property::PropertyInfo LineColorInfo = { "Color", "Color", "This value determines the RGB main color for the lines and points of the trail." }; - const openspace::properties::Property::PropertyInfo EnableFadeInfo = { + constexpr openspace::properties::Property::PropertyInfo EnableFadeInfo = { "EnableFade", "Enable line fading of old points", "Toggles whether the trail should fade older points out. If this value is " @@ -67,7 +67,7 @@ namespace { "'false', the entire trail is rendered at full opacity and color." }; - const openspace::properties::Property::PropertyInfo FadeInfo = { + constexpr openspace::properties::Property::PropertyInfo FadeInfo = { "Fade", "Line fade", "The fading factor that is applied to the trail if the 'EnableFade' value is " @@ -75,7 +75,7 @@ namespace { "the less fading is applied." }; - const openspace::properties::Property::PropertyInfo LineWidthInfo = { + constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", "This value specifies the line width of the trail if the selected rendering " @@ -83,7 +83,7 @@ namespace { "ignored." }; - const openspace::properties::Property::PropertyInfo PointSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo PointSizeInfo = { "PointSize", "Point Size", "This value specifies the base size of the points along the line if the selected " @@ -92,7 +92,7 @@ namespace { "values are half this size." }; - const openspace::properties::Property::PropertyInfo RenderingModeInfo = { + constexpr openspace::properties::Property::PropertyInfo RenderingModeInfo = { "Rendering", "Rendering Mode", "Determines how the trail should be rendered to the screen.If 'Lines' is " diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp index e6d0c900ea..99667a751f 100644 --- a/modules/base/rendering/renderabletrailorbit.cpp +++ b/modules/base/rendering/renderabletrailorbit.cpp @@ -79,7 +79,7 @@ // items in memory as was shown to be much slower than the current system. ---abock namespace { - const openspace::properties::Property::PropertyInfo PeriodInfo = { + constexpr openspace::properties::Property::PropertyInfo PeriodInfo = { "Period", "Period (in days)", "The objects period, i.e. the length of its orbit around the parent object given " @@ -88,7 +88,7 @@ namespace { "possible to show the effects of precession." }; - const openspace::properties::Property::PropertyInfo ResolutionInfo = { + constexpr openspace::properties::Property::PropertyInfo ResolutionInfo = { "Resolution", "Number of samples along the orbit", "The number of samples along the orbit. This determines the resolution of the " diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp index 152d03bd0d..4c8a47b3c2 100644 --- a/modules/base/rendering/renderabletrailtrajectory.cpp +++ b/modules/base/rendering/renderabletrailtrajectory.cpp @@ -43,21 +43,21 @@ // _endTime. This buffer is updated every frame. namespace { - const openspace::properties::Property::PropertyInfo StartTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo StartTimeInfo = { "StartTime", "Start Time", "The start time for the range of this trajectory. The date must be in ISO 8601 " "format: YYYY MM DD HH:mm:ss.xxx." }; - const openspace::properties::Property::PropertyInfo EndTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo EndTimeInfo = { "EndTime", "End Time", "The end time for the range of this trajectory. The date must be in ISO 8601 " "format: YYYY MM DD HH:mm:ss.xxx." }; - const openspace::properties::Property::PropertyInfo SampleIntervalInfo = { + constexpr openspace::properties::Property::PropertyInfo SampleIntervalInfo = { "SampleInterval", "Sample Interval", "The interval between samples of the trajectory. This value (together with " @@ -66,7 +66,7 @@ namespace { "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments." }; - const openspace::properties::Property::PropertyInfo TimeSubSampleInfo = { + constexpr openspace::properties::Property::PropertyInfo TimeSubSampleInfo = { "TimeStampSubsampleFactor", "Time Stamp Subsampling Factor", "The factor that is used to create subsamples along the trajectory. This value " @@ -75,7 +75,7 @@ namespace { "'EndTime' is split into 'SampleInterval' * 'TimeStampSubsampleFactor' segments." }; - const openspace::properties::Property::PropertyInfo RenderFullPathInfo = { + constexpr openspace::properties::Property::PropertyInfo RenderFullPathInfo = { "ShowFullTrail", "Render Full Trail", "If this value is set to 'true', the entire trail will be rendered; if it is " diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp index 04d29a44e8..791074709c 100644 --- a/modules/base/rendering/screenspacedashboard.cpp +++ b/modules/base/rendering/screenspacedashboard.cpp @@ -36,7 +36,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo UseMainInfo = { + constexpr openspace::properties::Property::PropertyInfo UseMainInfo = { "UseMainDashboard", "Use main dashboard", "If this value is set to 'true', this ScreenSpaceDashboard will use the " diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index c7d5191eea..e603515871 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -32,7 +32,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo SizeInfo = { + constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", "This value explicitly specifies the size of the screen space plane." diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp index 6e79ece36b..daecff5142 100644 --- a/modules/base/rendering/screenspaceimagelocal.cpp +++ b/modules/base/rendering/screenspaceimagelocal.cpp @@ -33,7 +33,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo TexturePathInfo = { + constexpr openspace::properties::Property::PropertyInfo TexturePathInfo = { "TexturePath", "Texture path", "Sets the path of the texture that is displayed on this screen space plane. If " diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp index b8a9138322..7f15266a39 100644 --- a/modules/base/rendering/screenspaceimageonline.cpp +++ b/modules/base/rendering/screenspaceimageonline.cpp @@ -35,7 +35,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "URL", "Image URL", "Sets the URL of the texture that is displayed on this screen space plane. If " diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp index 92a202d952..d075ce1e66 100644 --- a/modules/base/rotation/luarotation.cpp +++ b/modules/base/rotation/luarotation.cpp @@ -35,7 +35,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo ScriptInfo = { + constexpr openspace::properties::Property::PropertyInfo ScriptInfo = { "Script", "Script", "This value is the path to the Lua script that will be executed to compute the " diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp index 432fc54931..4b553cc55b 100644 --- a/modules/base/rotation/staticrotation.cpp +++ b/modules/base/rotation/staticrotation.cpp @@ -28,7 +28,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo RotationInfo = { + constexpr openspace::properties::Property::PropertyInfo RotationInfo = { "Rotation", "Rotation", "This value is the used as a 3x3 rotation matrix that is applied to the scene " diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp index 9de4a6dc58..50735113d2 100644 --- a/modules/base/scale/luascale.cpp +++ b/modules/base/scale/luascale.cpp @@ -36,7 +36,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo ScriptInfo = { + constexpr openspace::properties::Property::PropertyInfo ScriptInfo = { "Script", "Script", "This value is the path to the Lua script that will be executed to compute the " diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp index 1561ce024d..34f4255722 100644 --- a/modules/base/scale/staticscale.cpp +++ b/modules/base/scale/staticscale.cpp @@ -28,7 +28,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo ScaleInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleInfo = { "Scale", "Scale", "This value is used as a scaling factor for the scene graph node that this " diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp index 0511186628..d844f175c7 100644 --- a/modules/base/translation/luatranslation.cpp +++ b/modules/base/translation/luatranslation.cpp @@ -37,7 +37,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo ScriptInfo = { + constexpr openspace::properties::Property::PropertyInfo ScriptInfo = { "Script", "Script", "This value is the path to the Lua script that will be executed to compute the " diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp index 39caf0583c..64598e89bd 100644 --- a/modules/base/translation/statictranslation.cpp +++ b/modules/base/translation/statictranslation.cpp @@ -28,7 +28,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo PositionInfo = { + constexpr openspace::properties::Property::PropertyInfo PositionInfo = { "Position", "Position", "This value is used as a static offset (in meters) that is applied to the scene " diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp index 79b85b0b7b..3d4279a692 100644 --- a/modules/debugging/rendering/renderabledebugplane.cpp +++ b/modules/debugging/rendering/renderabledebugplane.cpp @@ -47,13 +47,13 @@ namespace { Center }; - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "Texture", "Texture", "The OpenGL name of the texture that is displayed on this plane." }; - const openspace::properties::Property::PropertyInfo BillboardInfo = { + constexpr openspace::properties::Property::PropertyInfo BillboardInfo = { "Billboard", "Billboard mode", "This value specifies whether the plane is a billboard, which means that it is " @@ -61,13 +61,13 @@ namespace { "transformations." }; - const openspace::properties::Property::PropertyInfo SizeInfo = { + constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size (in meters)", "This value specifies the size of the plane in meters." }; - const openspace::properties::Property::PropertyInfo OriginInfo = { + constexpr openspace::properties::Property::PropertyInfo OriginInfo = { "Origin", "Texture Coordinate Origin", "The origin of the texture coorinate system." diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 06fd1ab82f..310a47ad30 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -69,116 +69,116 @@ namespace { constexpr int8_t CurrentCacheVersion = 1; constexpr double PARSEC = 0.308567756E17; - const openspace::properties::Property::PropertyInfo SpriteTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = { "Texture", "Point Sprite Texture", "The path to the texture that should be used as the point sprite." }; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Transparency", "This value is a multiplicative factor that is applied to the transparency of " "all points." }; - const openspace::properties::Property::PropertyInfo ScaleFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " "size of each point." }; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", "This value is used to define the color of the astronomical object." }; - const openspace::properties::Property::PropertyInfo ColorMapInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorMapInfo = { "ColorMap", "Color Map File", "The path to the color map file of the astronomical object." }; - const openspace::properties::Property::PropertyInfo PolygonSidesInfo = { + constexpr openspace::properties::Property::PropertyInfo PolygonSidesInfo = { "PolygonSides", "Polygon Sides", "The number of sides for the polygon used to represent the astronomical object." }; - const openspace::properties::Property::PropertyInfo TextColorInfo = { + constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { "TextColor", "Text Color", "The text color for the astronomical object." }; - const openspace::properties::Property::PropertyInfo TextSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = { "TextSize", "Text Size", "The text size for the astronomical object labels." }; - const openspace::properties::Property::PropertyInfo LabelFileInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelFileInfo = { "LabelFile", "Label File", "The path to the label file that contains information about the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { "TextMinSize", "Text Min Size", "The minimal size (in pixels) of the text for the labels for the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { "TextMaxSize", "Text Max Size", "The maximum size (in pixels) of the text for the labels for the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo DrawElementsInfo = { + constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = { "DrawElements", "Draw Elements", "Enables/Disables the drawing of the astronomical objects." }; - const openspace::properties::Property::PropertyInfo DrawLabelInfo = { + constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = { "DrawLabels", "Draw Labels", "Determines whether labels should be drawn or hidden." }; - const openspace::properties::Property::PropertyInfo ColorOptionInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorOptionInfo = { "ColorOption", "Color Option", "This value determines which paramenter is used default color of the " "astronomical objects." }; - const openspace::properties::Property::PropertyInfo ColorRangeInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorRangeInfo = { "ColorRange", "Color Range", "This value determines the color ranges for the color parameter of the " "astronomical objects." }; - const openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { + constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { "TransformationMatrix", "Transformation Matrix", "Transformation matrix to be applied to each astronomical object." }; - const openspace::properties::Property::PropertyInfo RenderOptionInfo = { + constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOptionInfo", "Render Option", "Debug option for rendering of billboards and texts." }; - const openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { + constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { "FadeInDistances", "Fade-In Start and End Distances", "These values determine the initial and final distances from the center of " @@ -186,39 +186,40 @@ namespace { "fading-in." }; - const openspace::properties::Property::PropertyInfo DisableFadeInInfo = { + constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = { "DisableFadeIn", "Disable Fade-in effect", "Enables/Disables the Fade-in effect." }; - const openspace::properties::Property::PropertyInfo BillboardMaxSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo BillboardMaxSizeInfo = { "BillboardMaxSize", "Billboard Max Size in Pixels", "The max size (in pixels) for the billboard representing the astronomical " "object." }; - const openspace::properties::Property::PropertyInfo BillboardMinSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo BillboardMinSizeInfo = { "BillboardMinSize", "Billboard Min Size in Pixels", "The min size (in pixels) for the billboard representing the astronomical " "object." }; - const openspace::properties::Property::PropertyInfo CorrectionSizeEndDistanceInfo = { + constexpr openspace::properties::Property::PropertyInfo + CorrectionSizeEndDistanceInfo = { "CorrectionSizeEndDistance", "Distance in 10^X meters where correction size stops acting.", "Distance in 10^X meters where correction size stops acting." }; - const openspace::properties::Property::PropertyInfo CorrectionSizeFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo CorrectionSizeFactorInfo = { "CorrectionSizeFactor", "Control variable for distance size.", "" }; - const openspace::properties::Property::PropertyInfo PixelSizeControlInfo = { + constexpr openspace::properties::Property::PropertyInfo PixelSizeControlInfo = { "EnablePixelSizeControl", "Enable pixel size control.", "Enable pixel size control for rectangular projections." diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index 356eb7980b..fb2f46f535 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -63,84 +63,84 @@ namespace { constexpr const int8_t CurrentCacheVersion = 1; constexpr const double PARSEC = 0.308567756E17; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Transparency", "This value is a multiplicative factor that is applied to the transparency of " "all point." }; - //const openspace::properties::Property::PropertyInfo ScaleFactorInfo = { + //constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { // "ScaleFactor", // "Scale Factor", // "This value is used as a multiplicative factor that is applied to the apparent " // "size of each point." //}; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", "This value is used to define the color of the astronomical object." }; - const openspace::properties::Property::PropertyInfo TextColorInfo = { + constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { "TextColor", "Text Color", "The text color for the astronomical object." }; - const openspace::properties::Property::PropertyInfo TextSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = { "TextSize", "Text Size", "The text size for the astronomical object labels." }; - const openspace::properties::Property::PropertyInfo LabelFileInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelFileInfo = { "LabelFile", "Label File", "The path to the label file that contains information about the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { "TextMinSize", "Text Min Size", "The minimal size (in pixels) of the text for the labels for the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { "TextMaxSize", "Text Max Size", "The maximum size (in pixels) of the text for the labels for the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo DrawElementsInfo = { + constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = { "DrawElements", "Draw Elements", "Enables/Disables the drawing of the astronomical objects." }; - const openspace::properties::Property::PropertyInfo DrawLabelInfo = { + constexpr openspace::properties::Property::PropertyInfo DrawLabelInfo = { "DrawLabels", "Draw Labels", "Determines whether labels should be drawn or hidden." }; - const openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { + constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { "TransformationMatrix", "Transformation Matrix", "Transformation matrix to be applied to each astronomical object." }; - const openspace::properties::Property::PropertyInfo MeshColorInfo = { + constexpr openspace::properties::Property::PropertyInfo MeshColorInfo = { "MeshColor", "Meshes colors", "The defined colors for the meshes to be rendered." }; - const openspace::properties::Property::PropertyInfo RenderOptionInfo = { + constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOptionInfo", "Render Option", "Debug option for rendering of billboards and texts." diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index dc3965a26b..bcab762080 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -65,96 +65,96 @@ namespace { BlendModeAdditive }; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Transparency", "This value is a multiplicative factor that is applied to the transparency of " "all points." }; - const openspace::properties::Property::PropertyInfo ScaleFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " "size of each point." }; - const openspace::properties::Property::PropertyInfo TextColorInfo = { + constexpr openspace::properties::Property::PropertyInfo TextColorInfo = { "TextColor", "Text Color", "The text color for the astronomical object." }; - const openspace::properties::Property::PropertyInfo TextSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TextSizeInfo = { "TextSize", "Text Size", "The text size for the astronomical object labels." }; - const openspace::properties::Property::PropertyInfo LabelFileInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelFileInfo = { "LabelFile", "Label File", "The path to the label file that contains information about the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = { "TextMinSize", "Text Min Size", "The minimal size (in pixels) of the text for the labels for the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo LabelMaxSizeInfo = { "TextMaxSize", "Text Max Size", "The maximum size (in pixels) of the text for the labels for the astronomical " "objects being rendered." }; - const openspace::properties::Property::PropertyInfo DrawElementsInfo = { + constexpr openspace::properties::Property::PropertyInfo DrawElementsInfo = { "DrawElements", "Draw Elements", "Enables/Disables the drawing of the astronomical objects." }; - const openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { + constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = { "TransformationMatrix", "Transformation Matrix", "Transformation matrix to be applied to each astronomical object." }; - const openspace::properties::Property::PropertyInfo BlendModeInfo = { + constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blending Mode", "This determines the blending mode that is applied to this plane." }; - const openspace::properties::Property::PropertyInfo TexturePathInfo = { + constexpr openspace::properties::Property::PropertyInfo TexturePathInfo = { "TexturePath", "Texture Path", "This value specifies the path for the textures in disk." }; - const openspace::properties::Property::PropertyInfo LuminosityInfo = { + constexpr openspace::properties::Property::PropertyInfo LuminosityInfo = { "Luminosity", "Luminosity variable", "Datavar variable to control the luminosity/size of the astronomical objects." }; - const openspace::properties::Property::PropertyInfo ScaleLuminosityInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleLuminosityInfo = { "ScaleLuminosity", "ScaleLuminosity variable", "Scaling control for the luminosity/size of the astronomical objects." }; - const openspace::properties::Property::PropertyInfo RenderOptionInfo = { + constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = { "RenderOptionInfo", "Render Option", "Debug option for rendering of billboards and texts." }; - const openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { + constexpr openspace::properties::Property::PropertyInfo FadeInDistancesInfo = { "FadeInDistances", "Fade-In Start and End Distances", "These values determine the initial and final distances from the center of " @@ -162,13 +162,13 @@ namespace { "fading-in." }; - const openspace::properties::Property::PropertyInfo DisableFadeInInfo = { + constexpr openspace::properties::Property::PropertyInfo DisableFadeInInfo = { "DisableFadeIn", "Disable Fade-in effect", "Enables/Disables the Fade-in effect." }; - const openspace::properties::Property::PropertyInfo PlaneMinSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo PlaneMinSizeInfo = { "PlaneMinSize", "Plane Min Size in Pixels", "The min size (in pixels) for the plane representing the astronomical " diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp index 65886206fe..6e98ab3547 100644 --- a/modules/digitaluniverse/rendering/renderablepoints.cpp +++ b/modules/digitaluniverse/rendering/renderablepoints.cpp @@ -61,33 +61,33 @@ namespace { constexpr int8_t CurrentCacheVersion = 1; constexpr double PARSEC = 0.308567756E17; - const openspace::properties::Property::PropertyInfo SpriteTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo SpriteTextureInfo = { "Texture", "Point Sprite Texture", "The path to the texture that should be used as the point sprite." }; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Transparency", "This value is a multiplicative factor that is applied to the transparency of " "all points." }; - const openspace::properties::Property::PropertyInfo ScaleFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " "size of each point." }; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", "This value is used to define the color of the astronomical object." }; - const openspace::properties::Property::PropertyInfo ColorMapInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorMapInfo = { "ColorMap", "Color Map File", "The path to the color map file of the astronomical onject." diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp index c7fa5cda77..b28848a05e 100644 --- a/modules/fieldlines/rendering/renderablefieldlines.cpp +++ b/modules/fieldlines/rendering/renderablefieldlines.cpp @@ -70,32 +70,32 @@ namespace { constexpr const int SeedPointSourceFile = 0; constexpr const int SeedPointSourceTable = 1; - const openspace::properties::Property::PropertyInfo StepSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = { KeyFieldlinesStepSize, //"StepSize", "Fieldline Step Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo Classification = { + constexpr openspace::properties::Property::PropertyInfo Classification = { KeyFieldlinesClassification, "Fieldline Classification", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo FieldlineColorInfo = { + constexpr openspace::properties::Property::PropertyInfo FieldlineColorInfo = { "FieldlineColor", "Fieldline Color", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SeedPointSourceInfo = { + constexpr openspace::properties::Property::PropertyInfo SeedPointSourceInfo = { "Source", "SeedPoint Source", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SeedPointFileInfo = { + constexpr openspace::properties::Property::PropertyInfo SeedPointFileInfo = { "SourceFile", "SeedPoint File", "" // @TODO Missing documentation diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp index 10818eb386..0cb5811b04 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp @@ -87,99 +87,99 @@ namespace { constexpr const char* ValueInputFileTypeOsfls = "osfls"; // --------------------------------- Property Info -------------------------------- // - const openspace::properties::Property::PropertyInfo ColorMethodInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorMethodInfo = { "colorMethod", "Color Method", "Color lines uniformly or using color tables based on extra quantities like, for " "examples, temperature or particle density." }; - const openspace::properties::Property::PropertyInfo ColorQuantityInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorQuantityInfo = { "colorQuantity", "Quantity to Color By", "Quantity used to color lines if the 'By Quantity' color method is selected." }; - const openspace::properties::Property::PropertyInfo ColorQuantityMinInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorQuantityMinInfo = { "colorQuantityMin", "ColorTable Min Value", "Value to map to the lowest end of the color table." }; - const openspace::properties::Property::PropertyInfo ColorQuantityMaxInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorQuantityMaxInfo = { "colorQuantityMax", "ColorTable Max Value", "Value to map to the highest end of the color table." }; - const openspace::properties::Property::PropertyInfo ColorTablePathInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorTablePathInfo = { "colorTablePath", "Path to Color Table", "Color Table/Transfer Function to use for 'By Quantity' coloring." }; - const openspace::properties::Property::PropertyInfo ColorUniformInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorUniformInfo = { "uniform", "Uniform Line Color", "The uniform color of lines shown when 'Color Method' is set to 'Uniform'." }; - const openspace::properties::Property::PropertyInfo ColorUseABlendingInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorUseABlendingInfo = { "aBlendingEnabled", "Additive Blending", "Activate/deactivate additive blending." }; - const openspace::properties::Property::PropertyInfo DomainEnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo DomainEnabledInfo = { "domainEnabled", "Domain Limits", "Enable/Disable domain limits" }; - const openspace::properties::Property::PropertyInfo DomainXInfo = { + constexpr openspace::properties::Property::PropertyInfo DomainXInfo = { "limitsX", "X-limits", "Valid range along the X-axis. [Min, Max]" }; - const openspace::properties::Property::PropertyInfo DomainYInfo = { + constexpr openspace::properties::Property::PropertyInfo DomainYInfo = { "limitsY", "Y-limits", "Valid range along the Y-axis. [Min, Max]" }; - const openspace::properties::Property::PropertyInfo DomainZInfo = { + constexpr openspace::properties::Property::PropertyInfo DomainZInfo = { "limitsZ", "Z-limits", "Valid range along the Z-axis. [Min, Max]" }; - const openspace::properties::Property::PropertyInfo DomainRInfo = { + constexpr openspace::properties::Property::PropertyInfo DomainRInfo = { "limitsR", "Radial limits", "Valid radial range. [Min, Max]" }; - const openspace::properties::Property::PropertyInfo FlowColorInfo = { + constexpr openspace::properties::Property::PropertyInfo FlowColorInfo = { "color", "Color", "Color of particles." }; - const openspace::properties::Property::PropertyInfo FlowEnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo FlowEnabledInfo = { "flowEnabled", "Flow Direction", "Toggles the rendering of moving particles along the lines. Can, for example, " "illustrate magnetic flow." }; - const openspace::properties::Property::PropertyInfo FlowReversedInfo = { + constexpr openspace::properties::Property::PropertyInfo FlowReversedInfo = { "reversed", "Reversed Flow", "Toggle to make the flow move in the opposite direction." }; - const openspace::properties::Property::PropertyInfo FlowParticleSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FlowParticleSizeInfo = { "particleSize", "Particle Size", "Size of the particles." }; - const openspace::properties::Property::PropertyInfo FlowParticleSpacingInfo = { + constexpr openspace::properties::Property::PropertyInfo FlowParticleSpacingInfo = { "particleSpacing", "Particle Spacing", "Spacing inbetween particles." }; - const openspace::properties::Property::PropertyInfo FlowSpeedInfo = { + constexpr openspace::properties::Property::PropertyInfo FlowSpeedInfo = { "speed", "Speed", "Speed of the flow." }; - const openspace::properties::Property::PropertyInfo MaskingEnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo MaskingEnabledInfo = { "maskingEnabled", "Masking", "Enable/disable masking. Use masking to show lines where a given quantity is " @@ -187,27 +187,27 @@ namespace { "temperature is between 10 and 20 degrees. Also used for masking out line " "topologies like solar wind & closed lines." }; - const openspace::properties::Property::PropertyInfo MaskingMinInfo = { + constexpr openspace::properties::Property::PropertyInfo MaskingMinInfo = { "maskingMinLimit", "Lower Limit", "Lower limit of the valid masking range" }; - const openspace::properties::Property::PropertyInfo MaskingMaxInfo = { + constexpr openspace::properties::Property::PropertyInfo MaskingMaxInfo = { "maskingMaxLimit", "Upper Limit", "Upper limit of the valid masking range" }; - const openspace::properties::Property::PropertyInfo MaskingQuantityInfo = { + constexpr openspace::properties::Property::PropertyInfo MaskingQuantityInfo = { "maskingQuantity", "Quantity used for Masking", "Quantity used for masking." }; - const openspace::properties::Property::PropertyInfo OriginButtonInfo = { + constexpr openspace::properties::Property::PropertyInfo OriginButtonInfo = { "focusCameraOnParent", "Focus Camera", "Focus camera on parent." }; - const openspace::properties::Property::PropertyInfo TimeJumpButtonInfo = { + constexpr openspace::properties::Property::PropertyInfo TimeJumpButtonInfo = { "timeJumpToStart", "Jump to Start Of Sequence", "Performs a time jump to the start of the sequence." diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index e43a589855..bf8891fb41 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -58,31 +58,31 @@ namespace { constexpr const char* GlslBoundsFsPath = "${MODULES}/toyvolume/shaders/boundsFs.glsl"; constexpr const char* _loggerCat = "Renderable Galaxy"; - const openspace::properties::Property::PropertyInfo StepSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = { "StepSize", "Step Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo PointStepSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo PointStepSizeInfo = { "PointStepSize", "Point Step Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TranslationInfo = { + constexpr openspace::properties::Property::PropertyInfo TranslationInfo = { "Translation", "Translation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo RotationInfo = { + constexpr openspace::properties::Property::PropertyInfo RotationInfo = { "Rotation", "Euler rotation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo EnabledPointsRatioInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledPointsRatioInfo = { "NEnabledPointsRatio", "Enabled points", "" // @TODO Missing documentation diff --git a/modules/globebrowsing/cache/memoryawaretilecache.cpp b/modules/globebrowsing/cache/memoryawaretilecache.cpp index fc797e8e01..2d615c25db 100644 --- a/modules/globebrowsing/cache/memoryawaretilecache.cpp +++ b/modules/globebrowsing/cache/memoryawaretilecache.cpp @@ -34,39 +34,39 @@ namespace { constexpr const char* _loggerCat = "MemoryAwareTileCache"; - const openspace::properties::Property::PropertyInfo CpuAllocatedDataInfo = { + constexpr openspace::properties::Property::PropertyInfo CpuAllocatedDataInfo = { "CpuAllocatedTileData", "CPU allocated tile data (MB)", "This value denotes the amount of RAM memory (in MB) that this tile cache is " "utilizing." }; - const openspace::properties::Property::PropertyInfo GpuAllocatedDataInfo = { + constexpr openspace::properties::Property::PropertyInfo GpuAllocatedDataInfo = { "GpuAllocatedTileData", "GPU allocated tile data (MB)", "This value denotes the amount of GPU memory (in MB) that this tile cache is " "utilizing." }; - const openspace::properties::Property::PropertyInfo TileCacheSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TileCacheSizeInfo = { "TileCacheSize", "Tile cache size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ApplyTileCacheInfo = { + constexpr openspace::properties::Property::PropertyInfo ApplyTileCacheInfo = { "ApplyTileCacheSize", "Apply tile cache size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ClearTileCacheInfo = { + constexpr openspace::properties::Property::PropertyInfo ClearTileCacheInfo = { "ClearTileCache", "Clear tile cache", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UsePboInfo = { + constexpr openspace::properties::Property::PropertyInfo UsePboInfo = { "UsePbo", "Use PBO", "If this value is enabled, pixel buffer objects are used to upload the texture " diff --git a/modules/globebrowsing/globes/pointglobe.cpp b/modules/globebrowsing/globes/pointglobe.cpp index da5e1a9f3a..42d1d38e51 100644 --- a/modules/globebrowsing/globes/pointglobe.cpp +++ b/modules/globebrowsing/globes/pointglobe.cpp @@ -32,13 +32,13 @@ #include namespace { - const openspace::properties::Property::PropertyInfo IntensityClampInfo = { + constexpr openspace::properties::Property::PropertyInfo IntensityClampInfo = { "IntensityClamp", "Intensity clamp", "" }; - const openspace::properties::Property::PropertyInfo LightIntensityInfo = { + constexpr openspace::properties::Property::PropertyInfo LightIntensityInfo = { "LightIntensity", "Light intensity", "" // @TODO Missing documentation diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp index 57024c4739..bc98c4f556 100644 --- a/modules/globebrowsing/globes/renderableglobe.cpp +++ b/modules/globebrowsing/globes/renderableglobe.cpp @@ -39,127 +39,127 @@ namespace { constexpr const char* keyShadowSource = "Source"; constexpr const char* keyShadowCaster = "Caster"; - const openspace::properties::Property::PropertyInfo SaveOrThrowInfo = { + constexpr openspace::properties::Property::PropertyInfo SaveOrThrowInfo = { "SaveOrThrowCamera", "Save or throw camera", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ShowChunkEdgeInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowChunkEdgeInfo = { "ShowChunkEdges", "Show chunk edges", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ShowChunkBoundsInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowChunkBoundsInfo = { "ShowChunkBounds", "Show chunk bounds", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ShowChunkAABBInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowChunkAABBInfo = { "ShowChunkAABB", "Show chunk AABB", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo HeightResolutionInfo = { + constexpr openspace::properties::Property::PropertyInfo HeightResolutionInfo = { "ShowHeightResolution", "Show height resolution", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo HeightIntensityInfo = { + constexpr openspace::properties::Property::PropertyInfo HeightIntensityInfo = { "ShowHeightIntensities", "Show height intensities", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo FrustumCullingInfo = { + constexpr openspace::properties::Property::PropertyInfo FrustumCullingInfo = { "PerformFrustumCulling", "Perform frustum culling", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo HorizonCullingInfo = { + constexpr openspace::properties::Property::PropertyInfo HorizonCullingInfo = { "PerformHorizonCulling", "Perform horizon culling", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo LevelProjectedAreaInfo = { + constexpr openspace::properties::Property::PropertyInfo LevelProjectedAreaInfo = { "LevelByProjectedAreaElseDistance", "Level by projected area (else distance)", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ResetTileProviderInfo = { + constexpr openspace::properties::Property::PropertyInfo ResetTileProviderInfo = { "ResetTileProviders", "Reset tile providers", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo CollectStatsInfo = { + constexpr openspace::properties::Property::PropertyInfo CollectStatsInfo = { "CollectStats", "Collect stats", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo LimitLevelInfo = { + constexpr openspace::properties::Property::PropertyInfo LimitLevelInfo = { "LimitLevelByAvailableData", "Limit level by available data", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ModelSpaceRenderingInfo = { + constexpr openspace::properties::Property::PropertyInfo ModelSpaceRenderingInfo = { "ModelSpaceRenderingCutoffLevel", "Model Space Rendering Cutoff Level", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo PerformShadingInfo = { + constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = { "PerformShading", "Perform shading", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo AtmosphereInfo = { + constexpr openspace::properties::Property::PropertyInfo AtmosphereInfo = { "Atmosphere", "Atmosphere", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo AccurateNormalsInfo = { + constexpr openspace::properties::Property::PropertyInfo AccurateNormalsInfo = { "UseAccurateNormals", "Use Accurate Normals", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo EclipseInfo = { + constexpr openspace::properties::Property::PropertyInfo EclipseInfo = { "Eclipse", "Eclipse", "Enables/Disable Eclipse shadows" }; - const openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = { + constexpr openspace::properties::Property::PropertyInfo EclipseHardShadowsInfo = { "EclipseHardShadows", "Eclipse Hard Shadows", "Enables the rendering of eclipse shadows using hard shadows" }; - const openspace::properties::Property::PropertyInfo LodScaleFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo LodScaleFactorInfo = { "LodScaleFactor", "Level of Detail Scale Factor", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo CameraMinHeightInfo = { + constexpr openspace::properties::Property::PropertyInfo CameraMinHeightInfo = { "CameraMinHeight", "Camera Minimum Height", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo OrenNayarRoughnessInfo = { + constexpr openspace::properties::Property::PropertyInfo OrenNayarRoughnessInfo = { "OrenNayarRoughness", "orenNayarRoughness", "" // @TODO Missing documentation diff --git a/modules/globebrowsing/rendering/layer/layer.cpp b/modules/globebrowsing/rendering/layer/layer.cpp index fe00281a4c..1a77bc1cc5 100644 --- a/modules/globebrowsing/rendering/layer/layer.cpp +++ b/modules/globebrowsing/rendering/layer/layer.cpp @@ -46,21 +46,21 @@ namespace { constexpr const char* KeyBlendMode = "BlendMode"; constexpr const char* KeyPadTiles = "PadTiles"; - const openspace::properties::Property::PropertyInfo TypeInfo = { + constexpr openspace::properties::Property::PropertyInfo TypeInfo = { "Type", "Type", "The type of this Layer. This value is a read-only property and thus cannot be " "changed." }; - const openspace::properties::Property::PropertyInfo BlendModeInfo = { + constexpr openspace::properties::Property::PropertyInfo BlendModeInfo = { "BlendMode", "Blend Mode", "This value specifies the blend mode that is applied to this layer. The blend " "mode determines how this layer is added to the underlying layers beneath." }; - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Enabled", "If this value is enabled, the layer will be used for the final composition of " @@ -68,21 +68,21 @@ namespace { "composition." }; - const openspace::properties::Property::PropertyInfo ResetInfo = { + constexpr openspace::properties::Property::PropertyInfo ResetInfo = { "Reset", "Reset", "If this value is triggered, this layer will be reset. This will delete the " "local cache for this layer and will trigger a fresh load of all tiles." }; - const openspace::properties::Property::PropertyInfo RemoveInfo = { + constexpr openspace::properties::Property::PropertyInfo RemoveInfo = { "Remove", "Remove", "If this value is triggered, a script will be executed that will remove this " "layer before the next frame." }; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", "If the 'Type' of this layer is a solid color, this value determines what this " diff --git a/modules/globebrowsing/rendering/layer/layeradjustment.cpp b/modules/globebrowsing/rendering/layer/layeradjustment.cpp index 29e55bbb1d..bdde0efbdd 100644 --- a/modules/globebrowsing/rendering/layer/layeradjustment.cpp +++ b/modules/globebrowsing/rendering/layer/layeradjustment.cpp @@ -29,20 +29,20 @@ namespace { constexpr const char* keyChromaKeyColor = "ChromaKeyColor"; constexpr const char* keyChromaKeyTolerance = "ChromaKeyTolerance"; - const openspace::properties::Property::PropertyInfo ChromaKeyColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ChromaKeyColorInfo = { "ChromaKeyColor", "Chroma Key Color", "This color is used as the chroma key for the layer that is adjusted." }; - const openspace::properties::Property::PropertyInfo ChromaKeyToleranceInfo = { + constexpr openspace::properties::Property::PropertyInfo ChromaKeyToleranceInfo = { "ChromaKeyTolerance", "Chroma Key Tolerance", "This value determines the tolerance that is used to determine whether a color " "is matching the selected Chroma key." }; - const openspace::properties::Property::PropertyInfo TypeInfo = { + constexpr openspace::properties::Property::PropertyInfo TypeInfo = { "Type", "Type", "The type of layer adjustment that is applied to the underlying layer." diff --git a/modules/globebrowsing/rendering/layer/layergroup.cpp b/modules/globebrowsing/rendering/layer/layergroup.cpp index 0cc9cadcca..aa673c001b 100644 --- a/modules/globebrowsing/rendering/layer/layergroup.cpp +++ b/modules/globebrowsing/rendering/layer/layergroup.cpp @@ -31,7 +31,7 @@ namespace { constexpr const char* _loggerCat = "LayerGroup"; constexpr const char* KeyFallback = "Fallback"; - const openspace::properties::Property::PropertyInfo BlendTileInfo = { + constexpr openspace::properties::Property::PropertyInfo BlendTileInfo = { "BlendTileLevels", "Blend between levels", "If this value is enabled, images between different levels are interpolated, " diff --git a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp index 5dca3904a6..284fb8b140 100644 --- a/modules/globebrowsing/rendering/layer/layerrendersettings.cpp +++ b/modules/globebrowsing/rendering/layer/layerrendersettings.cpp @@ -30,14 +30,14 @@ namespace { constexpr const char* keyMultiplier = "Multiplier"; constexpr const char* keyOffset = "Offset"; - const openspace::properties::Property::PropertyInfo SetDefaultInfo = { + constexpr openspace::properties::Property::PropertyInfo SetDefaultInfo = { "SetDefault", "Set Default", "If this value is triggered it will reset all of these values to their default " "values." }; - const openspace::properties::Property::PropertyInfo OpacityInfo = { + constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { "Opacity", "Opacity", "This value sets the transparency of this layer. If this value is equal to '1', " @@ -45,20 +45,20 @@ namespace { "completely transparent." }; - const openspace::properties::Property::PropertyInfo GammaInfo = { + constexpr openspace::properties::Property::PropertyInfo GammaInfo = { "Gamma", "Gamma", "This value is used as an exponent to adjust the color for each tile." }; - const openspace::properties::Property::PropertyInfo MultiplierInfo = { + constexpr openspace::properties::Property::PropertyInfo MultiplierInfo = { "Multiplier", "Multiplier", "This value is used as a multiplier to adjust the color applied after taking the " "gamma value as an exponent." }; - const openspace::properties::Property::PropertyInfo OffsetInfo = { + constexpr openspace::properties::Property::PropertyInfo OffsetInfo = { "Offset", "Offset", "This value is used as an additive modifier to adjust the color applied after " diff --git a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp index f04a30a135..983fbd1f01 100644 --- a/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp +++ b/modules/globebrowsing/tile/rawtiledatareader/gdalwrapper.cpp @@ -40,14 +40,14 @@ namespace { constexpr const char* _loggerCat = "GdalWrapper"; - const openspace::properties::Property::PropertyInfo LogGdalErrorInfo = { + constexpr openspace::properties::Property::PropertyInfo LogGdalErrorInfo = { "LogGdalErrors", "Log GDAL errors", "If this value is enabled, any error that is raised by GDAL will be logged using " "the logmanager. If this value is disabled, any error will be ignored." }; - const openspace::properties::Property::PropertyInfo GdalMaximumCacheInfo = { + constexpr openspace::properties::Property::PropertyInfo GdalMaximumCacheInfo = { "GdalMaximumCacheSize", "GDAL maximum cache size", "This function sets the maximum amount of RAM memory in MB that GDAL is " diff --git a/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp b/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp index 67210fffcf..dbf83b9f72 100644 --- a/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/defaulttileprovider.cpp @@ -40,14 +40,14 @@ namespace { constexpr const char* KeyPreCacheLevel = "PreCacheLevel"; constexpr const char* KeyPadTiles = "PadTiles"; - const openspace::properties::Property::PropertyInfo FilePathInfo = { + constexpr openspace::properties::Property::PropertyInfo FilePathInfo = { "FilePath", "File Path", "The path of the GDAL file or the image file that is to be used in this tile " "provider." }; - const openspace::properties::Property::PropertyInfo TilePixelSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TilePixelSizeInfo = { "TilePixelSize", "Tile Pixel Size", "This value is the preferred size (in pixels) for each tile. Choosing the right " diff --git a/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp b/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp index baa404b4a3..52ad871d56 100644 --- a/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/singleimageprovider.cpp @@ -32,7 +32,7 @@ namespace { constexpr const char* KeyFilePath = "FilePath"; - const openspace::properties::Property::PropertyInfo FilePathInfo = { + constexpr openspace::properties::Property::PropertyInfo FilePathInfo = { "FilePath", "File Path", "The file path that is used for this image provider. The file must point to an " diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp index d1618052a5..c9df24c384 100644 --- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp @@ -46,7 +46,7 @@ namespace { constexpr const char* KeyPreCacheStartTime = "PreCacheStartTime"; constexpr const char* KeyPreCacheEndTime = "PreCacheEndTime"; - const openspace::properties::Property::PropertyInfo FilePathInfo = { + constexpr openspace::properties::Property::PropertyInfo FilePathInfo = { "FilePath", "File Path", "This is the path to the XML configuration file that describes the temporal tile " diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp index f19d6ac900..a6b4972c9e 100644 --- a/modules/imgui/src/gui.cpp +++ b/modules/imgui/src/gui.cpp @@ -83,20 +83,20 @@ namespace { ); } - const openspace::properties::Property::PropertyInfo ShowHelpInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowHelpInfo = { "ShowHelpText", "Show tooltip help", "If this value is enabled these kinds of tooltips are shown for most properties " "explaining what impact they have on the visuals." }; - const openspace::properties::Property::PropertyInfo HelpTextDelayInfo = { + constexpr openspace::properties::Property::PropertyInfo HelpTextDelayInfo = { "HelpTextDelay", "Tooltip Delay (in s)", "This value determines the delay in seconds after which the tooltip is shown." }; - const openspace::properties::Property::PropertyInfo HiddenInfo = { + constexpr openspace::properties::Property::PropertyInfo HiddenInfo = { "IsHidden", "Is Hidden", "If this value is true, all GUI items will not be rendered, regardless of their " diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp index 795e3f51c8..51dc248720 100644 --- a/modules/imgui/src/guicomponent.cpp +++ b/modules/imgui/src/guicomponent.cpp @@ -25,13 +25,13 @@ #include namespace { - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", "This setting determines whether this object will be visible or not." }; - const openspace::properties::Property::PropertyInfo CollapsedInfo = { + constexpr openspace::properties::Property::PropertyInfo CollapsedInfo = { "Collapsed", "Is Collapsed", "This setting determines whether this window is collapsed or not." diff --git a/modules/imgui/src/guiperformancecomponent.cpp b/modules/imgui/src/guiperformancecomponent.cpp index b4e67bc47c..81daa8820e 100644 --- a/modules/imgui/src/guiperformancecomponent.cpp +++ b/modules/imgui/src/guiperformancecomponent.cpp @@ -44,27 +44,27 @@ namespace { Total = 5 }; - const openspace::properties::Property::PropertyInfo SortingSelectionInfo = { + constexpr openspace::properties::Property::PropertyInfo SortingSelectionInfo = { "SortingSelection", "Sorting", "This value determines the sorting order of the performance measurements." }; - const openspace::properties::Property::PropertyInfo SceneGraphEnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo SceneGraphEnabledInfo = { "ShowSceneGraph", "Show Scene Graph Measurements", "If this value is enabled, the window showing the measurements for the scene " "graph values is visible." }; - const openspace::properties::Property::PropertyInfo FunctionsEnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo FunctionsEnabledInfo = { "ShowFunctions", "Show Function Measurements", "If this value is enabled, the window showing the measurements for the " "individual functions is visible." }; - const openspace::properties::Property::PropertyInfo OutputLogsInfo = { + constexpr openspace::properties::Property::PropertyInfo OutputLogsInfo = { "OutputLogs", "Output Logs", "" // @TODO Missing documentation diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp index 50e463586c..3b4faf7296 100644 --- a/modules/imgui/src/guipropertycomponent.cpp +++ b/modules/imgui/src/guipropertycomponent.cpp @@ -35,7 +35,7 @@ namespace { const ImVec2 Size = ImVec2(350, 500); - const openspace::properties::Property::PropertyInfo UseTreeInfo = { + constexpr openspace::properties::Property::PropertyInfo UseTreeInfo = { "TreeLayout", "Use Tree Layout", "If this value is checked, this component will display the properties using a " @@ -43,7 +43,7 @@ namespace { "property windows that display SceneGraphNodes, or the application might crash." }; - const openspace::properties::Property::PropertyInfo OrderingInfo = { + constexpr openspace::properties::Property::PropertyInfo OrderingInfo = { "Ordering", "Tree Ordering", "This list determines the order of the first tree layer if it is used. Elements " @@ -51,7 +51,7 @@ namespace { "elements not listed." }; - const openspace::properties::Property::PropertyInfo IgnoreHiddenInfo = { + constexpr openspace::properties::Property::PropertyInfo IgnoreHiddenInfo = { "IgnoreHidden", "Ignore Hidden Hint", "If this value is 'true', all 'Hidden' hints passed into the SceneGraphNodes are " diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp index a7d572cb37..e5623ac8b4 100644 --- a/modules/iswa/rendering/datacygnet.cpp +++ b/modules/iswa/rendering/datacygnet.cpp @@ -39,43 +39,43 @@ namespace { constexpr const char* _loggerCat = "DataCygnet"; constexpr const int MaxTextures = 6; - const openspace::properties::Property::PropertyInfo DataOptionsInfo = { + constexpr openspace::properties::Property::PropertyInfo DataOptionsInfo = { "DataOptions", "Data Options", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UseLogInfo = { + constexpr openspace::properties::Property::PropertyInfo UseLogInfo = { "UseLog", "Use Logarithm", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UseHistogramInfo = { + constexpr openspace::properties::Property::PropertyInfo UseHistogramInfo = { "UseHistogram", "Auto Contrast", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo AutoFilterInfo = { + constexpr openspace::properties::Property::PropertyInfo AutoFilterInfo = { "AutoFilter", "Auto Filter", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo NormalizeValuesInfo = { + constexpr openspace::properties::Property::PropertyInfo NormalizeValuesInfo = { "NormValues", "Normalize Values", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo BackgroundInfo = { + constexpr openspace::properties::Property::PropertyInfo BackgroundInfo = { "BackgroundValues", "Background Values", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TransferFunctionsFile = { + constexpr openspace::properties::Property::PropertyInfo TransferFunctionsFile = { "Transferfunctions", "Transfer Functions", "" // @TODO Missing documentation diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp index e3fe8ee5c8..5d96443b3c 100644 --- a/modules/iswa/rendering/iswabasegroup.cpp +++ b/modules/iswa/rendering/iswabasegroup.cpp @@ -31,19 +31,19 @@ namespace { constexpr const char* _loggerCat = "IswaBaseGroup"; using json = nlohmann::json; - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Enabled", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo AlphaInfo = { + constexpr openspace::properties::Property::PropertyInfo AlphaInfo = { "Alpha", "Alpha", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo DeleteInfo = { + constexpr openspace::properties::Property::PropertyInfo DeleteInfo = { "Delete", "Delete", "" // @TODO Missing documentation diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp index 0cd09e444c..80e6d62a79 100644 --- a/modules/iswa/rendering/iswacygnet.cpp +++ b/modules/iswa/rendering/iswacygnet.cpp @@ -43,12 +43,12 @@ namespace { constexpr const char* _loggerCat = "IswaCygnet"; - const openspace::properties::Property::PropertyInfo DeleteInfo = { + constexpr openspace::properties::Property::PropertyInfo DeleteInfo = { "Delete", "Delete", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo AlphaInfo = { + constexpr openspace::properties::Property::PropertyInfo AlphaInfo = { "Alpha", "Alpha", "" // @TODO Missing documentation diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp index b648f4e8f0..c1f2674ac6 100644 --- a/modules/iswa/rendering/iswadatagroup.cpp +++ b/modules/iswa/rendering/iswadatagroup.cpp @@ -38,43 +38,43 @@ namespace { constexpr const char* _loggerCat = "IswaDataGroup"; using json = nlohmann::json; - const openspace::properties::Property::PropertyInfo UseLogInfo = { + constexpr openspace::properties::Property::PropertyInfo UseLogInfo = { "UseLog", "Use Logarithm", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UseHistogramInfo = { + constexpr openspace::properties::Property::PropertyInfo UseHistogramInfo = { "UseHistogram", "Auto Contrast", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo AutoFilterInfo = { + constexpr openspace::properties::Property::PropertyInfo AutoFilterInfo = { "AutoFilter", "Auto Filter", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo NormalizeValues = { + constexpr openspace::properties::Property::PropertyInfo NormalizeValues = { "NormValues", "Normalize Values", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo BackgroundInfo = { + constexpr openspace::properties::Property::PropertyInfo BackgroundInfo = { "BackgroundValues", "Background Values", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TransferFunctionInfo = { + constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = { "Transferfunctions", "Transfer Functions", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo DataOptionsInfo = { + constexpr openspace::properties::Property::PropertyInfo DataOptionsInfo = { "DataOptions", "Data Options", "" // @TODO Missing documentation diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp index 063b95f64f..bc2c34c839 100644 --- a/modules/iswa/rendering/iswakameleongroup.cpp +++ b/modules/iswa/rendering/iswakameleongroup.cpp @@ -35,13 +35,13 @@ namespace { constexpr const char* _loggerCat = "IswaDataGroup"; using json = nlohmann::json; - const openspace::properties::Property::PropertyInfo ResolutionInfo = { + constexpr openspace::properties::Property::PropertyInfo ResolutionInfo = { "Resolution", "Resolution", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo FieldlineSeedInfo = { + constexpr openspace::properties::Property::PropertyInfo FieldlineSeedInfo = { "FieldlineSeedsIndexFile", "Fieldline Seedpoints", "" // @TODO Missing documentation diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp index 4973b207aa..d46ee10a8f 100644 --- a/modules/iswa/rendering/kameleonplane.cpp +++ b/modules/iswa/rendering/kameleonplane.cpp @@ -56,19 +56,19 @@ namespace { using json = nlohmann::json; constexpr const char* _loggerCat = "KameleonPlane"; - const openspace::properties::Property::PropertyInfo FieldLineSeedsInfo = { + constexpr openspace::properties::Property::PropertyInfo FieldLineSeedsInfo = { "FieldlineSeedsIndexFile", "Fieldline Seedpoints", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ResolutionInfo = { + constexpr openspace::properties::Property::PropertyInfo ResolutionInfo = { "Resolution", "Resolution%", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SliceInfo = { + constexpr openspace::properties::Property::PropertyInfo SliceInfo = { "Slice", "Slice", "" // @TODO Missing documentation diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp index d754e0bb2d..ec72bc3547 100644 --- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp +++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp @@ -60,73 +60,73 @@ namespace { constexpr const char* KeyGridType = "GridType"; constexpr const char* ValueSphericalGridType = "Spherical"; - const openspace::properties::Property::PropertyInfo DimensionsInfo = { + constexpr openspace::properties::Property::PropertyInfo DimensionsInfo = { "Dimensions", "Dimensions", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo VariableInfo = { + constexpr openspace::properties::Property::PropertyInfo VariableInfo = { "Variable", "Variable", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo LowerDomainBoundInfo = { + constexpr openspace::properties::Property::PropertyInfo LowerDomainBoundInfo = { "LowerDomainBound", "Lower Domain Bound", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UpperDomainBoundInfo = { + constexpr openspace::properties::Property::PropertyInfo UpperDomainBoundInfo = { "UpperDomainBound", "Upper Domain Bound", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo DomainScaleInfo = { + constexpr openspace::properties::Property::PropertyInfo DomainScaleInfo = { "DomainScale", "Domain scale", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo LowerValueBoundInfo = { + constexpr openspace::properties::Property::PropertyInfo LowerValueBoundInfo = { "LowerValueBound", "Lower Value Bound", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UpperValueBoundInfo = { + constexpr openspace::properties::Property::PropertyInfo UpperValueBoundInfo = { "UpperValueBound", "Upper Value Bound", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo GridTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo GridTypeInfo = { "GridType", "Grid Type", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo StepSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = { "StepSize", "Step Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SourcePathInfo = { + constexpr openspace::properties::Property::PropertyInfo SourcePathInfo = { "SourcePath", "Source Path", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TransferFunctionInfo = { + constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = { "TransferFunctionPath", "Transfer Function Path", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo CacheInfo = { + constexpr openspace::properties::Property::PropertyInfo CacheInfo = { "Cache", "Cache", "" // @TODO Missing documentation diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp index cb7b15f133..2b1c50632d 100644 --- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp +++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp @@ -80,79 +80,79 @@ namespace { "${MODULES}/multiresvolume/shaders/header.glsl"; bool registeredGlslHelpers = false; - const openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = { + constexpr openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = { "StepSizeCoefficient", "Stepsize Coefficient", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo CurrentTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo CurrentTimeInfo = { "CurrentTime", "Current Time", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo MemoryBudgetInfo = { + constexpr openspace::properties::Property::PropertyInfo MemoryBudgetInfo = { "MemoryBudget", "Memory Budget", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo StreamingBudgetInfo = { + constexpr openspace::properties::Property::PropertyInfo StreamingBudgetInfo = { "StreamingBudget", "Streaming Budget", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UseGlobalTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo UseGlobalTimeInfo = { "UseGlobalTime", "Global Time", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo LoopInfo = { + constexpr openspace::properties::Property::PropertyInfo LoopInfo = { "Loop", "Loop", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SelectorNameInfo = { + constexpr openspace::properties::Property::PropertyInfo SelectorNameInfo = { "Selector", "Brick Selector", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo StatsToFileInfo = { + constexpr openspace::properties::Property::PropertyInfo StatsToFileInfo = { "PrintStats", "Print Stats", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo StatsToFileNameInfo = { + constexpr openspace::properties::Property::PropertyInfo StatsToFileNameInfo = { "PrintStatsFileName", "Stats Filename", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ScalingExponentInfo = { + constexpr openspace::properties::Property::PropertyInfo ScalingExponentInfo = { "ScalingExponent", "Scaling Exponent", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ScalingInfo = { + constexpr openspace::properties::Property::PropertyInfo ScalingInfo = { "Scaling", "Scaling", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TranslationInfo = { + constexpr openspace::properties::Property::PropertyInfo TranslationInfo = { "Translation", "Translation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo RotationInfo = { + constexpr openspace::properties::Property::PropertyInfo RotationInfo = { "Rotation", "Euler rotation", "" // @TODO Missing documentation diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp index 77a0ce281a..2ec9d82d0f 100644 --- a/modules/space/rendering/renderableconstellationbounds.cpp +++ b/modules/space/rendering/renderableconstellationbounds.cpp @@ -41,15 +41,14 @@ namespace { return glm::radians(rightAscension * 15); } - - const openspace::properties::Property::PropertyInfo VertexInfo = { + constexpr openspace::properties::Property::PropertyInfo VertexInfo = { "File", "Vertex File Path", "The file pointed to with this value contains the vertex locations of the " "constellations." }; - const openspace::properties::Property::PropertyInfo ConstellationInfo = { + constexpr openspace::properties::Property::PropertyInfo ConstellationInfo = { "ConstellationFile", "Constellation File Path", "Specifies the file that contains the mapping between constellation " @@ -57,14 +56,14 @@ namespace { "abbreviations are used as the full names." }; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color of constellation lines", "Specifies the color of the constellation lines. The lines are always drawn at " "full opacity." }; - const openspace::properties::Property::PropertyInfo SelectionInfo = { + constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { "ConstellationSelection", "Constellation Selection", "The constellations that are selected are displayed on the celestial sphere." diff --git a/modules/space/rendering/renderableplanet.cpp b/modules/space/rendering/renderableplanet.cpp index 23b0b99f71..6ae6f70304 100644 --- a/modules/space/rendering/renderableplanet.cpp +++ b/modules/space/rendering/renderableplanet.cpp @@ -55,21 +55,21 @@ namespace { constexpr const char* keyShadowSource = "Source"; constexpr const char* keyShadowCaster = "Caster"; - const openspace::properties::Property::PropertyInfo ColorTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorTexture", "Color Base Texture", "The path to the base color texture that is used on the planet prior to any " "image projection." }; - const openspace::properties::Property::PropertyInfo HeightTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo HeightTextureInfo = { "HeightTexture", "Heightmap Texture", "The path to the height map texture that is used for the planet. If no height " "map is specified the planet does not use a height field." }; - const openspace::properties::Property::PropertyInfo NightTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo NightTextureInfo = { "NightTexture", "Night Texture", "The path to the night texture that is used for the part of the planet that is " @@ -77,7 +77,7 @@ namespace { "planet is rendered dark." }; - const openspace::properties::Property::PropertyInfo HeightExaggerationInfo = { + constexpr openspace::properties::Property::PropertyInfo HeightExaggerationInfo = { "HeightExaggeration", "Height Exaggeration", "This value determines the level of height exaggeration that is applied to a " @@ -85,7 +85,7 @@ namespace { "value of '1' uses the measured height field." }; - const openspace::properties::Property::PropertyInfo PerformShadingInfo = { + constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = { "PerformShading", "Perform Shading", "If this value is enabled, the model will be shaded based on the relative " diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp index 66421dd033..ad38c81165 100644 --- a/modules/space/rendering/renderablerings.cpp +++ b/modules/space/rendering/renderablerings.cpp @@ -38,20 +38,20 @@ #include namespace { - const openspace::properties::Property::PropertyInfo TextureInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureInfo = { "Texture", "Texture", "This value is the path to a texture on disk that contains a one-dimensional " "texture which is used for these rings." }; - const openspace::properties::Property::PropertyInfo SizeInfo = { + constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", "This value specifies the radius of the rings in meter." }; - const openspace::properties::Property::PropertyInfo OffsetInfo = { + constexpr openspace::properties::Property::PropertyInfo OffsetInfo = { "Offset", "Offset", "This value is used to limit the width of the rings.Each of the two values is a " @@ -60,7 +60,7 @@ namespace { "only shown between radius/2 and radius. It defaults to {0.0, 1.0}." }; - const openspace::properties::Property::PropertyInfo NightFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo NightFactorInfo = { "NightFactor", "Night Factor", "This value is a multiplicative factor that is applied to the side of the rings " @@ -68,7 +68,7 @@ namespace { "of the night side occurs." }; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Transparency", "This value determines the transparency of part of the rings depending on the " diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 15b1d5cc3a..1278e5f3ba 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -80,42 +80,42 @@ namespace { float speed; }; - const openspace::properties::Property::PropertyInfo PsfTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo PsfTextureInfo = { "Texture", "Point Spread Function Texture", "The path to the texture that should be used as a point spread function for the " "stars." }; - const openspace::properties::Property::PropertyInfo ColorTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorMap", "ColorBV Texture", "The path to the texture that is used to convert from the B-V value of the star " "to its color. The texture is used as a one dimensional lookup function." }; - const openspace::properties::Property::PropertyInfo ColorOptionInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorOptionInfo = { "ColorOption", "Color Option", "This value determines which quantity is used for determining the color of the " "stars." }; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Transparency", "This value is a multiplicative factor that is applied to the transparency of " "all stars." }; - const openspace::properties::Property::PropertyInfo ScaleFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleFactorInfo = { "ScaleFactor", "Scale Factor", "This value is used as a multiplicative factor that is applied to the apparent " "size of each star." }; - const openspace::properties::Property::PropertyInfo MinBillboardSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo MinBillboardSizeInfo = { "MinBillboardSize", "Min Billboard Size", "This value is used as a lower limit on the size of stars that are rendered. Any " diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp index de35d3f0a6..9a57ad1a3e 100644 --- a/modules/space/rendering/simplespheregeometry.cpp +++ b/modules/space/rendering/simplespheregeometry.cpp @@ -30,13 +30,13 @@ #include namespace { - const openspace::properties::Property::PropertyInfo RadiusInfo = { + constexpr openspace::properties::Property::PropertyInfo RadiusInfo = { "Radius", "Radius", "This value specifies the radius of this sphere in meters." }; - const openspace::properties::Property::PropertyInfo SegmentsInfo = { + constexpr openspace::properties::Property::PropertyInfo SegmentsInfo = { "Segments", "Segments", "This value specifies the number of segments that this sphere is split into." diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp index 7e9b904d02..67c9c6c502 100644 --- a/modules/space/rotation/spicerotation.cpp +++ b/modules/space/rotation/spicerotation.cpp @@ -33,14 +33,14 @@ namespace { constexpr const char* KeyKernels = "Kernels"; - const openspace::properties::Property::PropertyInfo SourceInfo = { + constexpr openspace::properties::Property::PropertyInfo SourceInfo = { "SourceFrame", "Source", "This value specifies the source frame that is used as the basis for the " "coordinate transformation. This has to be a valid SPICE name." }; - const openspace::properties::Property::PropertyInfo DestinationInfo = { + constexpr openspace::properties::Property::PropertyInfo DestinationInfo = { "DestinationFrame", "Destination", "This value specifies the destination frame that is used for the coordinate " diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp index 1a71a30023..c7129e1122 100644 --- a/modules/space/translation/keplertranslation.cpp +++ b/modules/space/translation/keplertranslation.cpp @@ -32,23 +32,23 @@ namespace { -template -T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 100) { - T x = 0; - T x2 = x0; + template + T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 100) { + T x = 0; + T x2 = x0; - for (int i = 0; i < maxIter; ++i) { - x = x2; - x2 = function(x); - if (std::abs(x2 - x) < err) { - return x2; + for (int i = 0; i < maxIter; ++i) { + x = x2; + x2 = function(x); + if (std::abs(x2 - x) < err) { + return x2; + } } + + return x2; } - return x2; -} - - const openspace::properties::Property::PropertyInfo EccentricityInfo = { + constexpr openspace::properties::Property::PropertyInfo EccentricityInfo = { "Eccentricity", "Eccentricity", "This value determines the eccentricity, that is the deviation from a perfect " @@ -56,7 +56,7 @@ T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 1 "are not supported." }; - const openspace::properties::Property::PropertyInfo SemiMajorAxisInfo = { + constexpr openspace::properties::Property::PropertyInfo SemiMajorAxisInfo = { "SemiMajorAxis", "Semi-major axis", "This value determines the semi-major axis, that is the distance of the object " @@ -64,7 +64,7 @@ T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 1 "apoapsis)." }; - const openspace::properties::Property::PropertyInfo InclinationInfo = { + constexpr openspace::properties::Property::PropertyInfo InclinationInfo = { "Inclination", "Inclination", "This value determines the degrees of inclination, or the angle of the orbital " @@ -72,7 +72,7 @@ T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 1 "central body." }; - const openspace::properties::Property::PropertyInfo AscendingNodeInfo = { + constexpr openspace::properties::Property::PropertyInfo AscendingNodeInfo = { "AscendingNode", "Right ascension of ascending Node", "This value determines the right ascension of the ascending node in degrees, " @@ -80,28 +80,28 @@ T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 1 "the horizonal reference plane intersect." }; - const openspace::properties::Property::PropertyInfo ArgumentOfPeriapsisInfo = { + constexpr openspace::properties::Property::PropertyInfo ArgumentOfPeriapsisInfo = { "ArgumentOfPeriapsis", "Argument of Periapsis", "This value determines the argument of periapsis in degrees, that is the " "position on the orbit that is closest to the orbiting body." }; - const openspace::properties::Property::PropertyInfo MeanAnomalyAtEpochInfo = { + constexpr openspace::properties::Property::PropertyInfo MeanAnomalyAtEpochInfo = { "MeanAnomaly", "Mean anomaly at epoch", "This value determines the mean anomaly at the epoch in degrees, which " "determines the initial location of the object along the orbit at epoch." }; - const openspace::properties::Property::PropertyInfo EpochInfo = { + constexpr openspace::properties::Property::PropertyInfo EpochInfo = { "Epoch", "Epoch", "This value determines the epoch for which the initial location is defined in " "the form of YYYY MM DD HH:mm:ss." }; - const openspace::properties::Property::PropertyInfo PeriodInfo = { + constexpr openspace::properties::Property::PropertyInfo PeriodInfo = { "Period", "Orbit period", "Specifies the orbital period (in seconds)." diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp index 2b3503c07a..7461513731 100644 --- a/modules/space/translation/spicetranslation.cpp +++ b/modules/space/translation/spicetranslation.cpp @@ -38,7 +38,7 @@ namespace { constexpr const char* DefaultReferenceFrame = "GALACTIC"; - const openspace::properties::Property::PropertyInfo TargetInfo = { + constexpr openspace::properties::Property::PropertyInfo TargetInfo = { "Target", "Target", "This is the SPICE NAIF name for the body whose translation is to be computed by " @@ -46,7 +46,7 @@ namespace { "or a NAIF integer id code (such as '399')." }; - const openspace::properties::Property::PropertyInfo ObserverInfo = { + constexpr openspace::properties::Property::PropertyInfo ObserverInfo = { "Observer", "Observer", "This is the SPICE NAIF name for the parent of the body whose translation is to " @@ -54,7 +54,7 @@ namespace { "(such as 'SOLAR SYSTEM BARYCENTER') or a NAIF integer id code (such as '0')." }; - const openspace::properties::Property::PropertyInfo FrameInfo = { + constexpr openspace::properties::Property::PropertyInfo FrameInfo = { "Frame", "Reference Frame", "This is the SPICE NAIF name for the reference frame in which the position " diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp index 25173e45a5..32281c0515 100644 --- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp +++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp @@ -41,20 +41,20 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const float DefaultFontSize = 10.f; - const openspace::properties::Property::PropertyInfo FontNameInfo = { + constexpr openspace::properties::Property::PropertyInfo FontNameInfo = { "FontName", "Font Name", "This value is the name of the font that is used. It can either refer to an " "internal name registered previously, or it can refer to a path that is used." }; - const openspace::properties::Property::PropertyInfo FontSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo FontSizeInfo = { "FontSize", "Font Size", "This value determines the size of the font that is used to render the date." }; - const openspace::properties::Property::PropertyInfo ActiveColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ActiveColorInfo = { "ActiveColor", "Active Color", "This value determines the color that the active instrument is rendered in. " @@ -62,7 +62,7 @@ namespace { "color. The default value is (0.6, 1.0, 0.0)." }; - const openspace::properties::Property::PropertyInfo FlashColorInfo = { + constexpr openspace::properties::Property::PropertyInfo FlashColorInfo = { "FlashColor", "Flash Color", "This value determines the color that is used shortly after an instrument " diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp index eff51b17a0..88f9d3331f 100644 --- a/modules/spacecraftinstruments/rendering/renderablefov.cpp +++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp @@ -54,21 +54,21 @@ namespace { constexpr const double Epsilon = 1e-4; - const openspace::properties::Property::PropertyInfo LineWidthInfo = { + constexpr openspace::properties::Property::PropertyInfo LineWidthInfo = { "LineWidth", "Line Width", "This value determines width of the lines connecting the instrument to the " "corners of the field of view." }; - const openspace::properties::Property::PropertyInfo DrawSolidInfo = { + constexpr openspace::properties::Property::PropertyInfo DrawSolidInfo = { "SolidDraw", "Solid Draw", "This value determines whether the field of view should be rendered as a solid " "or as lines only." }; - const openspace::properties::Property::PropertyInfo StandoffDistanceInfo = { + constexpr openspace::properties::Property::PropertyInfo StandoffDistanceInfo = { "StandOffDistance", "Standoff Distance Factor", "This value determines the standoff distance factor which influences the " @@ -78,7 +78,7 @@ namespace { "making it more visible." }; - const openspace::properties::Property::PropertyInfo DefaultStartColorInfo = { + constexpr openspace::properties::Property::PropertyInfo DefaultStartColorInfo = { "Colors.DefaultStart", "Start of default color", "This value determines the color of the field of view frustum close to the " @@ -86,7 +86,7 @@ namespace { "color." }; - const openspace::properties::Property::PropertyInfo DefaultEndColorInfo = { + constexpr openspace::properties::Property::PropertyInfo DefaultEndColorInfo = { "Colors.DefaultEnd", "End of default color", "This value determines the color of the field of view frustum close to the " @@ -94,21 +94,21 @@ namespace { "color." }; - const openspace::properties::Property::PropertyInfo ActiveColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ActiveColorInfo = { "Colors.Active", "Active Color", "This value determines the color that is used when the instrument's field of " "view is active." }; - const openspace::properties::Property::PropertyInfo TargetInFovInfo = { + constexpr openspace::properties::Property::PropertyInfo TargetInFovInfo = { "Colors.TargetInFieldOfView", "Target in field-of-view Color", "This value determines the color that is used if the target is inside the field " "of view of the instrument but the instrument is not yet active." }; - const openspace::properties::Property::PropertyInfo IntersectionStartInfo = { + constexpr openspace::properties::Property::PropertyInfo IntersectionStartInfo = { "Colors.IntersectionStart", "Start of the intersection", "This value determines the color that is used close to the instrument if one of " @@ -116,7 +116,7 @@ namespace { "retrieved by interpolating between this color and the intersection end color." }; - const openspace::properties::Property::PropertyInfo IntersectionEndInfo = { + constexpr openspace::properties::Property::PropertyInfo IntersectionEndInfo = { "Colors.IntersectionEnd", "End of the intersection", "This value determines the color that is used close to the target if one of the " @@ -124,7 +124,7 @@ namespace { "retrieved by interpolating between this color and the intersection begin color." }; - const openspace::properties::Property::PropertyInfo SquareColorInfo = { + constexpr openspace::properties::Property::PropertyInfo SquareColorInfo = { "Colors.Square", "Orthogonal Square", "This value determines the color that is used for the field of view square in " diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp index b4ad153458..9852a1e5f5 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -53,14 +53,14 @@ namespace { constexpr const char* DestinationFrame = "GALACTIC"; - const openspace::properties::Property::PropertyInfo ColorTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorTextureInfo = { "ColorTexture", "Color Base Texture", "This is the path to a local image file that is used as the base texture for the " "model on which the image projections are layered." }; - const openspace::properties::Property::PropertyInfo PerformShadingInfo = { + constexpr openspace::properties::Property::PropertyInfo PerformShadingInfo = { "PerformShading", "Perform Shading", "If this value is enabled, the model will be shaded based on the relative " diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp index 3427017760..9b5f966073 100644 --- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp @@ -55,7 +55,7 @@ namespace { constexpr const char* NoImageText = "No Image"; - const openspace::properties::Property::PropertyInfo ColorTexturePathsInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorTexturePathsInfo = { "ColorTexturePaths", "Color Texture", "The texture path selected in this property is used as the base texture that is " @@ -64,14 +64,14 @@ namespace { "asset, the last texture is used." }; - const openspace::properties::Property::PropertyInfo AddColorTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo AddColorTextureInfo = { "AddColorTexture", "Add Color Base Texture", "Adds a new base color texture to the list of selectable base maps used prior to " "any image projection." }; - const openspace::properties::Property::PropertyInfo HeightTexturePathsInfo = { + constexpr openspace::properties::Property::PropertyInfo HeightTexturePathsInfo = { "HeightTexturePaths", "Heightmap Texture", "The texture path selected in this property is used as the height map on the " @@ -79,13 +79,13 @@ namespace { "this value is specified in an asset, the last texture is used." }; - const openspace::properties::Property::PropertyInfo AddHeightTextureInfo = { + constexpr openspace::properties::Property::PropertyInfo AddHeightTextureInfo = { "AddHeightTexture", "Add Heightmap Texture", "Adds a new height map texture to the list of selectable height maps used." }; - const openspace::properties::Property::PropertyInfo HeightExaggerationInfo = { + constexpr openspace::properties::Property::PropertyInfo HeightExaggerationInfo = { "HeightExaggeration", "Height Exaggeration", "This value determines the level of height exaggeration that is applied to a " @@ -93,7 +93,7 @@ namespace { "value of '1' uses the measured height field." }; - const openspace::properties::Property::PropertyInfo MeridianShiftInfo = { + constexpr openspace::properties::Property::PropertyInfo MeridianShiftInfo = { "MeridianShift", "Meridian Shift", "If this value is enabled, a shift of the meridian by 180 degrees is performed. " @@ -102,7 +102,7 @@ namespace { "shift." }; - const openspace::properties::Property::PropertyInfo AmbientBrightnessInfo = { + constexpr openspace::properties::Property::PropertyInfo AmbientBrightnessInfo = { "AmbientBrightness", "Ambient Brightness", "This value determines the ambient brightness of the dark side of the planet." diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp index a706d8443d..1b1aa682ed 100644 --- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp +++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp @@ -39,7 +39,7 @@ namespace { constexpr const char* ProgramName = "ShadowCylinderProgram"; constexpr const char* MainFrame = "GALACTIC"; - const openspace::properties::Property::PropertyInfo NumberPointsInfo = { + constexpr openspace::properties::Property::PropertyInfo NumberPointsInfo = { "AmountOfPoints", "Points", "This value determines the number of control points that is used to construct " @@ -47,7 +47,7 @@ namespace { "but it will have a negative impact on the performance." }; - const openspace::properties::Property::PropertyInfo ShadowLengthInfo = { + constexpr openspace::properties::Property::PropertyInfo ShadowLengthInfo = { "ShadowLength", "Shadow Length", "This value determines the length of the shadow that is cast by the target " @@ -55,48 +55,48 @@ namespace { "target to the Sun multiplied with this value." }; - const openspace::properties::Property::PropertyInfo ShadowColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ShadowColorInfo = { "ShadowColor", "Shadow Color", "This value determines the color that is used for the shadow cylinder." }; - const openspace::properties::Property::PropertyInfo TerminatorTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo TerminatorTypeInfo = { "TerminatorType", "Terminator Type", "This value determines the type of the terminator that is used to calculate the " "shadow eclipse." }; - const openspace::properties::Property::PropertyInfo LightSourceInfo = { + constexpr openspace::properties::Property::PropertyInfo LightSourceInfo = { "LightSource", "Light Source", "This value determines the SPICE name of the object that is used as the " "illuminator for computing the shadow cylinder." }; - const openspace::properties::Property::PropertyInfo ObserverInfo = { + constexpr openspace::properties::Property::PropertyInfo ObserverInfo = { "Observer", "Observer", "This value specifies the SPICE name of the object that is the observer of the " "shadow cylinder." }; - const openspace::properties::Property::PropertyInfo BodyInfo = { + constexpr openspace::properties::Property::PropertyInfo BodyInfo = { "Body", "Target Body", "This value is the SPICE name of target body that is used as the shadow caster " "for the shadow cylinder." }; - const openspace::properties::Property::PropertyInfo BodyFrameInfo = { + constexpr openspace::properties::Property::PropertyInfo BodyFrameInfo = { "BodyFrame", "Body Frame", "This value is the SPICE name of the reference frame in which the shadow " "cylinder is expressed." }; - const openspace::properties::Property::PropertyInfo AberrationInfo = { + constexpr openspace::properties::Property::PropertyInfo AberrationInfo = { "Aberration", "Aberration", "This value determines the aberration method that is used to compute the shadow " diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp index af670cf50f..338bd878bd 100644 --- a/modules/spacecraftinstruments/util/projectioncomponent.cpp +++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp @@ -67,25 +67,25 @@ namespace { constexpr const char* sequenceTypeHybrid = "hybrid"; constexpr const char* sequenceTypeInstrumentTimes = "instrument-times"; - const char* placeholderFile = "${DATA}/placeholder.png"; + constexpr const char* placeholderFile = "${DATA}/placeholder.png"; constexpr const char* _loggerCat = "ProjectionComponent"; - const openspace::properties::Property::PropertyInfo ProjectionInfo = { + constexpr openspace::properties::Property::PropertyInfo ProjectionInfo = { "PerformProjection", "Perform Projections", "If this value is enabled, this ProjectionComponent will perform projections. If " "it is disabled, projections will be ignored." }; - const openspace::properties::Property::PropertyInfo ClearProjectionInfo = { + constexpr openspace::properties::Property::PropertyInfo ClearProjectionInfo = { "ClearAllProjections", "Clear Projections", "If this property is triggered, it will remove all the projections that have " "already been applied." }; - const openspace::properties::Property::PropertyInfo FadingInfo = { + constexpr openspace::properties::Property::PropertyInfo FadingInfo = { "ProjectionFading", "Projection Fading", "This value fades the previously performed projections in or out. If this value " @@ -93,7 +93,7 @@ namespace { "'0', the performed projections are completely invisible." }; - const openspace::properties::Property::PropertyInfo TextureSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TextureSizeInfo = { "TextureSize", "Texture Size", "This value determines the size of the texture into which the images are " @@ -102,7 +102,7 @@ namespace { "updated, but triggering the 'ApplyTextureSize' property is required." }; - const openspace::properties::Property::PropertyInfo ApplyTextureSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo ApplyTextureSizeInfo = { "ApplyTextureSize", "Apply Texture Size", "Triggering this property applies a new size to the underlying projection " diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp index 27269fad15..7f54f529ca 100644 --- a/modules/spout/renderableplanespout.cpp +++ b/modules/spout/renderableplanespout.cpp @@ -35,14 +35,14 @@ namespace { constexpr const char* KeyName = "Name"; - const openspace::properties::Property::PropertyInfo NameInfo = { + constexpr openspace::properties::Property::PropertyInfo NameInfo = { "SpoutName", "Spout Sender Name", "This value explicitly sets the Spout receiver to use a specific name. If this " "is not a valid name, an empty image is used." }; - const openspace::properties::Property::PropertyInfo SelectionInfo = { + constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { "SpoutSelection", "Spout Selection", "This property displays all available Spout sender on the system. If one them is " @@ -50,7 +50,7 @@ namespace { "previous value." }; - const openspace::properties::Property::PropertyInfo UpdateInfo = { + constexpr openspace::properties::Property::PropertyInfo UpdateInfo = { "UpdateSelection", "Update Selection", "If this property is trigged, the 'SpoutSelection' options will be refreshed." diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp index 912c4dbb36..9d699affbc 100644 --- a/modules/spout/screenspacespout.cpp +++ b/modules/spout/screenspacespout.cpp @@ -33,14 +33,14 @@ namespace { constexpr const char* KeyName = "Name"; - const openspace::properties::Property::PropertyInfo NameInfo = { + constexpr openspace::properties::Property::PropertyInfo NameInfo = { "SpoutName", "Spout Sender Name", "This value explicitly sets the Spout receiver to use a specific name. If this " "is not a valid name, an empty image is used." }; - const openspace::properties::Property::PropertyInfo SelectionInfo = { + constexpr openspace::properties::Property::PropertyInfo SelectionInfo = { "SpoutSelection", "Spout Selection", "This property displays all available Spout sender on the system. If one them is " @@ -48,7 +48,7 @@ namespace { "previous value." }; - const openspace::properties::Property::PropertyInfo UpdateInfo = { + constexpr openspace::properties::Property::PropertyInfo UpdateInfo = { "UpdateSelection", "Update Selection", "If this property is trigged, the 'SpoutSelection' options will be refreshed." diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp index 482f7e3e37..b185e1029d 100644 --- a/modules/touch/src/touchinteraction.cpp +++ b/modules/touch/src/touchinteraction.cpp @@ -68,86 +68,86 @@ namespace { constexpr const char* _loggerCat = "TouchInteraction"; - const openspace::properties::Property::PropertyInfo OriginInfo = { + constexpr openspace::properties::Property::PropertyInfo OriginInfo = { "Origin", "Origin", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo UnitTestInfo = { + constexpr openspace::properties::Property::PropertyInfo UnitTestInfo = { "UnitTest", "Take a unit test saving the LM data into file", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo EventsInfo = { + constexpr openspace::properties::Property::PropertyInfo EventsInfo = { "TouchEvents", "True if we have a touch event", "", openspace::properties::Property::Visibility::Hidden }; - const openspace::properties::Property::PropertyInfo SetDefaultInfo = { + constexpr openspace::properties::Property::PropertyInfo SetDefaultInfo = { "SetDefault", "Reset all properties to default", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo MaxTapTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo MaxTapTimeInfo = { "MaxTapTime", "Max tap delay (in ms) for double tap", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo DecelatesPerSecondInfo = { + constexpr openspace::properties::Property::PropertyInfo DecelatesPerSecondInfo = { "DeceleratesPerSecond", "Number of times velocity is decelerated per second", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TouchScreenSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo TouchScreenSizeInfo = { "TouchScreenSize", "Touch Screen size in inches", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TapZoomFactorInfo = { + constexpr openspace::properties::Property::PropertyInfo TapZoomFactorInfo = { "TapZoomFactor", "Scaling distance travelled on tap", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo DirectManipulationInfo = { + constexpr openspace::properties::Property::PropertyInfo DirectManipulationInfo = { "DirectManipulationRadius", "Radius a planet has to have to activate direct-manipulation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo RollThresholdInfo = { + constexpr openspace::properties::Property::PropertyInfo RollThresholdInfo = { "RollThreshold", "Threshold for min angle for roll interpret", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo OrbitSpinningThreshold = { + constexpr openspace::properties::Property::PropertyInfo OrbitSpinningThreshold = { "OrbitThreshold", "Threshold to activate orbit spinning in direct-manipulation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SpinningSensitivityInfo = { + constexpr openspace::properties::Property::PropertyInfo SpinningSensitivityInfo = { "SpinningSensitivity", "Sensitivity of spinning in direct-manipulation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ZoomSensitivityInfo = { + constexpr openspace::properties::Property::PropertyInfo ZoomSensitivityInfo = { "ZoomSensitivity", "Sensitivity of exponential zooming in relation to distance from focus node", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo + constexpr openspace::properties::Property::PropertyInfo ZoomSensitivityDistanceThresholdInfo = { "ZoomSensitivityDistanceThreshold", "Threshold of distance to target node for whether or not to use exponential " @@ -155,57 +155,57 @@ namespace { "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ZoomBoundarySphereMultiplierInfo = - { + constexpr openspace::properties::Property::PropertyInfo + ZoomBoundarySphereMultiplierInfo = { "ZoomBoundarySphereMultiplier", "Multiplies a node's boundary sphere by this in order to limit zoom & prevent " "surface collision", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo InputSensitivityInfo = { + constexpr openspace::properties::Property::PropertyInfo InputSensitivityInfo = { "InputSensitivity", "Threshold for interpreting input as still", "" }; - const openspace::properties::Property::PropertyInfo StationaryCentroidInfo = { + constexpr openspace::properties::Property::PropertyInfo StationaryCentroidInfo = { "CentroidStationary", "Threshold for stationary centroid", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo PanModeInfo = { + constexpr openspace::properties::Property::PropertyInfo PanModeInfo = { "PanMode", "Allow panning gesture", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo PanDeltaDistanceInfo = { + constexpr openspace::properties::Property::PropertyInfo PanDeltaDistanceInfo = { "PanDeltaDistance", "Delta distance between fingers allowed for interpreting pan interaction", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SlerpTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo SlerpTimeInfo = { "SlerpTime", "Time to slerp in seconds to new orientation with new node picking", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo GuiButtonSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo GuiButtonSizeInfo = { "GuiButtonSize", "GUI button size in pixels", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo FrictionInfo = { + constexpr openspace::properties::Property::PropertyInfo FrictionInfo = { "Friction", "Friction for different interactions (orbit, zoom, roll, pan)", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo PickingRadiusInfo = { + constexpr openspace::properties::Property::PropertyInfo PickingRadiusInfo = { "PickingRadiusMinimum", "Minimum radius for picking in NDC coordinates", "" // @TODO Missing documentation diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp index 9af0e72ffd..ebe26d9faa 100644 --- a/modules/touch/src/touchmarker.cpp +++ b/modules/touch/src/touchmarker.cpp @@ -32,31 +32,31 @@ #include namespace { - const openspace::properties::Property::PropertyInfo VisibilityInfo = { + constexpr openspace::properties::Property::PropertyInfo VisibilityInfo = { "Visibility", "Toggle visibility of markers", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo RadiusInfo = { + constexpr openspace::properties::Property::PropertyInfo RadiusInfo = { "Size", "Marker radius", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TransparencyInfo = { + constexpr openspace::properties::Property::PropertyInfo TransparencyInfo = { "Transparency", "Marker transparency", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ThicknessInfo = { + constexpr openspace::properties::Property::PropertyInfo ThicknessInfo = { "Thickness", "Marker thickness", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "MarkerColor", "Marker color", "" // @TODO Missing documentation }; } // namespace diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp index 1e1dcb5307..f63f52be53 100644 --- a/modules/toyvolume/rendering/renderabletoyvolume.cpp +++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp @@ -31,37 +31,37 @@ #include namespace { - const openspace::properties::Property::PropertyInfo SizeInfo = { + constexpr openspace::properties::Property::PropertyInfo SizeInfo = { "Size", "Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ScalingExponentInfo = { + constexpr openspace::properties::Property::PropertyInfo ScalingExponentInfo = { "ScalingExponent", "Scaling Exponent", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo StepSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = { "StepSize", "Step Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TranslationInfo = { + constexpr openspace::properties::Property::PropertyInfo TranslationInfo = { "Translation", "Translation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo RotationInfo = { + constexpr openspace::properties::Property::PropertyInfo RotationInfo = { "Rotation", "Euler rotation", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo ColorInfo = { + constexpr openspace::properties::Property::PropertyInfo ColorInfo = { "Color", "Color", "" // @TODO Missing documentation diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index a46d778444..3c1e43047f 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -65,73 +65,73 @@ namespace { constexpr const char* KeyUnit = "VisUnit"; constexpr const float SecondsInOneDay = 60 * 60 * 24; - const openspace::properties::Property::PropertyInfo StepSizeInfo = { + constexpr openspace::properties::Property::PropertyInfo StepSizeInfo = { "stepSize", "Step Size", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo GridTypeInfo = { + constexpr openspace::properties::Property::PropertyInfo GridTypeInfo = { "gridType", "Grid Type", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SecondsBeforeInfo = { + constexpr openspace::properties::Property::PropertyInfo SecondsBeforeInfo = { "secondsBefore", "Seconds before", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SecondsAfterInfo = { + constexpr openspace::properties::Property::PropertyInfo SecondsAfterInfo = { "secondsAfter", "Seconds after", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo SourceDirectoryInfo = { + constexpr openspace::properties::Property::PropertyInfo SourceDirectoryInfo = { "sourceDirectory", "Source Directory", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TransferFunctionInfo = { + constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = { "transferFunctionPath", "Transfer Function Path", "" }; - const openspace::properties::Property::PropertyInfo TriggerTimeJumpInfo = { + constexpr openspace::properties::Property::PropertyInfo TriggerTimeJumpInfo = { "triggerTimeJump", "Jump", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo JumpToTimestepInfo = { + constexpr openspace::properties::Property::PropertyInfo JumpToTimestepInfo = { "jumpToTimestep", "Jump to timestep", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo CurrentTimeStepInfo = { + constexpr openspace::properties::Property::PropertyInfo CurrentTimeStepInfo = { "currentTimestep", "Current timestep", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo OpacityInfo = { + constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { "opacity", "Opacity", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo rNormalizationInfo = { + constexpr openspace::properties::Property::PropertyInfo rNormalizationInfo = { "rNormalization", "Radius normalization", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo rUpperBoundInfo = { + constexpr openspace::properties::Property::PropertyInfo rUpperBoundInfo = { "rUpperBound", "Radius upper bound", "" // @TODO Missing documentation diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp index 401d38f3dd..d5028f62b0 100644 --- a/modules/volume/transferfunctionhandler.cpp +++ b/modules/volume/transferfunctionhandler.cpp @@ -29,37 +29,37 @@ #include namespace { - const openspace::properties::Property::PropertyInfo TransferFunctionInfo = { + constexpr openspace::properties::Property::PropertyInfo TransferFunctionInfo = { "TransferFunction", "TransferFunction", "All the envelopes used in the transfer function" }; - const openspace::properties::Property::PropertyInfo HistogramInfo = { + constexpr openspace::properties::Property::PropertyInfo HistogramInfo = { "Histogram", "Histogram", "All the data" }; - const openspace::properties::Property::PropertyInfo DataUnitInfo = { + constexpr openspace::properties::Property::PropertyInfo DataUnitInfo = { "DataUnit", "DataUnit", "Unit of the data" }; - const openspace::properties::Property::PropertyInfo MinValueInfo = { + constexpr openspace::properties::Property::PropertyInfo MinValueInfo = { "MinValue", "MinValue", "Minimum value in the data" }; - const openspace::properties::Property::PropertyInfo MaxValueInfo = { + constexpr openspace::properties::Property::PropertyInfo MaxValueInfo = { "MaxValue", "MaxValue", "Maximum value in the data" }; - const openspace::properties::Property::PropertyInfo SaveTransferFunctionInfo = { + constexpr openspace::properties::Property::PropertyInfo SaveTransferFunctionInfo = { "SaveTransferFunction", "Save Transfer Function", "Save your transfer function" diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 6c412a3ab9..e604c4c07e 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -109,13 +109,13 @@ namespace { std::string configurationOverwrite; } commandlineArgumentPlaceholders; - const openspace::properties::Property::PropertyInfo VersionInfo = { + constexpr const openspace::properties::Property::PropertyInfo VersionInfo = { "VersionInfo", "Version Information", "This value contains the full string identifying this OpenSpace Version" }; - const openspace::properties::Property::PropertyInfo SourceControlInfo = { + constexpr const openspace::properties::Property::PropertyInfo SourceControlInfo = { "SCMInfo", "Source Control Management Information", "This value contains information from the SCM, such as commit hash and branch" diff --git a/src/engine/wrapper/sgctwindowwrapper.cpp b/src/engine/wrapper/sgctwindowwrapper.cpp index 6e539a4799..c242259ad9 100644 --- a/src/engine/wrapper/sgctwindowwrapper.cpp +++ b/src/engine/wrapper/sgctwindowwrapper.cpp @@ -32,14 +32,14 @@ namespace { constexpr const char* GuiWindowTag = "GUI"; - openspace::properties::Property::PropertyInfo EyeSeparationInfo = { + constexpr openspace::properties::Property::PropertyInfo EyeSeparationInfo = { "EyeSeparation", "Eye Separation", "Sets a static eye separation for use in stereoscopic rendering. If no " "stereoscopic rendering is performed, this value is unused." }; - openspace::properties::Property::PropertyInfo ShowStatsGraphInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowStatsGraphInfo = { "ShowStatsGraph", "Show Statistics Graph", "Toggles the rendering of the SGCT statistics graph that is rendered on top of " diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp index 5f410354d2..4d5ab68172 100644 --- a/src/interaction/navigationhandler.cpp +++ b/src/interaction/navigationhandler.cpp @@ -45,7 +45,7 @@ namespace { constexpr const char* KeyPosition = "Position"; constexpr const char* KeyRotation = "Rotation"; - const openspace::properties::Property::PropertyInfo OriginInfo = { + constexpr const openspace::properties::Property::PropertyInfo OriginInfo = { "Origin", "Origin", "The name of the scene graph node that is the origin of the camera interaction. " @@ -53,7 +53,7 @@ namespace { "towards this object. Any scene graph node can be the origin node." }; - const openspace::properties::Property::PropertyInfo KeyFrameInfo = { + constexpr const openspace::properties::Property::PropertyInfo KeyFrameInfo = { "UseKeyFrameInteraction", "Use keyframe interaction", "If this is set to 'true' the entire interaction is based off key frames rather " diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp index 4d569d080a..03757cc3fe 100644 --- a/src/interaction/orbitalnavigator.cpp +++ b/src/interaction/orbitalnavigator.cpp @@ -29,7 +29,7 @@ #include namespace { - const openspace::properties::Property::PropertyInfo RollFrictionInfo = { + constexpr openspace::properties::Property::PropertyInfo RollFrictionInfo = { "RollFriction", "Roll Friction", "If this is enabled, a small friction is applied to the rolling part of the " @@ -37,7 +37,8 @@ namespace { "is disabled, the camera will roll forever." }; - const openspace::properties::Property::PropertyInfo RotationalFrictionInfo = { + constexpr openspace::properties::Property::PropertyInfo RotationalFrictionInfo = + { "RotationalFriction", "Rotational Friction", "If this is enabled, a small friction is applied to the rotational part of the " @@ -45,7 +46,7 @@ namespace { "is disabled, the camera will rotate forever." }; - const openspace::properties::Property::PropertyInfo ZoomFrictionInfo = { + constexpr openspace::properties::Property::PropertyInfo ZoomFrictionInfo = { "ZoomFriction", "Zoom Friction", "If this is enabled, a small friction is applied to the zoom part of the camera " @@ -53,21 +54,21 @@ namespace { "disabled, the camera will zoom in or out forever." }; - const openspace::properties::Property::PropertyInfo MouseSensitivityInfo = { + constexpr openspace::properties::Property::PropertyInfo MouseSensitivityInfo = { "MouseSensitivity", "Mouse Sensitivity", "Determines the sensitivity of the camera motion thorugh the mouse. The lower " "the sensitivity is the less impact a mouse motion will have." }; - const openspace::properties::Property::PropertyInfo JoystickSensitivityInfo = { + constexpr openspace::properties::Property::PropertyInfo JoystickSensitivityInfo = { "JoystickSensitivity", "Joystick Sensitivity", "Determines the sensitivity of the camera motion thorugh a joystick. The lower " "the sensitivity is the less impact a joystick motion will have." }; - const openspace::properties::Property::PropertyInfo FrictionInfo = { + constexpr openspace::properties::Property::PropertyInfo FrictionInfo = { "Friction", "Friction Factor", "Determines the factor that is applied if the 'Roll Friction', 'Rotational " @@ -75,35 +76,35 @@ namespace { "faster the camera movements will stop." }; - const openspace::properties::Property::PropertyInfo FollowFocusNodeInfo = { + constexpr openspace::properties::Property::PropertyInfo FollowFocusNodeInfo = { "FollowFocusNodeRotationDistance", "Follow focus node rotation distance", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo MinimumDistanceInfo = { + constexpr openspace::properties::Property::PropertyInfo MinimumDistanceInfo = { "MinimumAllowedDistance", "Minimum allowed distance", "" // @TODO Missing documentation }; - static const openspace::properties::Property::PropertyInfo - StereoInterpolationTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo StereoInterpolationTimeInfo = + { "StereoInterpolationTime", "Stereo interpolation time", "The time to interpolate to a new stereoscopic depth " "when the focus node is changed" }; - const openspace::properties::Property::PropertyInfo + constexpr openspace::properties::Property::PropertyInfo RotateToFocusInterpolationTimeInfo = { - "RotateToFocusInterpolationTime", - "Rotate to focus interpolation time", - "The time to interpolate the camera rotation " - "when the focus node is changed" - }; + "RotateToFocusInterpolationTime", + "Rotate to focus interpolation time", + "The time to interpolate the camera rotation " + "when the focus node is changed" + }; - const openspace::properties::Property::PropertyInfo + constexpr openspace::properties::Property::PropertyInfo UseAdaptiveStereoscopicDepthInfo = { "UseAdaptiveStereoscopicDepth", "Adaptive Steroscopic Depth", @@ -111,9 +112,9 @@ namespace { "the focus node. If enabled, view scale will be set to " "StereoscopicDepthOfFocusSurface / distance. " "If disabled, view scale will be set to 10^StaticViewScaleExponent." - }; + }; - const openspace::properties::Property::PropertyInfo + constexpr openspace::properties::Property::PropertyInfo StaticViewScaleExponentInfo = { "StaticViewScaleExponent", "Static View Scale Exponent", @@ -121,7 +122,7 @@ namespace { "Only used if UseAdaptiveStereoscopicDepthInfo is set to false." }; - const openspace::properties::Property::PropertyInfo + constexpr openspace::properties::Property::PropertyInfo StereoscopicDepthOfFocusSurfaceInfo = { "StereoscopicDepthOfFocusSurface", "Stereoscopic depth of the surface in focus", diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp index b0fe294822..042586f873 100644 --- a/src/network/parallelpeer.cpp +++ b/src/network/parallelpeer.cpp @@ -44,59 +44,59 @@ namespace { constexpr const size_t MaxLatencyDiffs = 64; constexpr const char* _loggerCat = "ParallelPeer"; - const openspace::properties::Property::PropertyInfo PasswordInfo = { + constexpr openspace::properties::Property::PropertyInfo PasswordInfo = { "Password", "Password", "The general password that allows this OpenSpace instance access to the Wormhole " "server." }; - const openspace::properties::Property::PropertyInfo HostPasswordInfo = { + constexpr openspace::properties::Property::PropertyInfo HostPasswordInfo = { "HostPassword", "Host Password", "The password that is required to take control of the joint session and thus " "send all commands to connected clients." }; - const openspace::properties::Property::PropertyInfo PortInfo = { + constexpr openspace::properties::Property::PropertyInfo PortInfo = { "Port", "Port", "The port on which the Wormhole server is listening to connections from " "OpenSpace." }; - const openspace::properties::Property::PropertyInfo AddressInfo = { + constexpr openspace::properties::Property::PropertyInfo AddressInfo = { "Address", "Address", "The address of the Wormhole server either as a DNS name or an IP address." }; - const openspace::properties::Property::PropertyInfo NameInfo = { + constexpr openspace::properties::Property::PropertyInfo NameInfo = { "Name", "Connection Name", "The name of this OpenSpace instance that will be potentially broadcast to other " "connected instances." }; - const openspace::properties::Property::PropertyInfo BufferTimeInfo = { + constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = { "BufferTime", "Buffer Time", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = { + constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = { "TimeKeyframeInterval", "Time keyframe interval", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = { + constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = { "CameraKeyframeInterval", "Camera Keyframe interval", "" // @TODO Missing documentation }; - const openspace::properties::Property::PropertyInfo TimeToleranceInfo = { + constexpr openspace::properties::Property::PropertyInfo TimeToleranceInfo = { "TimeTolerance", "Time tolerance", "" // @TODO Missing documentation diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp index b62731bf6a..ba2c9bb4aa 100644 --- a/src/rendering/dashboard.cpp +++ b/src/rendering/dashboard.cpp @@ -31,7 +31,7 @@ #include "dashboard_lua.inl" namespace { - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "IsEnabled", "Enabled", "If this value is 'false', this dashboard will be invisible, regardless of the " diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp index cc0becf706..4ac070596d 100644 --- a/src/rendering/dashboarditem.cpp +++ b/src/rendering/dashboarditem.cpp @@ -32,25 +32,25 @@ namespace { constexpr const char* KeyType = "Type"; - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", "If this value is set to 'true' this dashboard item is shown in the dashboard" }; - const openspace::properties::Property::PropertyInfo TypeInfo = { + constexpr openspace::properties::Property::PropertyInfo TypeInfo = { "Type", "Type", "" }; - const openspace::properties::Property::PropertyInfo IdentifierInfo = { + constexpr openspace::properties::Property::PropertyInfo IdentifierInfo = { "Identifier", "Identifier", "" }; - const openspace::properties::Property::PropertyInfo GuiNameInfo = { + constexpr openspace::properties::Property::PropertyInfo GuiNameInfo = { "GuiName", "Gui Name", "" diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp index 8d052372ba..2668d9eb24 100644 --- a/src/rendering/luaconsole.cpp +++ b/src/rendering/luaconsole.cpp @@ -66,52 +66,52 @@ namespace { // when horizontal scrolling is required. constexpr const int NVisibleCharsAfterCursor = 5; - const openspace::properties::Property::PropertyInfo VisibleInfo = { + constexpr openspace::properties::Property::PropertyInfo VisibleInfo = { "IsVisible", "Is Visible", "Determines whether the Lua console is shown on the screen or not. Toggling it " "will fade the console in and out." }; - const openspace::properties::Property::PropertyInfo RemoveScriptingInfo = { + constexpr openspace::properties::Property::PropertyInfo RemoveScriptingInfo = { "RemoteScripting", "Remote scripting", "Determines whether the entered commands will only be executed locally (if this " "is disabled), or whether they will be send to connected remove instances." }; - const openspace::properties::Property::PropertyInfo BackgroundColorInfo = { + constexpr openspace::properties::Property::PropertyInfo BackgroundColorInfo = { "BackgroundColor", "Background Color", "Sets the background color of the console." }; - const openspace::properties::Property::PropertyInfo HighlightColorInfo = { + constexpr openspace::properties::Property::PropertyInfo HighlightColorInfo = { "HighlightColor", "Highlight Color", "Sets the color of the lines below the console." }; - const openspace::properties::Property::PropertyInfo SeparatorColorInfo = { + constexpr openspace::properties::Property::PropertyInfo SeparatorColorInfo = { "SeparatorColor", "Separator Color", "Sets the color of the separator between the history part and the entry part of " "the console." }; - const openspace::properties::Property::PropertyInfo EntryTextColorInfo = { + constexpr openspace::properties::Property::PropertyInfo EntryTextColorInfo = { "EntryTextColor", "Entry Text Color", "Sets the text color of the entry area of the console." }; - const openspace::properties::Property::PropertyInfo HistoryTextColorInfo = { + constexpr openspace::properties::Property::PropertyInfo HistoryTextColorInfo = { "HistoryTextColor", "History Text Color", "Sets the text color of the history area of the console." }; - const openspace::properties::Property::PropertyInfo HistoryLengthInfo = { + constexpr openspace::properties::Property::PropertyInfo HistoryLengthInfo = { "HistoryLength", "History Length", "Determines the length of the history in number of lines." diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp index 6848a4286a..cce75509e1 100644 --- a/src/rendering/renderable.cpp +++ b/src/rendering/renderable.cpp @@ -35,13 +35,13 @@ namespace { constexpr const char* KeyType = "Type"; constexpr const char* KeyTag = "Tag"; - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", "This setting determines whether this object will be visible or not." }; - const openspace::properties::Property::PropertyInfo OpacityInfo = { + constexpr openspace::properties::Property::PropertyInfo OpacityInfo = { "Opacity", "Transparency", "This value determines the transparency of this object." diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 35a58a48ab..4a0a21aa02 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -81,7 +81,7 @@ namespace { constexpr const char* KeyFontMono = "Mono"; constexpr const char* KeyFontLight = "Light"; - const openspace::properties::Property::PropertyInfo PerformanceInfo = { + constexpr openspace::properties::Property::PropertyInfo PerformanceInfo = { "PerformanceMeasurements", "Performance Measurements", "If this value is enabled, detailed performance measurements about the updates " @@ -90,7 +90,7 @@ namespace { "performance." }; - const openspace::properties::Property::PropertyInfo ShowDateInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowDateInfo = { "ShowDate", "Show Date Information", "This values determines whether the date will be printed in the top left corner " @@ -98,7 +98,7 @@ namespace { "fisheye rendering, for example)." }; - const openspace::properties::Property::PropertyInfo ShowInfoInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowInfoInfo = { "ShowInfo", "Show Rendering Information", "This value determines whether the rendering info, which is the delta time and " @@ -107,14 +107,14 @@ namespace { "example)." }; - const openspace::properties::Property::PropertyInfo ShowOverlaySlavesInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowOverlaySlavesInfo = { "ShowOverlayOnSlaves", "Show Overlay Information on Slaves", "If this value is enabled, the overlay information text is also automatically " "rendered on the slave nodes. This values is disabled by default." }; - const openspace::properties::Property::PropertyInfo ShowLogInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowLogInfo = { "ShowLog", "Show the on-screen log", "This value determines whether the on-screen log will be shown or hidden. Even " @@ -122,21 +122,21 @@ namespace { "log." }; - const openspace::properties::Property::PropertyInfo ShowVersionInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowVersionInfo = { "ShowVersion", "Shows the version on-screen information", "This value determines whether the Git version information (branch and commit) " "hash are shown on the screen." }; - const openspace::properties::Property::PropertyInfo ShowCameraInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowCameraInfo = { "ShowCamera", "Shows information about the current camera state, such as friction", "This value determines whether the information about the current camrea state is " "shown on the screen" }; - const openspace::properties::Property::PropertyInfo TakeScreenshotInfo = { + constexpr openspace::properties::Property::PropertyInfo TakeScreenshotInfo = { "TakeScreenshot", "Take Screenshot", "If this property is triggered, a screenshot is taken and stored in the current " @@ -146,7 +146,7 @@ namespace { "already present in the folder." }; - const openspace::properties::Property::PropertyInfo ApplyWarpingInfo = { + constexpr openspace::properties::Property::PropertyInfo ApplyWarpingInfo = { "ApplyWarpingScreenshot", "Apply Warping to Screenshots", "This value determines whether a warping should be applied before taking a " @@ -155,13 +155,13 @@ namespace { "interface." }; - const openspace::properties::Property::PropertyInfo ShowFrameNumberInfo = { + constexpr openspace::properties::Property::PropertyInfo ShowFrameNumberInfo = { "ShowFrameNumber", "Show Frame Number", "If this value is enabled, the current frame number is rendered into the window." }; - const openspace::properties::Property::PropertyInfo DisableMasterInfo = { + constexpr openspace::properties::Property::PropertyInfo DisableMasterInfo = { "DisableMasterRendering", "Disable Master Rendering", "If this value is enabled, the rendering on the master node will be disabled. " @@ -171,7 +171,7 @@ namespace { "master node is not required and performance can be gained by disabling it." }; - const openspace::properties::Property::PropertyInfo DisableTranslationInfo = { + constexpr openspace::properties::Property::PropertyInfo DisableTranslationInfo = { "DisableSceneTranslationOnMaster", "Disable Scene Translation on Master", "If this value is enabled, any scene translations such as specified in, for " @@ -181,28 +181,28 @@ namespace { "difficult." }; - const openspace::properties::Property::PropertyInfo AaSamplesInfo = { + constexpr openspace::properties::Property::PropertyInfo AaSamplesInfo = { "AaSamples", "Number of Anti-aliasing samples", "This value determines the number of anti-aliasing samples to be used in the " "rendering for the MSAA method." }; - const openspace::properties::Property::PropertyInfo HDRExposureInfo = { + constexpr openspace::properties::Property::PropertyInfo HDRExposureInfo = { "HDRExposure", "HDR Exposure", "This value determines the amount of light per unit area reaching the " "equivalent of an electronic image sensor." }; - const openspace::properties::Property::PropertyInfo BackgroundExposureInfo = { + constexpr openspace::properties::Property::PropertyInfo BackgroundExposureInfo = { "Background Exposure", "BackgroundExposure", "This value determines the amount of light per unit area reaching the " "equivalent of an electronic image sensor for the background image." }; - const openspace::properties::Property::PropertyInfo GammaInfo = { + constexpr openspace::properties::Property::PropertyInfo GammaInfo = { "Gamma", "Gamma Correction", "Gamma, is the nonlinear operation used to encode and decode luminance or " diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp index d5fc9933d0..c6cb6c97cc 100644 --- a/src/rendering/screenspacerenderable.cpp +++ b/src/rendering/screenspacerenderable.cpp @@ -42,13 +42,13 @@ namespace { constexpr const char* KeyTag = "Tag"; constexpr const float PlaneDepth = -2.f; - const openspace::properties::Property::PropertyInfo EnabledInfo = { + constexpr openspace::properties::Property::PropertyInfo EnabledInfo = { "Enabled", "Is Enabled", "This setting determines whether this sceen space plane will be visible or not." }; - const openspace::properties::Property::PropertyInfo FlatScreenInfo = { + constexpr openspace::properties::Property::PropertyInfo FlatScreenInfo = { "FlatScreen", "Flat Screen specification", "This value determines whether the location of this screen space plane will be " @@ -59,21 +59,21 @@ namespace { "useful in a planetarium environment." }; - const openspace::properties::Property::PropertyInfo EuclideanPositionInfo = { + constexpr openspace::properties::Property::PropertyInfo EuclideanPositionInfo = { "EuclideanPosition", "Euclidean coordinates", "This value determines the position of this screen space plane in Euclidean " "two-dimensional coordinates." }; - const openspace::properties::Property::PropertyInfo SphericalPositionInfo = { + constexpr openspace::properties::Property::PropertyInfo SphericalPositionInfo = { "SphericalPosition", "Spherical coordinates", "This value determines the position of this screen space plane in a spherical " "coordinate system." }; - const openspace::properties::Property::PropertyInfo DepthInfo = { + constexpr openspace::properties::Property::PropertyInfo DepthInfo = { "Depth", "Depth value", "This value determines the depth of the plane. This value does not change the " @@ -82,7 +82,7 @@ namespace { "value." }; - const openspace::properties::Property::PropertyInfo ScaleInfo = { + constexpr openspace::properties::Property::PropertyInfo ScaleInfo = { "Scale", "Scale value", "This value determines a scale factor for the plane. The default size of a plane " @@ -90,7 +90,7 @@ namespace { "the image being displayed." }; - const openspace::properties::Property::PropertyInfo AlphaInfo = { + constexpr openspace::properties::Property::PropertyInfo AlphaInfo = { "Alpha", "Transparency", "This value determines the transparency of the screen space plane. If this value " @@ -98,7 +98,7 @@ namespace { "completely transparent." }; - const openspace::properties::Property::PropertyInfo DeleteInfo = { + constexpr openspace::properties::Property::PropertyInfo DeleteInfo = { "Delete", "Delete", "If this property is triggered, this screen space plane is removed from the "