Skip to content

Commit c75adc8

Browse files
Markus WaldmannKmeid
authored andcommitted
Further rework of environment additions sun, cloud
- Move TimeOfDay message back to avoid confusion - Change the message name Clouds to CloudLayer - Change the SUN angular range - Wind direction is now origin not target Signed-off-by: Markus Waldmann <Markus.Waldmann@stud.hs-kempten.de> Co-authored-by: Kmeid <kmeid.saad@ansys.com>
1 parent 01154ed commit c75adc8

File tree

1 file changed

+28
-27
lines changed

1 file changed

+28
-27
lines changed

osi_environment.proto

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@ message EnvironmentalConditions
2323
//
2424
optional TimeOfDay time_of_day = 2;
2525

26+
// The Unix epoch (or Unix time or POSIX time or Unix timestamp) is
27+
// the number of seconds that have elapsed since January 1, 1970
28+
// (midnight UTC/GMT [1]), not counting leap seconds [2].
29+
// Historically, the origin of UNIX system time was referred to as
30+
// "00:00:00 GMT, January 1, 1970" [2]. Literally speaking the epoch
31+
// is Unix time 0 (midnight 1/1/1970), but 'epoch' is often used as
32+
// a synonym for 'Unix time'. Many Unix systems store epoch dates as
33+
// a signed 32-bit integer, which might cause problems on January 19,
34+
// 2038 (known as the Year 2038 problem or Y2038).
35+
//
36+
// \note You can convert the timestamp using the following [routines
37+
// sorted by languages](https://www.epochconverter.com/#code).
38+
//
39+
// \par References:
40+
// [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (Rec. ITU-R TF.460-6). Retrieved January 25, 2020, from http://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf \n
41+
// [2] The Open Group. (2018). <em>POSIX.1-2017</em> The Open Group Base Specifications Issue 7, 2018 edition. IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008). Retrieved January 25, 2020, from https://pubs.opengroup.org/onlinepubs/9699919799/xrat/contents.html
42+
//
43+
optional int64 unix_timestamp = 8;
44+
2645
// Atmospheric pressure in Pascal at z=0.0 in world frame (about 101325
2746
// Pa).
2847
//
@@ -68,25 +87,6 @@ message EnvironmentalConditions
6887
// Description of the fog.
6988
//
7089
optional Fog fog = 7;
71-
72-
// The Unix epoch (or Unix time or POSIX time or Unix timestamp) is
73-
// the number of seconds that have elapsed since January 1, 1970
74-
// (midnight UTC/GMT [1]), not counting leap seconds [2].
75-
// Historically, the origin of UNIX system time was referred to as
76-
// "00:00:00 GMT, January 1, 1970" [2]. Literally speaking the epoch
77-
// is Unix time 0 (midnight 1/1/1970), but 'epoch' is often used as
78-
// a synonym for 'Unix time'. Many Unix systems store epoch dates as
79-
// a signed 32-bit integer, which might cause problems on January 19,
80-
// 2038 (known as the Year 2038 problem or Y2038).
81-
//
82-
// \note You can convert the timestamp using the following [routines
83-
// sorted by languages](https://www.epochconverter.com/#code).
84-
//
85-
// \par References:
86-
// [1] ITU Radiocommunication Assembly. (2002). <em>Recommondation ITU-R TF.460-6 Standard-frequency and time-signal emissions</em>. (Rec. ITU-R TF.460-6). Retrieved January 25, 2020, from http://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf \n
87-
// [2] The Open Group. (2018). <em>POSIX.1-2017</em> The Open Group Base Specifications Issue 7, 2018 edition. IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008). Retrieved January 25, 2020, from https://pubs.opengroup.org/onlinepubs/9699919799/xrat/contents.html
88-
//
89-
optional int64 unix_timestamp = 8;
9090

9191
// Optional external reference to the environmental condition sources.
9292
//
@@ -103,7 +103,7 @@ message EnvironmentalConditions
103103

104104
// Definition of clouds.
105105
//
106-
optional Clouds clouds = 10;
106+
optional CloudLayer clouds = 10;
107107

108108
// Definition of the wind properties.
109109
//
@@ -338,11 +338,11 @@ message EnvironmentalConditions
338338
}
339339

340340
//
341-
// \brief Specification of the cloud states.
341+
// \brief Specification of the cloud layer.
342342
//
343343
// \note within this message there is the cloud state level.
344344
//
345-
message Clouds
345+
message CloudLayer
346346
{
347347
// Definition of the cloud state level, i.e. cloud state and sky visualization settings.
348348
//
@@ -422,21 +422,22 @@ message EnvironmentalConditions
422422
//
423423
// \brief Defines wind properties.
424424
//
425-
// \note Aligns with the wind speed and direction as defined in ASAM OpenSCENARIO.
425+
// \note Inspired by the wind speed and direction as defined in ASAM OpenSCENARIO.
426426
//
427427
message Wind
428428
{
429-
// The target direction of the wind (not the origin direction) in the ground/xy-plane of the \c
429+
// The origin direction of the wind (not the target direction) in the ground/xy-plane of the \c
430430
// world coordinate system. Corresponds to the heading/yaw angle. \c
431431
// x-axis-direction is 0 rad.
432432
//
433433
// Unit: rad
434434
//
435435
// The preferred angular range is [-pi, pi]
436436
//
437-
// \note The range in openSCENARIO is Range [0...2 pi[. Mind the conversion.
437+
// \note The direction is the origin, not the target direction. \c
438+
// The range in openSCENARIO is Range [0...2 pi[. Mind the conversion.
438439
//
439-
optional Vector3d direction = 1;
440+
optional Vector3d origin_direction = 1;
440441

441442
// The wind speed.
442443
//
@@ -458,7 +459,7 @@ message EnvironmentalConditions
458459
//
459460
// Unit: rad
460461
//
461-
// The preferred angular range is [0, 2pi]
462+
// The preferred angular range is [-pi, pi]
462463
//
463464
optional double azimuth = 1;
464465

0 commit comments

Comments
 (0)