Skip to content

Adding relative model path to objects fixes #285 #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4 commits merged into from Dec 21, 2018
Merged

Adding relative model path to objects fixes #285 #284

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6231c8d
adding relative model path to objects
LudwigFriedmann Oct 22, 2018
e4ae332
Update osi_object.proto
Nov 5, 2018
faa1ab4
Merge branch 'master' into add_modelstring_to_objects
Nov 5, 2018
2fd2a98
Merge branch 'master' into add_modelstring_to_objects
jdsika Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion osi_object.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,20 @@ message StationaryObject
//
optional Identifier id = 1;

// The base parameters of the vehicle.
// The base parameters of the stationary object.
//
optional BaseStationary base = 2;

// The classification of the stationary object.
//
optional Classification classification = 3;

// Opaque reference of an associated 3D model of the stationary object.
//
// \note It is implementation-specific how model_references are resolved to 3d models.
//
optional string model_reference = 4;

//
// \brief Classification data for a stationary object.
//
Expand Down Expand Up @@ -308,6 +314,12 @@ message MovingObject
//
optional VehicleClassification vehicle_classification = 6;

// Opaque reference of an associated 3D model of the moving object.
//
// \note It is implementation-specific how model_references are resolved to 3d models.
//
optional string model_reference = 7;

// Definition of object types.
//
enum Type
Expand Down