Skip to content

Commit

Permalink
Merge branch 'main' into Add-anchors-to-human-tables
Browse files Browse the repository at this point in the history
  • Loading branch information
ClemensLinnhoff committed Jan 16, 2025
2 parents 21be22f + dcad804 commit b201bf2
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 38 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ image::Grp_Terrain.svg[,600]

An environment object consists of buildings, vegetation, and any other (stationary) object of the surrounding. An environment object causes a local elevation or other additions in the terrain.

[#Grp_Environment_Objects]
[#fig-environment-objects]
.Grp_Environment_Objects
image::Grp_Environment_Objects.svg[,600]

Expand Down Expand Up @@ -186,4 +186,4 @@ image::Grp_Traffic_Light.svg[,600]

| *z-axis*
| Perpendicular to the x-axis, pointing vertically upwards.
|===
|===
2 changes: 1 addition & 1 deletion content/geometry/object-human/human-general.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The bones follow a specific bone orientation: The y-axis of a bone always follow
<<fig-human-structure>> shows the orientation of the coordinate system of a human skeleton.

[#fig-human-structure]
.fig_human-structure
.Human bone structure
image::fig_human-structure.svg[,400]

Bones with a local transform are indicated in the structure by a (T).
Expand Down
10 changes: 10 additions & 0 deletions content/geometry/object-vehicle/vehicle-structure.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,11 @@ image::Grp_Door_Top.svg[, 600]
This group contains a hitch at the front of the vehicle. It exists on some cars
and on most trailers.

[#fig-Hitch-Front]
.Grp_Hitch_Front
image::Grp_Hitch_Front.svg[,600]

[#tab-Grp-Hitch-Front]
.Grp_Hitch_Front
[%header, cols="20, 80"]
|===
Expand All @@ -382,9 +384,11 @@ This group defines the contact point to attach another vehicle.
During simulation a vehicle's `Grp_Hitch_Rear_Contact_Point` and another
vehicle's `Grp_Hitch_Front_Contact_Point` are placed at the same position.

[#fig-Hitch-Front-Contact-Point]
.Grp_Hitch_Front_Contact_Point
image::Grp_Hitch_Front_Contact_Point.svg[,600]

[#tab-Hitch-Front-Contact-Point]
.Grp_Hitch_Front_Contact_Point
[%header, cols="20, 80"]
|===
Expand All @@ -410,9 +414,11 @@ image::Grp_Hitch_Front_Contact_Point.svg[,600]
This group contains a hitch on the rear of the vehicle. It exists on cars and
on some trailers for multi-trailer setups.

[#fig-Hitch-Rear]
.Grp_Hitch_Rear
image::Grp_Hitch_Rear.svg[,600]

[#tab-Hitch-Rear]
.Grp_Hitch_Rear
[%header, cols="20, 80"]
|===
Expand All @@ -439,9 +445,11 @@ This group defines the contact point to attach another vehicle.
During simulation a vehicle's `Grp_Hitch_Rear_Contact_Point` and another
vehicle's `Grp_Hitch_Front_Contact_Point` are placed at the same position.

[#fig-Hitch-Rear-Contact-Point]
.Grp_Hitch_Rear_Contact_Point
image::Grp_Hitch_Rear_Contact_Point.svg[,600]

[#tab-Hitch-Rear-Contact-Point]
.Grp_Hitch_Rear_Contact_Point
[%header, cols="20, 80"]
|===
Expand Down Expand Up @@ -1111,6 +1119,7 @@ This group contains all parts of a reverse light on the vehicle's left side.
`<reverse_left_idx>` denotes the index of reverse lights on the left side. The index entries
are sorted from right to left in positive y-direction, starting with 0.

[#fig-light-reverse-left]
.Grp_Light_Reverse_Left_<reverse_left_idx>
image::Grp_Light_Tail_Left.svg[,400]

Expand Down Expand Up @@ -1348,6 +1357,7 @@ It is a child node of the corresponding mirror joint group.
`<blindspot_mirror_view_idx>` denotes the index of blindspot mirrors. The index entries
are sorted from right to left in positive y-direction, and from front to rear, starting with 0.

[#fig-mirror-blindspot-view]
.Grp_Mirror_Blindspot_View_<blindspot_mirror_view_idx>
image::Grp_Mirror_Blindspot_View.svg[,600]

Expand Down
62 changes: 27 additions & 35 deletions content/nav-openmaterial.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,38 @@
:antora_mapping: true

[preface]
* xref:../general-docs/foreword.adoc[]
include::general-docs/foreword.adoc[leveloffset=+1]
[preface]
* xref:../general-docs/introduction.adoc[]
include::general-docs/introduction.adoc[leveloffset=+1]

:sectnums:
* xref:general-docs/scope.adoc[]
* xref:general-docs/normative-references.adoc[]
* xref:general-docs/abbreviations.adoc[]
* xref:general-docs/backward-compatibility.adoc[]
* xref:terms-and-definitions/terms-and-definitions.adoc[]
* xref:use-cases/use-cases.adoc[]
* 7 Geometry
** xref:geometry/introduction.adoc[]
** xref:geometry/general.adoc[]
** xref:geometry/object-classes.adoc[]
*** xref:geometry/object-vehicle/vehicle-index.adoc[]
*** xref:geometry/object-human/human-index.adoc[]
*** xref:geometry/object-environment/environment-index.adoc[]
** xref:geometry/file-format-support.adoc[]
** xref:geometry/asset-schema.adoc[]
** xref:geometry/mapping-schema.adoc[]
* 8 Material
** xref:material/introduction.adoc[]
** xref:material/material-schema.adoc[]
** xref:material/material-emp-schema.adoc[]
** xref:material/material-optical-schema.adoc[]
** xref:material/material-brdf-schema.adoc[]
** xref:material/material-reflectance-schema.adoc[]
include::general-docs/scope.adoc[leveloffset=+1]
include::general-docs/normative-references.adoc[leveloffset=+1]
include::general-docs/abbreviations.adoc[leveloffset=+1]
include::general-docs/backward-compatibility.adoc[leveloffset=+1]
include::terms-and-definitions/terms-and-definitions.adoc[leveloffset=+1]
include::use-cases/use-cases.adoc[leveloffset=+1]

== 7 Geometry
include::geometry/introduction.adoc[leveloffset=+2]
include::geometry/general.adoc[leveloffset=+2]
include::geometry/object-classes.adoc[leveloffset=+2]
include::geometry/object-vehicle/vehicle-index.adoc[leveloffset=+3]
include::geometry/object-human/human-index.adoc[leveloffset=+3]
include::geometry/object-environment/environment-index.adoc[leveloffset=+3]
include::geometry/file-format-support.adoc[leveloffset=+2]
include::geometry/asset-schema.adoc[leveloffset=+2]
include::geometry/mapping-schema.adoc[leveloffset=+2]

== 8 Material
include::material/introduction.adoc[leveloffset=+2]
include::material/material-schema.adoc[leveloffset=+2]
include::material/material-emp-schema.adoc[leveloffset=+2]
include::material/material-optical-schema.adoc[leveloffset=+2]
include::material/material-brdf-schema.adoc[leveloffset=+2]

:sectnums!:
[bibliography]
* xref:bibliography.adoc[leveloffset=+1]
:sectnums!:
xref:loft/list-of-figures.adoc[leveloffset=+1]
:sectnums!:
xref:loft/list-of-tables.adoc[leveloffset=+1]
include::bibliography.adoc[leveloffset=+1]

:!antora_mapping:

0 comments on commit b201bf2

Please sign in to comment.