From 6231c8dcb8ba0a13a620bd675a53b534e48a94b0 Mon Sep 17 00:00:00 2001 From: Ludwig Friedmann Date: Mon, 22 Oct 2018 13:31:10 +0200 Subject: [PATCH 1/2] adding relative model path to objects --- osi_object.proto | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/osi_object.proto b/osi_object.proto index 91b26cc1f..19b0a2f05 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -21,7 +21,7 @@ message StationaryObject // optional Identifier id = 1; - // The base parameters of the vehicle. + // The base parameters of the stationary object. // optional BaseStationary base = 2; @@ -29,6 +29,12 @@ message StationaryObject // optional Classification classification = 3; + // Relative path of an associated 3D model of the stationary object. + // + // \note File path of the 3D model relative to the user code. + // + optional string model_path = 4; + // // \brief Classification data for a stationary object. // @@ -304,6 +310,12 @@ message MovingObject // optional VehicleClassification vehicle_classification = 6; + // Relative path of an associated 3D model of the moving object. + // + // \note File path of the 3D model relative to the user code. + // + optional string model_path = 7; + // Definition of object types. // enum Type From e4ae33291ba9e7b01b01320c7f0afb18ee97167b Mon Sep 17 00:00:00 2001 From: Ludwig Friedmann <40625995+LudwigFriedmannBMW@users.noreply.github.com> Date: Mon, 5 Nov 2018 14:15:34 +0100 Subject: [PATCH 2/2] Update osi_object.proto Changing model_path to model_reference and altering documentation accordingly --- osi_object.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/osi_object.proto b/osi_object.proto index 19b0a2f05..821b62fdb 100644 --- a/osi_object.proto +++ b/osi_object.proto @@ -29,11 +29,11 @@ message StationaryObject // optional Classification classification = 3; - // Relative path of an associated 3D model of the stationary object. + // Opaque reference of an associated 3D model of the stationary object. // - // \note File path of the 3D model relative to the user code. + // \note It is implementation-specific how model_references are resolved to 3d models. // - optional string model_path = 4; + optional string model_reference = 4; // // \brief Classification data for a stationary object. @@ -310,11 +310,11 @@ message MovingObject // optional VehicleClassification vehicle_classification = 6; - // Relative path of an associated 3D model of the moving object. + // Opaque reference of an associated 3D model of the moving object. // - // \note File path of the 3D model relative to the user code. + // \note It is implementation-specific how model_references are resolved to 3d models. // - optional string model_path = 7; + optional string model_reference = 7; // Definition of object types. //