Skip to content
Snippets Groups Projects
Commit 10df3786 authored by Andreas Rauschert's avatar Andreas Rauschert
Browse files

Merge branch 'add_sun_into_wheather' into 'main'

Add information about sun into weather struct

See merge request !146
parents 30e2f077 b8604a5c
No related branches found
Tags v2.1.0
1 merge request!146Add information about sun into weather struct
Pipeline #48863 passed
...@@ -76,6 +76,8 @@ CPMAddPackage( ...@@ -76,6 +76,8 @@ CPMAddPackage(
"ENABLE_PREDEFINED_TEMPERATURE_UNITS ON" "ENABLE_PREDEFINED_TEMPERATURE_UNITS ON"
"ENABLE_PREDEFINED_TIME_UNITS ON" "ENABLE_PREDEFINED_TIME_UNITS ON"
"ENABLE_PREDEFINED_VELOCITY_UNITS ON" "ENABLE_PREDEFINED_VELOCITY_UNITS ON"
"ENABLE_PREDEFINED_ILLUMINANCE_UNITS ON"
"ENABLE_PREDEFINED_LUMINOUS_FLUX_UNITS ON"
) )
# Add library # Add library
......
...@@ -64,6 +64,14 @@ enum class Illumination ...@@ -64,6 +64,14 @@ enum class Illumination
kLevel9 kLevel9
}; };
/// Specification of sun properties.
struct Sun
{
units::angle::radian_t azimuth{}; ///< Azimuth of the sun, counted counter-clockwise, 0=north, PI/2 = west, PI=south, 3/2*PI=east. Range: [0..2*PI].
units::angle::radian_t elevation{}; ///< Solar elevation angle, 0=x/y plane, PI/2=zenith, -PI/2=nadir. Range: [-PI/2..PI/2].
units::illuminance::lux_t intensity{}; ///< Illuminance of the sun, direct sunlight is around 100,000 lx. Range: [0..inf[.
};
/// Definition of weather conditions in terms of fog, precipitation, illumination, humidity, temperature and atmospheric pressure states /// Definition of weather conditions in terms of fog, precipitation, illumination, humidity, temperature and atmospheric pressure states
struct Weather struct Weather
{ {
...@@ -73,6 +81,7 @@ struct Weather ...@@ -73,6 +81,7 @@ struct Weather
units::concentration::percent_t humidity{0.0}; ///< Defines the humidity units::concentration::percent_t humidity{0.0}; ///< Defines the humidity
units::temperature::kelvin_t temperature{0.0}; ///< Defines the outside temperature around the entities of the scenario units::temperature::kelvin_t temperature{0.0}; ///< Defines the outside temperature around the entities of the scenario
units::pressure::pascal_t atmospheric_pressure{0.0}; ///< Defines the atmospheric pressure around the entities of the scenario units::pressure::pascal_t atmospheric_pressure{0.0}; ///< Defines the atmospheric pressure around the entities of the scenario
Sun sun{}; ///< Defines the sun, i.e. angles and intensity.
}; };
} // namespace mantle_api } // namespace mantle_api
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment