Merge pull request #74 from asam-ev/73-vehicle-structure-not-linked

Fixed vehicle structure
asam-ev · Aug 22, 2024 · 9edd1ba · 9edd1ba
2 parents 5b61d5c + 19064b3
commit 9edd1ba
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 21 deletions.
diff --git a/...ent/geometry/general-structure-index.adoc → content/geometry/geometry-index.adoc b/...ent/geometry/general-structure-index.adoc → content/geometry/geometry-index.adoc
@@ -2,7 +2,7 @@
 
 include::Introduction.adoc[leveloffset=+1]
 include::General.adoc[leveloffset=+1]
-include::Object-Geometry_classes_and_segmentation.adoc[leveloffset=+1]
+include::object-classes.adoc[leveloffset=+1]
 include::File_format_support.adoc[leveloffset=+1]
 include::Metadata.adoc[leveloffset=+1]
 include::Performance.adoc[leveloffset=+1]

diff --git a/...ct-Geometry_classes_and_segmentation.adoc → content/geometry/object-classes.adoc b/...ct-Geometry_classes_and_segmentation.adoc → content/geometry/object-classes.adoc
@@ -1,23 +1,18 @@
-= Object and geometry classes
+= Object classes
 
-== Object classes
-In ASAM OpenMATERIAL, object classes represent a collection of similar objects.
-Examples of object classes are vehicles, humans, and the road network. Each
-instance of the object class is described by the same properties, but has
+== Introduction
+In ASAM OpenMATERIAL, an object class is a collection of similar objects.
+Examples of object classes are vehicles, humans, and road networks.
+Each instance of an object class is described by the same properties, but has
 individual property values.
 
 The ASAM OpenMATERIAL standard supports the following object classes:
 
 * Vehicle
 * Human
 * Road and road infrastructure
-* Vegetation, including trees
-* Building
-* Animal
-* Custom class
 
-NOTE: TODO: Add references to dedicated sections describing object classes. Vegetation, building, and
-animal are not yet supported
+NOTE: TODO: Add references to dedicated sections describing object classes.
 
 If the human is clearly distinguishable from the vehicle, then both the
 human and the vehicle are represented by two different objects. Examples are
@@ -57,3 +52,5 @@ NOTE: TODO: Discuss and document
 - Class-specific levels of detail and impostors
 
 NOTE: TODO: Add information on geometry classes + segmentation?
+
+include::object-vehicle/vehicle-index.adoc[leveloffset=+1]
diff --git a/content/geometry/vehicle-index.adoc → ...eometry/object-vehicle/vehicle-index.adoc b/content/geometry/vehicle-index.adoc → ...eometry/object-vehicle/vehicle-index.adoc
@@ -1,6 +1,5 @@
 = Vehicle structure
 
-include::vehicle-structure-introduction.adoc[leveloffset=+1]
 include::vehicle-structure-general.adoc[leveloffset=+1]
 include::vehicle-structure-model-creation.adoc[leveloffset=+1]
 include::vehicle-structure-model-structure.adoc[leveloffset=+1]

diff --git a/content/geometry/object-vehicle/vehicle-structure-general.adoc b/content/geometry/object-vehicle/vehicle-structure-general.adoc
@@ -0,0 +1,3 @@
+= General
+
+// General stuff
diff --git a/...try/vehicle-structure-model-creation.adoc → ...cle/vehicle-structure-model-creation.adoc b/...try/vehicle-structure-model-creation.adoc → ...cle/vehicle-structure-model-creation.adoc
diff --git a/...ry/vehicle-structure-model-structure.adoc → ...le/vehicle-structure-model-structure.adoc b/...ry/vehicle-structure-model-structure.adoc → ...le/vehicle-structure-model-structure.adoc
@@ -57,7 +57,7 @@
 | |  | |-------Grp_Rearview_Mirror_View_<rearview_mirror_view_idx> (T)
 | |  | |-------Grp_Seat_<seat_idx> (T)
 
-== Grp_Vehicle_Part_keyword <vehicle_part_idx> (T) 
+== Grp_Vehicle_Part_<keyword><vehicle_part_idx> (T) 
 
 Add a description
 

diff --git a/...ent/geometry/vehicle-structure-notes.adoc → ...ject-vehicle/vehicle-structure-notes.adoc b/...ent/geometry/vehicle-structure-notes.adoc → ...ject-vehicle/vehicle-structure-notes.adoc
diff --git a/content/geometry/vehicle-structure-general.adoc b/content/geometry/vehicle-structure-general.adoc
diff --git a/content/geometry/vehicle-structure-introduction.adoc b/content/geometry/vehicle-structure-introduction.adoc
diff --git a/content/index.adoc b/content/index.adoc
@@ -36,7 +36,7 @@ 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]
-include::geometry/general-structure-index.adoc[leveloffset=+1]
+include::geometry/geometry-index.adoc[leveloffset=+1]
 include::material/general-structure-index.adoc[leveloffset=+1]