Skip to content

Commit

Permalink
Merge branch 'main' into 106-material-param-docu
Browse files Browse the repository at this point in the history
  • Loading branch information
ClemensLinnhoff committed Sep 17, 2024
2 parents b7f84dd + 96b5eaa commit ef268d3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .antora/modules/specification/nav_openmaterial.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
* Material
** xref:material/Introduction.adoc[]
** xref:material/Fileformat.adoc[]
** xref:material/Metadata.adoc[]
** xref:material/metadata.adoc[]
** xref:material/material-properties.adoc[Material properties]
** xref:material/lookup-tables.adoc[]
2 changes: 2 additions & 0 deletions .github/workflows/antora-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
run: |
python3 json2asciidoc.py ../schemas/asset_schema.json metadata
mv metadata.adoc ../content/geometry/
python3 json2asciidoc.py ../schemas/material_schema.json metadata
mv metadata.adoc ../content/material/
python3 json2asciidoc.py ../schemas/material_schema.json material_properties
mv material_properties.adoc ../content/material/material-properties.adoc
python3 json2asciidoc.py ../schemas/material_emp_schema.json electromagnetic_properties
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
.idea/

# Autogenerated files
content/geometry/metadata.adoc
content/material/metadata.adoc
content/material/material-properties.adoc
content/material/electromagnetic-properties.adoc
1 change: 0 additions & 1 deletion content/material/Metadata.adoc

This file was deleted.

2 changes: 1 addition & 1 deletion content/material/material-index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

include::Introduction.adoc[leveloffset=+1]
include::Fileformat.adoc[leveloffset=+1]
include::Metadata.adoc[leveloffset=+1]
include::metadata.adoc[leveloffset=+1]
include::material-properties.adoc[leveloffset=+1]
include::lookup-tables.adoc[leveloffset=+1]

0 comments on commit ef268d3

Please sign in to comment.