Skip to content

Commit

Permalink
Merge pull request #239 from asam-ev/Finalize_environment_chapter
Browse files Browse the repository at this point in the history
Finalize environment chapter
  • Loading branch information
LudwigFriedmann authored Dec 13, 2024
2 parents 2c44f07 + c75c4e5 commit 4d77c2d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 36 deletions.
7 changes: 6 additions & 1 deletion content/geometry/object-environment/environment-general.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
= General

NOTE: General description t.d.d
The environment consists of the terrain, buildings, objects, and traffic areas, for example roads. It also includes all stationary traffic items, such as traffic signals, signs or lights.

The environment's 3D geometry is structured according to the node structure defined in xref:../geometry/object-environment/environment-index.adoc#_model_structure[Model structure].
The structure begins with a root node, which is the parent of all other nodes. If applicable, the origin of the root node should match that of the corresponding OpenDRIVE map.
Children of the root node are terrain, environment objects and the road network.
The latter is further detailed by its child nodes drivable area, sidewalks, roadmarks, road objects and signals.

Groups with a local transform are indicated in the structure by a (T).
This is only an indicator in the documentation and must not be contained in the actual node name.
1 change: 0 additions & 1 deletion content/geometry/object-environment/environment-index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

include::environment-general.adoc[leveloffset=+1]
include::environment-structure.adoc[leveloffset=+1]
include::environment-notes.adoc[leveloffset=+1]

29 changes: 0 additions & 29 deletions content/geometry/object-environment/environment-notes.adoc

This file was deleted.

13 changes: 8 additions & 5 deletions content/geometry/object-environment/environment-structure.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[plantuml]
----
legend
[[../geometry/object-environment/environment-index.html#_environment_t Environment_Root (T)]]
[[../geometry/object-environment/environment-index.html#_grp_root_t Grp_Root (T)]]
|_[[../geometry/object-environment/environment-index.html#_grp_terrain Grp_Terrain]]
|_[[../geometry/object-environment/environment-index.html#_grp_environment_objects Grp_Environment_Objects]]
|_ [[../geometry/object-environment/environment-index.html#_grp_buildings Grp_Buildings]]
Expand All @@ -25,13 +25,14 @@ legend
end legend
----

== Environment_Root (T)
== Grp_Root (T)

The environment consists of the terrain, buildings, objects, and traffic areas, for example roads. It also includes all stationary traffic items, such as traffic signals, signs or lights.

If applicable, the origin of this inertial coordinate frame should match that of the corresponding OpenDRIVE map.

.<Table title>
[#tab-Environment-Grp-Root]
.Grp_Root
[%header, cols="20, 80"]
|===

Expand Down Expand Up @@ -139,7 +140,8 @@ Traffic signs belong to traffic signals. They are indexed using a <signal_index>
.Grp_Sign_<signal_idx>
image::Grp_Sign.svg[,600]

.<Table title>
[#tab-Environment-Grp_Sign]
.Grp_Sign
[%header, cols="20, 80"]
|===

Expand All @@ -166,7 +168,8 @@ Traffic lights belong to traffic signals. They show temporary changes in illumin
.Grp_Traffic_Light_<signal_idx>
image::Grp_Traffic_Light.svg[,600]

.<Table title>
[#tab-Environment-Grp_Traffic_Light]
.Grp_Traffic_Light
[%header, cols="20, 80"]
|===

Expand Down

0 comments on commit 4d77c2d

Please sign in to comment.