Skip to content

Commit 149197c

Browse files
author
Kmeid Saad
committed
Merge branch 'feature/sm/sensorviewconfig-extension' of https://github.com/OpenSimulationInterface/open-simulation-interface into feature/sm/sensorviewconfig-extension
2 parents 707942f + adaa078 commit 149197c

File tree

8 files changed

+605
-1
lines changed

8 files changed

+605
-1
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ set(OSI_PROTO_FILES
6666
osi_hostvehicledata.proto
6767
osi_trafficsign.proto
6868
osi_trafficlight.proto
69+
osi_trafficupdate.proto
70+
osi_trafficcommand.proto
6971
osi_roadmarking.proto
7072
osi_lane.proto
7173
osi_featuredata.proto

doc/osifiles.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ OSI common provides the building blocks for the OSI field messages.
3838
`osi_hostvehicledata.proto`_
3939
---------------------------------
4040

41+
`osi_trafficcommand.proto`_
42+
---------------------------------
43+
44+
`osi_trafficupdate.proto`_
45+
---------------------------------
46+
4147
`osi_trafficsign.proto`_
4248
---------------------------------
4349

@@ -91,4 +97,4 @@ OSI common provides the building blocks for the OSI field messages.
9197
.. _osi_datarecording.proto: https://github.com/OpenSimulationInterface/open-simulation-interface/blob/master/osi_datarecording.proto
9298
.. _osi_datarecording.proto: https://github.com/OpenSimulationInterface/open-simulation-interface/blob/master/osi_datarecording.proto
9399
.. _osi_datarecording.proto: https://github.com/OpenSimulationInterface/open-simulation-interface/blob/master/osi_datarecording.proto
94-
.. _osi_datarecording.proto: https://github.com/OpenSimulationInterface/open-simulation-interface/blob/master/osi_datarecording.proto
100+
.. _osi_datarecording.proto: https://github.com/OpenSimulationInterface/open-simulation-interface/blob/master/osi_datarecording.proto

osi_groundtruth.proto

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,20 @@ message GroundTruth
155155
// \note It is implementation-specific how map_reference is resolved.
156156
//
157157
optional string map_reference = 15;
158+
159+
// Opaque reference of an associated 3D model.
160+
//
161+
// The model covers the static parts of the environment that are not
162+
// provided as individual models referenced from ground truth objects
163+
// like moving or stationary objects.
164+
//
165+
// \note Origin and orientation of the model have to coincide with the
166+
// inertial coordinate frame of the ground truth.
167+
//
168+
// \note It is implementation-specific how model_references are resolved to
169+
// 3d models. The parts the world model contains are also implementation-specific.
170+
// For example, the world model can wether contain street geometries or
171+
// derives street geometies automatically from a map reference.
172+
//
173+
optional string model_reference = 16;
158174
}

0 commit comments

Comments
 (0)