From 820c4492a9cf194e710d6e4b0decc8d024811ae9 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Thu, 6 Mar 2025 09:15:01 +0100 Subject: [PATCH 1/2] Change openMaterialVersion to openMaterial3dVersion Signed-off-by: ClemensLinnhoff --- schemas/asset_schema.json | 4 ++-- schemas/mapping_schema.json | 4 ++-- schemas/material_brdf_schema.json | 4 ++-- schemas/material_emp_schema.json | 4 ++-- schemas/material_optical_schema.json | 4 ++-- schemas/material_reflectance_schema.json | 4 ++-- schemas/material_schema.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/schemas/asset_schema.json b/schemas/asset_schema.json index bfb04d0a..c626309e 100644 --- a/schemas/asset_schema.json +++ b/schemas/asset_schema.json @@ -65,7 +65,7 @@ "description": "The version number of the asset, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -301,7 +301,7 @@ "name", "uuid", "assetVersion", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors", diff --git a/schemas/mapping_schema.json b/schemas/mapping_schema.json index 03fadcfa..c75ab8a9 100644 --- a/schemas/mapping_schema.json +++ b/schemas/mapping_schema.json @@ -25,7 +25,7 @@ "description": "The version number of the mapping table, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -60,7 +60,7 @@ "name", "uuid", "mappingVersion", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors" diff --git a/schemas/material_brdf_schema.json b/schemas/material_brdf_schema.json index 37c881d6..cadbc606 100644 --- a/schemas/material_brdf_schema.json +++ b/schemas/material_brdf_schema.json @@ -25,7 +25,7 @@ "description": "The version number of the material, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -68,7 +68,7 @@ "name", "uuid", "materialVersion", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors", diff --git a/schemas/material_emp_schema.json b/schemas/material_emp_schema.json index ddd90238..fc8ae5fd 100644 --- a/schemas/material_emp_schema.json +++ b/schemas/material_emp_schema.json @@ -25,7 +25,7 @@ "description": "The version number of the material, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -64,7 +64,7 @@ "name", "uuid", "materialVersion", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors", diff --git a/schemas/material_optical_schema.json b/schemas/material_optical_schema.json index c04bc7c8..c9e3453b 100644 --- a/schemas/material_optical_schema.json +++ b/schemas/material_optical_schema.json @@ -25,7 +25,7 @@ "description": "The version number of the material, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -64,7 +64,7 @@ "name", "uuid", "materialVersion", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors", diff --git a/schemas/material_reflectance_schema.json b/schemas/material_reflectance_schema.json index 63afb033..c5ebeb09 100644 --- a/schemas/material_reflectance_schema.json +++ b/schemas/material_reflectance_schema.json @@ -25,7 +25,7 @@ "description": "The version number of the material, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -66,7 +66,7 @@ "uuid", "materialVersion", "creationDate", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors", diff --git a/schemas/material_schema.json b/schemas/material_schema.json index 51de0af5..60e15bfd 100644 --- a/schemas/material_schema.json +++ b/schemas/material_schema.json @@ -25,7 +25,7 @@ "description": "The version number of the material, following semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" }, - "openMaterialVersion": { + "openMaterial3dVersion": { "type": "string", "description": "The version of the ASAM OpenMATERIAL 3D specification used, adhering to semantic versioning (for example, '1.0.0').", "pattern": "^\\d+\\.\\d+\\.\\d+$" @@ -60,7 +60,7 @@ "name", "uuid", "materialVersion", - "openMaterialVersion", + "openMaterial3dVersion", "copyrights", "license", "authors" From e46054e828d020d7abf366c2d7bab13c75d998b5 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Thu, 6 Mar 2025 09:26:28 +0100 Subject: [PATCH 2/2] Fix examples Signed-off-by: ClemensLinnhoff --- examples/environment_example/environment_example.xoma | 2 +- examples/example_asset.xoma | 2 +- examples/example_mapping.xomm | 2 +- examples/example_material.xomp | 2 +- examples/example_material_2.xomp | 2 +- examples/example_material_camera_brdf.xompt | 2 +- examples/example_material_emp.xompt | 2 +- examples/example_material_lidar_brdf.xompt | 2 +- examples/example_material_optical.xompt | 2 +- examples/example_material_radar_reflectance.xompt | 2 +- examples/human_example/human_example.xoma | 2 +- examples/vehicle_example/vehicle_example.xoma | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/environment_example/environment_example.xoma b/examples/environment_example/environment_example.xoma index 3e9cc05d..eb82b310 100644 --- a/examples/environment_example/environment_example.xoma +++ b/examples/environment_example/environment_example.xoma @@ -4,7 +4,7 @@ "description": "This is an example environment with a short road.", "uuid": "13426059-a91e-44d2-aa0e-3b4244e759aa", "assetVersion": "1.0.0", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2024 Persival GmbH"], "license": "MPL-2.0", "authors": ["clemens.linnhoff@persival.de"], diff --git a/examples/example_asset.xoma b/examples/example_asset.xoma index ee23a615..5164cf5f 100644 --- a/examples/example_asset.xoma +++ b/examples/example_asset.xoma @@ -4,7 +4,7 @@ "description": "This is an example asset. It demonstrates how ASAM OpenMATERIAL 3D assets work.", "uuid": "87769375-a510-9c68-9af8-cc3ad3dd8349", "assetVersion": "1.0.0", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2024 Persival GmbH"], "license": "MPL-2.0", "authors": ["clemens.linnhoff@persival.de"], diff --git a/examples/example_mapping.xomm b/examples/example_mapping.xomm index ce8b9b02..7567b04b 100644 --- a/examples/example_mapping.xomm +++ b/examples/example_mapping.xomm @@ -4,7 +4,7 @@ "description": "This is an example for a material mapping table. This file can be shared between multiple assets.", "uuid": "c492bda2-7c84-43e6-be19-03115545e844", "mappingVersion": "1.0.0", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 Example Company"], "license": "MPL-2.0", "authors": ["john.doe@asam.net"], diff --git a/examples/example_material.xomp b/examples/example_material.xomp index 05070489..9ee67875 100644 --- a/examples/example_material.xomp +++ b/examples/example_material.xomp @@ -5,7 +5,7 @@ "uuid": "fe7d7070-50e5-45f1-9f26-58ecacb6ac5e", "materialVersion": "1.0.0", "creationDate": "20240703T101728Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 Example Company"], "license": "MPL-2.0", "authors": ["john.doe@asam.net"] diff --git a/examples/example_material_2.xomp b/examples/example_material_2.xomp index 6b4fc88d..ce76ba60 100644 --- a/examples/example_material_2.xomp +++ b/examples/example_material_2.xomp @@ -5,7 +5,7 @@ "uuid": "807db46a-3965-4e5d-83d4-3ddebad07dc3", "materialVersion": "1.0.0", "creationDate": "20241024T110000Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 Example Company"], "license": "MPL-2.0", "authors": ["john.doe@asam.net"] diff --git a/examples/example_material_camera_brdf.xompt b/examples/example_material_camera_brdf.xompt index f703fdbe..fb46d41c 100644 --- a/examples/example_material_camera_brdf.xompt +++ b/examples/example_material_camera_brdf.xompt @@ -5,7 +5,7 @@ "uuid": "42e8da0f-ba1d-4cc8-b07a-178819c894c0", "materialVersion": "1.0.0", "creationDate": "20240919T101728Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 DIVP"], "license": "MPL-2.0", "authors": ["DIVP"], diff --git a/examples/example_material_emp.xompt b/examples/example_material_emp.xompt index 34e028e7..550fa7b4 100644 --- a/examples/example_material_emp.xompt +++ b/examples/example_material_emp.xompt @@ -5,7 +5,7 @@ "uuid": "bea5a5f2-66e7-4b93-8a8c-d773992dc09c", "materialVersion": "1.0.0", "creationDate": "20240703T101728Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 Example Company"], "license": "MPL-2.0", "authors": ["john.doe@asam.net"], diff --git a/examples/example_material_lidar_brdf.xompt b/examples/example_material_lidar_brdf.xompt index 8d929ce4..b37da116 100644 --- a/examples/example_material_lidar_brdf.xompt +++ b/examples/example_material_lidar_brdf.xompt @@ -5,7 +5,7 @@ "uuid": "c83d3856-db38-40a5-b64e-49b52869d780", "materialVersion": "1.0.0", "creationDate": "20240919T101728Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 DIVP"], "license": "MPL-2.0", "authors": ["DIVP"], diff --git a/examples/example_material_optical.xompt b/examples/example_material_optical.xompt index 33f44662..83bba483 100644 --- a/examples/example_material_optical.xompt +++ b/examples/example_material_optical.xompt @@ -5,7 +5,7 @@ "uuid": "d8622b6b-39f8-4bab-8085-75ebf05ca087", "materialVersion": "1.0.0", "creationDate": "20241024T101728Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 Example Company"], "license": "MPL-2.0", "authors": ["john.doe@asam.net"], diff --git a/examples/example_material_radar_reflectance.xompt b/examples/example_material_radar_reflectance.xompt index e4227317..e2577c1b 100644 --- a/examples/example_material_radar_reflectance.xompt +++ b/examples/example_material_radar_reflectance.xompt @@ -5,7 +5,7 @@ "uuid": "e9e2a27e-ee53-437e-b578-3b61b7cc47f2", "materialVersion": "1.0.0", "creationDate": "20240919T101728Z", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2023-2024 DIVP"], "license": "MPL-2.0", "authors": ["DIVP"], diff --git a/examples/human_example/human_example.xoma b/examples/human_example/human_example.xoma index a01a90d7..0b3f9335 100644 --- a/examples/human_example/human_example.xoma +++ b/examples/human_example/human_example.xoma @@ -4,7 +4,7 @@ "description": "This is an example human asset. It demonstrates how ASAM OpenMATERIAL 3D assets and their node structure work.", "uuid": "fee894fa-4ea2-41e4-8125-9c27a18a9eba", "assetVersion": "1.0.0", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2024 Persival GmbH"], "license": "MPL-2.0", "authors": ["clemens.linnhoff@persival.de", "simone.graf@ipg-automotive.com"], diff --git a/examples/vehicle_example/vehicle_example.xoma b/examples/vehicle_example/vehicle_example.xoma index e9c746a3..427f61bc 100644 --- a/examples/vehicle_example/vehicle_example.xoma +++ b/examples/vehicle_example/vehicle_example.xoma @@ -4,7 +4,7 @@ "description": "This is an example vehicle asset. It demonstrates how ASAM OpenMATERIAL 3D assets and their node structure work.", "uuid": "cd9cc640-249e-4a1d-bc95-a713c4250f82", "assetVersion": "1.0.0", - "openMaterialVersion": "1.0.0", + "openMaterial3dVersion": "1.0.0", "copyrights": ["(C) 2024 BMW AG", "(C) 2024 Persival GmbH"], "license": "MPL-2.0", "authors": ["ludwig.friedmann@bmw.de", "clemens.linnhoff@persival.de"],