From 7ae6bf437453ffb535766d03a866b1ba54320562 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sat, 8 Aug 2026 14:19:57 +0200 Subject: [PATCH] Rename geometry and serializer files Apply the rename manifest, normalize serializer filenames to the classes they define, and update includes and CMake source lists. Generated with the assistance of an AI coding tool. --- src/bonsaiviewer/modules/models/Commands.cpp | 2 +- src/examples/IfcAdvancedHouse.cpp | 2 +- src/examples/IfcOpenHouse.cpp | 2 +- src/examples/IfcParseExamples.cpp | 2 +- src/ifcconvert/IfcConvert.cpp | 8 ++--- .../validate_storey_containment.cpp | 6 ++-- src/ifcconvert/validation_utils.h | 6 ++-- src/ifcgeom/CMakeLists.txt | 2 +- ...AbstractKernel.cpp => abstract_kernel.cpp} | 6 ++-- .../{AbstractKernel.h => abstract_kernel.h} | 4 +-- src/ifcgeom/abstract_mapping.h | 2 +- ...ersionResult.cpp => conversion_result.cpp} | 4 +-- ...ConversionResult.h => conversion_result.h} | 4 +-- ...onSettings.cpp => conversion_settings.cpp} | 2 +- ...ersionSettings.h => conversion_settings.h} | 0 src/ifcgeom/{Converter.cpp => converter.cpp} | 4 +-- src/ifcgeom/{Converter.h => converter.h} | 10 +++---- src/ifcgeom/{IfcGeomElement.h => element.h} | 2 +- src/ifcgeom/{IfcGeomFilter.h => filter.h} | 4 +-- ...etrySerializer.h => geometry_serializer.h} | 4 +-- src/ifcgeom/hybrid_kernel.h | 2 +- src/ifcgeom/infra_sweep_helper.h | 2 +- src/ifcgeom/{Iterator.cpp => iterator.cpp} | 2 +- src/ifcgeom/{Iterator.h => iterator.h} | 8 ++--- src/ifcgeom/kernel_registry.h | 2 +- ...nResult.cpp => cgal_conversion_result.cpp} | 6 ++-- ...rsionResult.h => cgal_conversion_result.h} | 4 +-- .../cgal/{CgalKernel.cpp => cgal_kernel.cpp} | 4 +-- .../cgal/{CgalKernel.h => cgal_kernel.h} | 6 ++-- src/ifcgeom/kernels/cgal/plugin.cpp | 2 +- ...ult.cpp => manifold_conversion_result.cpp} | 4 +-- ...nResult.h => manifold_conversion_result.h} | 2 +- ...ManifoldKernel.cpp => manifold_kernel.cpp} | 2 +- .../{ManifoldKernel.h => manifold_kernel.h} | 4 +-- src/ifcgeom/kernels/manifold/plugin.cpp | 2 +- .../kernels/opencascade/base_utils.cpp | 2 +- src/ifcgeom/kernels/opencascade/base_utils.h | 2 +- .../kernels/opencascade/boolean_result.cpp | 2 +- .../kernels/opencascade/boolean_utils.cpp | 2 +- .../kernels/opencascade/bspline_surface.cpp | 2 +- src/ifcgeom/kernels/opencascade/extrusion.cpp | 2 +- src/ifcgeom/kernels/opencascade/face.cpp | 4 +-- .../kernels/opencascade/face_definition.cpp | 2 +- .../kernels/opencascade/faceset_helper.cpp | 4 +-- src/ifcgeom/kernels/opencascade/layerset.cpp | 4 +-- src/ifcgeom/kernels/opencascade/layerset.h | 2 +- src/ifcgeom/kernels/opencascade/loft.cpp | 2 +- src/ifcgeom/kernels/opencascade/loop.cpp | 2 +- src/ifcgeom/kernels/opencascade/matrix4.cpp | 2 +- ....cpp => opencascade_conversion_result.cpp} | 4 +-- ...sult.h => opencascade_conversion_result.h} | 2 +- ...scadeKernel.cpp => opencascade_kernel.cpp} | 2 +- ...enCascadeKernel.h => opencascade_kernel.h} | 12 ++++---- src/ifcgeom/kernels/opencascade/plugin.cpp | 2 +- src/ifcgeom/kernels/opencascade/shell.cpp | 2 +- src/ifcgeom/kernels/opencascade/solid.cpp | 2 +- .../kernels/opencascade/sweep_along_curve.cpp | 2 +- .../opencascade/{IfcGeomTree.h => tree.h} | 8 ++--- .../kernels/opencascade/tree_backends.h | 2 +- .../kernels/opencascade/wire_builder.cpp | 2 +- .../kernels/opencascade/wire_utils.cpp | 6 ++-- ....cpp => passthrough_conversion_result.cpp} | 4 +-- ...sult.h => passthrough_conversion_result.h} | 2 +- ...roughKernel.cpp => passthrough_kernel.cpp} | 2 +- ...ssthroughKernel.h => passthrough_kernel.h} | 4 +-- src/ifcgeom/kernels/passthrough/plugin.cpp | 2 +- ...{IfcGeomRenderStyles.h => render_styles.h} | 0 ...mRepresentation.cpp => representation.cpp} | 2 +- ...cGeomRepresentation.h => representation.h} | 4 +-- .../CMakeLists.txt | 6 ++-- .../ifc_geomserialization_api.h | 0 ...opencascade_geometry_ifc_writer_plugin.cpp | 0 .../opencascade_geometry_ifc_writer_plugin.h | 2 +- .../schema/CMakeLists.txt | 2 +- .../schema/plugin.cpp | 2 +- .../schema/serialization.cpp} | 0 .../serialization.cpp} | 4 +-- .../serialization.h} | 2 +- src/ifcgeom/{Serializer.h => serializer.h} | 0 .../{SurfaceStyle.cpp => surface_style.cpp} | 2 +- src/ifcgeom/taxonomy.h | 2 +- .../tests/test_ifcopenshell_geometry.cpp | 2 +- src/ifcgeom/tree.cpp | 2 +- src/ifcgeom/tree.h | 2 +- src/ifcgeomserver/IfcGeomServer.cpp | 6 ++-- src/ifcmax/IfcMax.cpp | 6 ++-- .../ifcopenshell/geom/main.py | 2 +- .../ifcopenshell/util/shape.py | 2 +- src/ifcviewer/GeometryStreamer.cpp | 2 +- src/ifcviewer/GeometryStreamer.h | 2 +- src/ifcwrap/IfcGeomWrapper.i | 12 ++++---- src/ifcwrap/IfcParseWrapper.i | 2 +- src/ifcwrap/IfcPython.i | 30 +++++++++---------- src/serializers/CMakeLists.txt | 18 +++++------ ...aSerializer.cpp => collada_serializer.cpp} | 2 +- ...lladaSerializer.h => collada_serializer.h} | 4 +-- src/serializers/document_rdb_plugin.cpp | 2 +- src/serializers/document_serializer_plugin.h | 2 +- src/serializers/geometry_dae_plugin.cpp | 2 +- src/serializers/geometry_glb_plugin.cpp | 2 +- src/serializers/geometry_igs_plugin.cpp | 2 +- src/serializers/geometry_obj_plugin.cpp | 2 +- src/serializers/geometry_serializer_plugin.h | 2 +- src/serializers/geometry_stp_plugin.cpp | 2 +- src/serializers/geometry_svg_plugin.cpp | 2 +- src/serializers/geometry_ttl_plugin.cpp | 2 +- src/serializers/geometry_usd_plugin.cpp | 2 +- ...GltfSerializer.cpp => gltf_serializer.cpp} | 2 +- .../{GltfSerializer.h => gltf_serializer.h} | 2 +- .../{IgesSerializer.h => iges_serializer.h} | 2 +- .../{JsonSerializer.h => json_serializer.h} | 2 +- ....cpp => open_cascade_based_serializer.cpp} | 4 +-- ...izer.h => open_cascade_based_serializer.h} | 4 +-- ...Serializer.cpp => rocks_db_serializer.cpp} | 2 +- ...ksDbSerializer.h => rocks_db_serializer.h} | 2 +- .../schema_dependent/CMakeLists.txt | 4 +-- .../schema_dependent/json_plugin.cpp | 2 +- ...JsonSerializer.cpp => json_serializer.cpp} | 2 +- .../{JsonSerializer.h => json_serializer.h} | 2 +- .../schema_dependent/xml_plugin.cpp | 2 +- .../{XmlSerializer.cpp => xml_serializer.cpp} | 2 +- .../{XmlSerializer.h => xml_serializer.h} | 2 +- .../{StepSerializer.h => step_serializer.h} | 4 +-- .../{SvgSerializer.cpp => svg_serializer.cpp} | 6 ++-- .../{SvgSerializer.h => svg_serializer.h} | 4 +-- ...tSerializer.cpp => ttl_wkt_serializer.cpp} | 4 +-- ...tlWktSerializer.h => ttl_wkt_serializer.h} | 2 +- .../{USDSerializer.cpp => usd_serializer.cpp} | 2 +- .../{USDSerializer.h => usd_serializer.h} | 2 +- ...lizer.cpp => wavefront_obj_serializer.cpp} | 4 +-- ...erializer.h => wavefront_obj_serializer.h} | 2 +- .../{XmlSerializer.h => xml_serializer.h} | 2 +- 132 files changed, 217 insertions(+), 217 deletions(-) rename src/ifcgeom/{AbstractKernel.cpp => abstract_kernel.cpp} (97%) rename src/ifcgeom/{AbstractKernel.h => abstract_kernel.h} (99%) rename src/ifcgeom/{ConversionResult.cpp => conversion_result.cpp} (93%) rename src/ifcgeom/{ConversionResult.h => conversion_result.h} (99%) rename src/ifcgeom/{ConversionSettings.cpp => conversion_settings.cpp} (98%) rename src/ifcgeom/{ConversionSettings.h => conversion_settings.h} (100%) rename src/ifcgeom/{Converter.cpp => converter.cpp} (99%) rename src/ifcgeom/{Converter.h => converter.h} (91%) rename src/ifcgeom/{IfcGeomElement.h => element.h} (99%) rename src/ifcgeom/{IfcGeomFilter.h => filter.h} (99%) rename src/ifcgeom/{GeometrySerializer.h => geometry_serializer.h} (98%) rename src/ifcgeom/{Iterator.cpp => iterator.cpp} (99%) rename src/ifcgeom/{Iterator.h => iterator.h} (98%) rename src/ifcgeom/kernels/cgal/{CgalConversionResult.cpp => cgal_conversion_result.cpp} (99%) rename src/ifcgeom/kernels/cgal/{CgalConversionResult.h => cgal_conversion_result.h} (99%) rename src/ifcgeom/kernels/cgal/{CgalKernel.cpp => cgal_kernel.cpp} (99%) rename src/ifcgeom/kernels/cgal/{CgalKernel.h => cgal_kernel.h} (97%) rename src/ifcgeom/kernels/manifold/{ManifoldConversionResult.cpp => manifold_conversion_result.cpp} (99%) rename src/ifcgeom/kernels/manifold/{ManifoldConversionResult.h => manifold_conversion_result.h} (98%) rename src/ifcgeom/kernels/manifold/{ManifoldKernel.cpp => manifold_kernel.cpp} (99%) rename src/ifcgeom/kernels/manifold/{ManifoldKernel.h => manifold_kernel.h} (92%) rename src/ifcgeom/kernels/opencascade/{OpenCascadeConversionResult.cpp => opencascade_conversion_result.cpp} (99%) rename src/ifcgeom/kernels/opencascade/{OpenCascadeConversionResult.h => opencascade_conversion_result.h} (99%) rename src/ifcgeom/kernels/opencascade/{OpenCascadeKernel.cpp => opencascade_kernel.cpp} (99%) rename src/ifcgeom/kernels/opencascade/{OpenCascadeKernel.h => opencascade_kernel.h} (96%) rename src/ifcgeom/kernels/opencascade/{IfcGeomTree.h => tree.h} (99%) rename src/ifcgeom/kernels/passthrough/{PassthroughConversionResult.cpp => passthrough_conversion_result.cpp} (99%) rename src/ifcgeom/kernels/passthrough/{PassthroughConversionResult.h => passthrough_conversion_result.h} (98%) rename src/ifcgeom/kernels/passthrough/{PassthroughKernel.cpp => passthrough_kernel.cpp} (99%) rename src/ifcgeom/kernels/passthrough/{PassthroughKernel.h => passthrough_kernel.h} (90%) rename src/ifcgeom/{IfcGeomRenderStyles.h => render_styles.h} (100%) rename src/ifcgeom/{IfcGeomRepresentation.cpp => representation.cpp} (99%) rename src/ifcgeom/{IfcGeomRepresentation.h => representation.h} (99%) rename src/ifcgeom/{Serialization => serialization}/CMakeLists.txt (89%) rename src/ifcgeom/{Serialization => serialization}/ifc_geomserialization_api.h (100%) rename src/ifcgeom/{Serialization => serialization}/opencascade_geometry_ifc_writer_plugin.cpp (100%) rename src/ifcgeom/{Serialization => serialization}/opencascade_geometry_ifc_writer_plugin.h (98%) rename src/ifcgeom/{Serialization => serialization}/schema/CMakeLists.txt (93%) rename src/ifcgeom/{Serialization => serialization}/schema/plugin.cpp (97%) rename src/ifcgeom/{Serialization/schema/Serialization.cpp => serialization/schema/serialization.cpp} (100%) rename src/ifcgeom/{Serialization/Serialization.cpp => serialization/serialization.cpp} (96%) rename src/ifcgeom/{Serialization/Serialization.h => serialization/serialization.h} (97%) rename src/ifcgeom/{Serializer.h => serializer.h} (100%) rename src/ifcgeom/{SurfaceStyle.cpp => surface_style.cpp} (99%) rename src/serializers/{ColladaSerializer.cpp => collada_serializer.cpp} (99%) rename src/serializers/{ColladaSerializer.h => collada_serializer.h} (99%) rename src/serializers/{GltfSerializer.cpp => gltf_serializer.cpp} (99%) rename src/serializers/{GltfSerializer.h => gltf_serializer.h} (98%) rename src/serializers/{IgesSerializer.h => iges_serializer.h} (98%) rename src/serializers/{JsonSerializer.h => json_serializer.h} (97%) rename src/serializers/{OpenCascadeBasedSerializer.cpp => open_cascade_based_serializer.cpp} (95%) rename src/serializers/{OpenCascadeBasedSerializer.h => open_cascade_based_serializer.h} (97%) rename src/serializers/{RocksDbSerializer.cpp => rocks_db_serializer.cpp} (99%) rename src/serializers/{RocksDbSerializer.h => rocks_db_serializer.h} (96%) rename src/serializers/schema_dependent/{JsonSerializer.cpp => json_serializer.cpp} (99%) rename src/serializers/schema_dependent/{JsonSerializer.h => json_serializer.h} (98%) rename src/serializers/schema_dependent/{XmlSerializer.cpp => xml_serializer.cpp} (99%) rename src/serializers/schema_dependent/{XmlSerializer.h => xml_serializer.h} (98%) rename src/serializers/{StepSerializer.h => step_serializer.h} (96%) rename src/serializers/{SvgSerializer.cpp => svg_serializer.cpp} (99%) rename src/serializers/{SvgSerializer.h => svg_serializer.h} (99%) rename src/serializers/{TtlWktSerializer.cpp => ttl_wkt_serializer.cpp} (99%) rename src/serializers/{TtlWktSerializer.h => ttl_wkt_serializer.h} (98%) rename src/serializers/{USDSerializer.cpp => usd_serializer.cpp} (99%) rename src/serializers/{USDSerializer.h => usd_serializer.h} (98%) rename src/serializers/{WavefrontObjSerializer.cpp => wavefront_obj_serializer.cpp} (98%) rename src/serializers/{WavefrontObjSerializer.h => wavefront_obj_serializer.h} (98%) rename src/serializers/{XmlSerializer.h => xml_serializer.h} (97%) diff --git a/src/bonsaiviewer/modules/models/Commands.cpp b/src/bonsaiviewer/modules/models/Commands.cpp index 557c034bd5..a6243ac662 100644 --- a/src/bonsaiviewer/modules/models/Commands.cpp +++ b/src/bonsaiviewer/modules/models/Commands.cpp @@ -32,7 +32,7 @@ #include "../../../ifcviewer/SceneLoader.h" #include "../../../ifcviewer/SidecarBuilder.h" #include "../../../ifcviewer/ViewportWindow.h" -#include "../../../ifcgeom/Serializer.h" +#include "../../../ifcgeom/serializer.h" #include "../../../serializers/document_serializer_plugin.h" #include diff --git a/src/examples/IfcAdvancedHouse.cpp b/src/examples/IfcAdvancedHouse.cpp index a9cfa8add7..7e5580afea 100644 --- a/src/examples/IfcAdvancedHouse.cpp +++ b/src/examples/IfcAdvancedHouse.cpp @@ -50,7 +50,7 @@ #include "ifcparse/hierarchy_helper.h" #include "plugin/plugin.h" -#include "../ifcgeom/Serialization/Serialization.h" +#include "../ifcgeom/serialization/serialization.h" #if USE_VLD #include diff --git a/src/examples/IfcOpenHouse.cpp b/src/examples/IfcOpenHouse.cpp index ac208c5d6f..358fb9abef 100644 --- a/src/examples/IfcOpenHouse.cpp +++ b/src/examples/IfcOpenHouse.cpp @@ -47,7 +47,7 @@ #include "ifcparse/hierarchy_helper.h" #include "plugin/plugin.h" -#include "../ifcgeom/Serialization/Serialization.h" +#include "../ifcgeom/serialization/serialization.h" #if USE_VLD #include diff --git a/src/examples/IfcParseExamples.cpp b/src/examples/IfcParseExamples.cpp index 4ba4dea293..197b48e5e3 100644 --- a/src/examples/IfcParseExamples.cpp +++ b/src/examples/IfcParseExamples.cpp @@ -73,7 +73,7 @@ typedef IfcSchema::IfcBuiltElement element_t; std::string format_string(const ifcopenshell::attribute_value& argument) { // Argument is a runtime tagged variant for the various data types in a IFC model, // in this particular case we only care about flattening it to a string. - // @todo mostly duplicated from XmlSerializer.cpp + // @todo mostly duplicated from xml_serializer.cpp if (argument.isNull()) { return "-"; } diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp index 136031427f..2a6afbe730 100644 --- a/src/ifcconvert/IfcConvert.cpp +++ b/src/ifcconvert/IfcConvert.cpp @@ -33,9 +33,9 @@ #include "../serializers/document_serializer_plugin.h" #include "../serializers/geometry_serializer_plugin.h" -#include "../ifcgeom/IfcGeomFilter.h" -#include "../ifcgeom/Iterator.h" -#include "../ifcgeom/IfcGeomRenderStyles.h" +#include "../ifcgeom/filter.h" +#include "../ifcgeom/iterator.h" +#include "../ifcgeom/render_styles.h" #include "../ifcgeom/hybrid_kernel.h" #include "../ifcparse/utils.h" @@ -926,7 +926,7 @@ int main(int argc, char** argv) { // The functions ifcopenshell::geom::iterator::get() and ifcopenshell::geom::iterator::next() // wrap an iterator of all geometrical products in the Ifc file. // ifcopenshell::geom::iterator::get() returns an ifcopenshell::geom::triangulation_element or - // -brep_element pointer, based on current settings. (see Iterator.h + // -brep_element pointer, based on current settings. (see iterator.h // for definition) ifcopenshell::geom::iterator::next() is used to poll whether more // geometrical entities are available. None of these functions throw // exceptions, neither for parsing errors or geometrical errors. Upon diff --git a/src/ifcconvert/validate_storey_containment.cpp b/src/ifcconvert/validate_storey_containment.cpp index 10e00169e8..6ffc486c3d 100644 --- a/src/ifcconvert/validate_storey_containment.cpp +++ b/src/ifcconvert/validate_storey_containment.cpp @@ -1,8 +1,8 @@ #ifdef IFOPSH_WITH_CGAL -#include "../ifcgeom/kernels/cgal/CgalKernel.h" -#include "../ifcgeom/IfcGeomFilter.h" -#include "../ifcgeom/Iterator.h" +#include "../ifcgeom/kernels/cgal/cgal_kernel.h" +#include "../ifcgeom/filter.h" +#include "../ifcgeom/iterator.h" #include #include diff --git a/src/ifcconvert/validation_utils.h b/src/ifcconvert/validation_utils.h index 2924ba34e7..a717084b00 100644 --- a/src/ifcconvert/validation_utils.h +++ b/src/ifcconvert/validation_utils.h @@ -1,8 +1,8 @@ #ifdef IFOPSH_WITH_CGAL -#include "../ifcgeom/kernels/cgal/CgalKernel.h" -#include "../ifcgeom/IfcGeomFilter.h" -#include "../ifcgeom/Iterator.h" +#include "../ifcgeom/kernels/cgal/cgal_kernel.h" +#include "../ifcgeom/filter.h" +#include "../ifcgeom/iterator.h" #include "../ifcgeom/hybrid_kernel.h" #include diff --git a/src/ifcgeom/CMakeLists.txt b/src/ifcgeom/CMakeLists.txt index 7729d51501..fc73187bcd 100644 --- a/src/ifcgeom/CMakeLists.txt +++ b/src/ifcgeom/CMakeLists.txt @@ -54,7 +54,7 @@ else() endif() if((BUILD_CONVERT OR BUILD_IFCPYTHON) AND WITH_OPENCASCADE) - add_subdirectory(Serialization) + add_subdirectory(serialization) set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} PARENT_SCOPE) set(geometry_serializer_libraries ${geometry_serializer_libraries} PARENT_SCOPE) endif() diff --git a/src/ifcgeom/AbstractKernel.cpp b/src/ifcgeom/abstract_kernel.cpp similarity index 97% rename from src/ifcgeom/AbstractKernel.cpp rename to src/ifcgeom/abstract_kernel.cpp index 5af6d975c1..ac9826dce9 100644 --- a/src/ifcgeom/AbstractKernel.cpp +++ b/src/ifcgeom/abstract_kernel.cpp @@ -1,9 +1,9 @@ -#include "../ifcgeom/IfcGeomElement.h" -#include "../ifcgeom/ConversionSettings.h" +#include "../ifcgeom/element.h" +#include "../ifcgeom/conversion_settings.h" #include "../ifcgeom/abstract_mapping.h" #include "../ifcgeom/function_item_evaluator.h" -#include "AbstractKernel.h" +#include "abstract_kernel.h" using namespace ifcopenshell::geom; diff --git a/src/ifcgeom/AbstractKernel.h b/src/ifcgeom/abstract_kernel.h similarity index 99% rename from src/ifcgeom/AbstractKernel.h rename to src/ifcgeom/abstract_kernel.h index 9593e6b42b..2d2750af7a 100644 --- a/src/ifcgeom/AbstractKernel.h +++ b/src/ifcgeom/abstract_kernel.h @@ -23,9 +23,9 @@ #include "../ifcparse/macros.h" #include "../ifcparse/logger.h" #include "../ifcgeom/ifc_geom_api.h" -#include "../ifcgeom/IfcGeomRepresentation.h" +#include "../ifcgeom/representation.h" #include "../ifcgeom/taxonomy.h" -#include "../ifcgeom/ConversionSettings.h" +#include "../ifcgeom/conversion_settings.h" #include "../ifcgeom/abstract_mapping.h" #include diff --git a/src/ifcgeom/abstract_mapping.h b/src/ifcgeom/abstract_mapping.h index 1b1d6b2826..fb095630f2 100644 --- a/src/ifcgeom/abstract_mapping.h +++ b/src/ifcgeom/abstract_mapping.h @@ -22,7 +22,7 @@ #include "../ifcparse/express.h" #include "../ifcgeom/taxonomy.h" -#include "../ifcgeom/ConversionSettings.h" +#include "../ifcgeom/conversion_settings.h" #include "../plugin/plugin.h" #include diff --git a/src/ifcgeom/ConversionResult.cpp b/src/ifcgeom/conversion_result.cpp similarity index 93% rename from src/ifcgeom/ConversionResult.cpp rename to src/ifcgeom/conversion_result.cpp index 7817f14e38..d215d6fcd9 100644 --- a/src/ifcgeom/ConversionResult.cpp +++ b/src/ifcgeom/conversion_result.cpp @@ -1,5 +1,5 @@ -#include "ConversionResult.h" -#include "IfcGeomRepresentation.h" +#include "conversion_result.h" +#include "representation.h" ifcopenshell::geom::Representation::triangulation* ifcopenshell::geom::conversion_result_shape::Triangulate(const ifcopenshell::geom::settings& settings, ifcopenshell::logger& logger) const { diff --git a/src/ifcgeom/ConversionResult.h b/src/ifcgeom/conversion_result.h similarity index 99% rename from src/ifcgeom/ConversionResult.h rename to src/ifcgeom/conversion_result.h index 78c4776da6..44f8832529 100644 --- a/src/ifcgeom/ConversionResult.h +++ b/src/ifcgeom/conversion_result.h @@ -20,8 +20,8 @@ #ifndef CONVERSIONRESULT_H #define CONVERSIONRESULT_H -#include "../ifcgeom/IfcGeomRenderStyles.h" -#include "../ifcgeom/ConversionSettings.h" +#include "../ifcgeom/render_styles.h" +#include "../ifcgeom/conversion_settings.h" #include "../ifcgeom/taxonomy.h" #include diff --git a/src/ifcgeom/ConversionSettings.cpp b/src/ifcgeom/conversion_settings.cpp similarity index 98% rename from src/ifcgeom/ConversionSettings.cpp rename to src/ifcgeom/conversion_settings.cpp index 055183ffce..b2bc86dad9 100644 --- a/src/ifcgeom/ConversionSettings.cpp +++ b/src/ifcgeom/conversion_settings.cpp @@ -1,4 +1,4 @@ -#include "ConversionSettings.h" +#include "conversion_settings.h" template void istream_helper(std::istream& in, T& vs) { diff --git a/src/ifcgeom/ConversionSettings.h b/src/ifcgeom/conversion_settings.h similarity index 100% rename from src/ifcgeom/ConversionSettings.h rename to src/ifcgeom/conversion_settings.h diff --git a/src/ifcgeom/Converter.cpp b/src/ifcgeom/converter.cpp similarity index 99% rename from src/ifcgeom/Converter.cpp rename to src/ifcgeom/converter.cpp index 2099b0da10..7e546c484b 100644 --- a/src/ifcgeom/Converter.cpp +++ b/src/ifcgeom/converter.cpp @@ -1,6 +1,6 @@ -#include "Converter.h" +#include "converter.h" -#include "../ifcgeom/IfcGeomElement.h" +#include "../ifcgeom/element.h" using namespace ifcopenshell::geom; diff --git a/src/ifcgeom/Converter.h b/src/ifcgeom/converter.h similarity index 91% rename from src/ifcgeom/Converter.h rename to src/ifcgeom/converter.h index cccfea4d16..0776723a3c 100644 --- a/src/ifcgeom/Converter.h +++ b/src/ifcgeom/converter.h @@ -2,12 +2,12 @@ #define ITERATOR_KERNEL_H #include "../ifcparse/file.h" -#include "../ifcgeom/ConversionSettings.h" -#include "../ifcgeom/ConversionResult.h" +#include "../ifcgeom/conversion_settings.h" +#include "../ifcgeom/conversion_result.h" #include "../ifcgeom/abstract_mapping.h" -#include "../ifcgeom/ConversionSettings.h" -#include "../ifcgeom/AbstractKernel.h" -#include "../ifcgeom/IfcGeomElement.h" +#include "../ifcgeom/conversion_settings.h" +#include "../ifcgeom/abstract_kernel.h" +#include "../ifcgeom/element.h" #include diff --git a/src/ifcgeom/IfcGeomElement.h b/src/ifcgeom/element.h similarity index 99% rename from src/ifcgeom/IfcGeomElement.h rename to src/ifcgeom/element.h index 00ad7b2d15..2839fd8783 100644 --- a/src/ifcgeom/IfcGeomElement.h +++ b/src/ifcgeom/element.h @@ -28,7 +28,7 @@ #include "../ifcparse/logger.h" #include "../ifcparse/instance_data.h" -#include "../ifcgeom/IfcGeomRepresentation.h" +#include "../ifcgeom/representation.h" #include "../ifcgeom/ifc_geom_api.h" namespace ifcopenshell::geom { diff --git a/src/ifcgeom/IfcGeomFilter.h b/src/ifcgeom/filter.h similarity index 99% rename from src/ifcgeom/IfcGeomFilter.h rename to src/ifcgeom/filter.h index 881f341e6f..e3fa34f52a 100644 --- a/src/ifcgeom/IfcGeomFilter.h +++ b/src/ifcgeom/filter.h @@ -17,7 +17,7 @@ * * ********************************************************************************/ -/** @file IfcGeomFilter.h +/** @file filter.h @brief A set of predefined product filters for ifcopenshell::geom::iterator */ #ifndef IFCGEOMFILTER_H @@ -28,7 +28,7 @@ #define BOOST_REGEX_NO_W32 #endif -#include "../ifcgeom/AbstractKernel.h" +#include "../ifcgeom/abstract_kernel.h" #include "../ifcparse/file.h" #include "../ifcgeom/abstract_mapping.h" diff --git a/src/ifcgeom/GeometrySerializer.h b/src/ifcgeom/geometry_serializer.h similarity index 98% rename from src/ifcgeom/GeometrySerializer.h rename to src/ifcgeom/geometry_serializer.h index 67f7949154..0be43e55d0 100644 --- a/src/ifcgeom/GeometrySerializer.h +++ b/src/ifcgeom/geometry_serializer.h @@ -20,8 +20,8 @@ #ifndef GEOMETRYSERIALIZER_H #define GEOMETRYSERIALIZER_H -#include "../ifcgeom/Serializer.h" -#include "../ifcgeom/IfcGeomElement.h" +#include "../ifcgeom/serializer.h" +#include "../ifcgeom/element.h" #include "../ifcparse/logger.h" #include diff --git a/src/ifcgeom/hybrid_kernel.h b/src/ifcgeom/hybrid_kernel.h index f62ec57c6a..b3e7f89d9b 100644 --- a/src/ifcgeom/hybrid_kernel.h +++ b/src/ifcgeom/hybrid_kernel.h @@ -20,7 +20,7 @@ #ifndef HYBRID_KERNEL_H #define HYBRID_KERNEL_H -#include "AbstractKernel.h" +#include "abstract_kernel.h" #include "kernel_registry.h" namespace ifcopenshell { diff --git a/src/ifcgeom/infra_sweep_helper.h b/src/ifcgeom/infra_sweep_helper.h index c449868b06..0bdecd54b3 100644 --- a/src/ifcgeom/infra_sweep_helper.h +++ b/src/ifcgeom/infra_sweep_helper.h @@ -2,7 +2,7 @@ #define LINEAR_SWEEP_HELPER_H #include "taxonomy.h" -#include "ConversionSettings.h" +#include "conversion_settings.h" #include "ifc_geom_api.h" diff --git a/src/ifcgeom/Iterator.cpp b/src/ifcgeom/iterator.cpp similarity index 99% rename from src/ifcgeom/Iterator.cpp rename to src/ifcgeom/iterator.cpp index bcfdd20046..e4569c97a4 100644 --- a/src/ifcgeom/Iterator.cpp +++ b/src/ifcgeom/iterator.cpp @@ -1,4 +1,4 @@ -#include "Iterator.h" +#include "iterator.h" /** * Initialize iterator's list of tasks. diff --git a/src/ifcgeom/Iterator.h b/src/ifcgeom/iterator.h similarity index 98% rename from src/ifcgeom/Iterator.h rename to src/ifcgeom/iterator.h index 742f32f779..a5932a5684 100644 --- a/src/ifcgeom/Iterator.h +++ b/src/ifcgeom/iterator.h @@ -60,11 +60,11 @@ #include "../ifcparse/file.h" -#include "../ifcgeom/IfcGeomElement.h" -#include "../ifcgeom/ConversionResult.h" -#include "../ifcgeom/IfcGeomFilter.h" +#include "../ifcgeom/element.h" +#include "../ifcgeom/conversion_result.h" +#include "../ifcgeom/filter.h" #include "../ifcgeom/taxonomy.h" -#include "../ifcgeom/Converter.h" +#include "../ifcgeom/converter.h" #include "../ifcgeom/abstract_mapping.h" #include diff --git a/src/ifcgeom/kernel_registry.h b/src/ifcgeom/kernel_registry.h index bdc5265e98..fc1aed374a 100644 --- a/src/ifcgeom/kernel_registry.h +++ b/src/ifcgeom/kernel_registry.h @@ -20,7 +20,7 @@ #ifndef KERNEL_REGISTRY_H #define KERNEL_REGISTRY_H -#include "../ifcgeom/AbstractKernel.h" +#include "../ifcgeom/abstract_kernel.h" #include "../plugin/plugin.h" #include diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp b/src/ifcgeom/kernels/cgal/cgal_conversion_result.cpp similarity index 99% rename from src/ifcgeom/kernels/cgal/CgalConversionResult.cpp rename to src/ifcgeom/kernels/cgal/cgal_conversion_result.cpp index be8219dc7d..1029f0baa8 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionResult.cpp +++ b/src/ifcgeom/kernels/cgal/cgal_conversion_result.cpp @@ -1,5 +1,5 @@ -#include "CgalConversionResult.h" -#include "CgalKernel.h" +#include "cgal_conversion_result.h" +#include "cgal_kernel.h" #include #include @@ -7,7 +7,7 @@ #include #include "../../../ifcparse/logger.h" -#include "../../../ifcgeom/IfcGeomRepresentation.h" +#include "../../../ifcgeom/representation.h" using ifcopenshell::geom::opaque_number; using ifcopenshell::geom::opaque_coordinate; diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.h b/src/ifcgeom/kernels/cgal/cgal_conversion_result.h similarity index 99% rename from src/ifcgeom/kernels/cgal/CgalConversionResult.h rename to src/ifcgeom/kernels/cgal/cgal_conversion_result.h index dab7377ac8..37bdc8b60e 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionResult.h +++ b/src/ifcgeom/kernels/cgal/cgal_conversion_result.h @@ -22,7 +22,7 @@ #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" -#include "../../../ifcgeom/IfcGeomElement.h" +#include "../../../ifcgeom/element.h" #undef Handle @@ -88,7 +88,7 @@ typedef CGAL::Polyhedron_3 cgal_shape_t; typedef boost::graph_traits>::vertex_descriptor cgal_vertex_descriptor_t; typedef boost::graph_traits>::face_descriptor cgal_face_descriptor_t; -#include "../../../ifcgeom/ConversionResult.h" +#include "../../../ifcgeom/conversion_result.h" namespace ifcopenshell { namespace geom { diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.cpp b/src/ifcgeom/kernels/cgal/cgal_kernel.cpp similarity index 99% rename from src/ifcgeom/kernels/cgal/CgalKernel.cpp rename to src/ifcgeom/kernels/cgal/cgal_kernel.cpp index 00219e855a..402558ee66 100644 --- a/src/ifcgeom/kernels/cgal/CgalKernel.cpp +++ b/src/ifcgeom/kernels/cgal/cgal_kernel.cpp @@ -19,10 +19,10 @@ #define _USE_MATH_DEFINES #include -#include "CgalKernel.h" +#include "cgal_kernel.h" #include "../../../ifcparse/logger.h" -#include "../../../ifcgeom/kernels/cgal/CgalConversionResult.h" +#include "../../../ifcgeom/kernels/cgal/cgal_conversion_result.h" #ifdef IFOPSH_SIMPLE_KERNEL #define cgal_shape SimpleCgalShape diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.h b/src/ifcgeom/kernels/cgal/cgal_kernel.h similarity index 97% rename from src/ifcgeom/kernels/cgal/CgalKernel.h rename to src/ifcgeom/kernels/cgal/cgal_kernel.h index b4b092b3aa..a1ea2bf1df 100644 --- a/src/ifcgeom/kernels/cgal/CgalKernel.h +++ b/src/ifcgeom/kernels/cgal/cgal_kernel.h @@ -45,10 +45,10 @@ if ( it != cache.T.end() ) { e = it->second; return true; } #include "../../../ifcparse/macros.h" -#include "../../../ifcgeom/AbstractKernel.h" +#include "../../../ifcgeom/abstract_kernel.h" -#include "../../../ifcgeom/IfcGeomElement.h" -#include "../../../ifcgeom/kernels/cgal/CgalConversionResult.h" +#include "../../../ifcgeom/element.h" +#include "../../../ifcgeom/kernels/cgal/cgal_conversion_result.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" #include diff --git a/src/ifcgeom/kernels/cgal/plugin.cpp b/src/ifcgeom/kernels/cgal/plugin.cpp index 2c69052ce7..b1a0273ddb 100644 --- a/src/ifcgeom/kernels/cgal/plugin.cpp +++ b/src/ifcgeom/kernels/cgal/plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "../../kernel_plugin.h" -#include "CgalKernel.h" +#include "cgal_kernel.h" #include diff --git a/src/ifcgeom/kernels/manifold/ManifoldConversionResult.cpp b/src/ifcgeom/kernels/manifold/manifold_conversion_result.cpp similarity index 99% rename from src/ifcgeom/kernels/manifold/ManifoldConversionResult.cpp rename to src/ifcgeom/kernels/manifold/manifold_conversion_result.cpp index 67053ded76..37c75f642e 100644 --- a/src/ifcgeom/kernels/manifold/ManifoldConversionResult.cpp +++ b/src/ifcgeom/kernels/manifold/manifold_conversion_result.cpp @@ -1,6 +1,6 @@ -#include "ManifoldConversionResult.h" +#include "manifold_conversion_result.h" -#include "../../../ifcgeom/IfcGeomRepresentation.h" +#include "../../../ifcgeom/representation.h" #include diff --git a/src/ifcgeom/kernels/manifold/ManifoldConversionResult.h b/src/ifcgeom/kernels/manifold/manifold_conversion_result.h similarity index 98% rename from src/ifcgeom/kernels/manifold/ManifoldConversionResult.h rename to src/ifcgeom/kernels/manifold/manifold_conversion_result.h index b51a8562f1..5e6ab07af3 100644 --- a/src/ifcgeom/kernels/manifold/ManifoldConversionResult.h +++ b/src/ifcgeom/kernels/manifold/manifold_conversion_result.h @@ -3,7 +3,7 @@ #include -#include "../../../ifcgeom/ConversionResult.h" +#include "../../../ifcgeom/conversion_result.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" #include diff --git a/src/ifcgeom/kernels/manifold/ManifoldKernel.cpp b/src/ifcgeom/kernels/manifold/manifold_kernel.cpp similarity index 99% rename from src/ifcgeom/kernels/manifold/ManifoldKernel.cpp rename to src/ifcgeom/kernels/manifold/manifold_kernel.cpp index b0e064daa8..f3802ad925 100644 --- a/src/ifcgeom/kernels/manifold/ManifoldKernel.cpp +++ b/src/ifcgeom/kernels/manifold/manifold_kernel.cpp @@ -1,4 +1,4 @@ -#include "ManifoldKernel.h" +#include "manifold_kernel.h" #include "../../../ifcparse/logger.h" diff --git a/src/ifcgeom/kernels/manifold/ManifoldKernel.h b/src/ifcgeom/kernels/manifold/manifold_kernel.h similarity index 92% rename from src/ifcgeom/kernels/manifold/ManifoldKernel.h rename to src/ifcgeom/kernels/manifold/manifold_kernel.h index e060c1d583..1e17e6870d 100644 --- a/src/ifcgeom/kernels/manifold/ManifoldKernel.h +++ b/src/ifcgeom/kernels/manifold/manifold_kernel.h @@ -3,9 +3,9 @@ #include -#include "../../../ifcgeom/AbstractKernel.h" +#include "../../../ifcgeom/abstract_kernel.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" -#include "../../../ifcgeom/kernels/manifold/ManifoldConversionResult.h" +#include "../../../ifcgeom/kernels/manifold/manifold_conversion_result.h" namespace ifcopenshell { namespace geom { diff --git a/src/ifcgeom/kernels/manifold/plugin.cpp b/src/ifcgeom/kernels/manifold/plugin.cpp index 7bb73ee2da..9bda410341 100644 --- a/src/ifcgeom/kernels/manifold/plugin.cpp +++ b/src/ifcgeom/kernels/manifold/plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "../../kernel_plugin.h" -#include "ManifoldKernel.h" +#include "manifold_kernel.h" #include diff --git a/src/ifcgeom/kernels/opencascade/base_utils.cpp b/src/ifcgeom/kernels/opencascade/base_utils.cpp index 7049b5abc5..f86415aa3e 100644 --- a/src/ifcgeom/kernels/opencascade/base_utils.cpp +++ b/src/ifcgeom/kernels/opencascade/base_utils.cpp @@ -1,7 +1,7 @@ #include "base_utils.h" #include "../../../ifcparse/logger.h" -#include "OpenCascadeConversionResult.h" +#include "opencascade_conversion_result.h" #include "boolean_utils.h" #include diff --git a/src/ifcgeom/kernels/opencascade/base_utils.h b/src/ifcgeom/kernels/opencascade/base_utils.h index 0b24b10fc0..47a8fa9732 100644 --- a/src/ifcgeom/kernels/opencascade/base_utils.h +++ b/src/ifcgeom/kernels/opencascade/base_utils.h @@ -1,7 +1,7 @@ #ifndef BASE_UTILS_H #define BASE_UTILS_H -#include "../../../ifcgeom/ConversionResult.h" +#include "../../../ifcgeom/conversion_result.h" #include "../ifc_geomlibrary_api.h" #include diff --git a/src/ifcgeom/kernels/opencascade/boolean_result.cpp b/src/ifcgeom/kernels/opencascade/boolean_result.cpp index dcd5bd3e0c..c2e7ca8702 100644 --- a/src/ifcgeom/kernels/opencascade/boolean_result.cpp +++ b/src/ifcgeom/kernels/opencascade/boolean_result.cpp @@ -1,4 +1,4 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "boolean_utils.h" #include "base_utils.h" diff --git a/src/ifcgeom/kernels/opencascade/boolean_utils.cpp b/src/ifcgeom/kernels/opencascade/boolean_utils.cpp index 6ee6b835e0..9e28fea2fa 100644 --- a/src/ifcgeom/kernels/opencascade/boolean_utils.cpp +++ b/src/ifcgeom/kernels/opencascade/boolean_utils.cpp @@ -1,6 +1,6 @@ #include "boolean_utils.h" -#include "IfcGeomTree.h" +#include "tree.h" #include "base_utils.h" #include diff --git a/src/ifcgeom/kernels/opencascade/bspline_surface.cpp b/src/ifcgeom/kernels/opencascade/bspline_surface.cpp index 01e34eae80..58442be078 100644 --- a/src/ifcgeom/kernels/opencascade/bspline_surface.cpp +++ b/src/ifcgeom/kernels/opencascade/bspline_surface.cpp @@ -1,4 +1,4 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include diff --git a/src/ifcgeom/kernels/opencascade/extrusion.cpp b/src/ifcgeom/kernels/opencascade/extrusion.cpp index 17ef47157e..1978b9b8f1 100644 --- a/src/ifcgeom/kernels/opencascade/extrusion.cpp +++ b/src/ifcgeom/kernels/opencascade/extrusion.cpp @@ -1,4 +1,4 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include diff --git a/src/ifcgeom/kernels/opencascade/face.cpp b/src/ifcgeom/kernels/opencascade/face.cpp index 1212930121..61afbaf4cd 100644 --- a/src/ifcgeom/kernels/opencascade/face.cpp +++ b/src/ifcgeom/kernels/opencascade/face.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ #include #endif -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "face_definition.h" #include "wire_utils.h" #include "base_utils.h" diff --git a/src/ifcgeom/kernels/opencascade/face_definition.cpp b/src/ifcgeom/kernels/opencascade/face_definition.cpp index 2a42486334..8fcc2d8c8e 100644 --- a/src/ifcgeom/kernels/opencascade/face_definition.cpp +++ b/src/ifcgeom/kernels/opencascade/face_definition.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include /* Returns whether wire conforms to a polyhedron, i.e. only edges with linear curves*/ bool ifcopenshell::geom::util::is_polyhedron(const TopoDS_Wire & wire) { diff --git a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp index 098aa5d84d..29a0218fb4 100644 --- a/src/ifcgeom/kernels/opencascade/faceset_helper.cpp +++ b/src/ifcgeom/kernels/opencascade/faceset_helper.cpp @@ -1,6 +1,6 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" -#include "IfcGeomTree.h" +#include "tree.h" #include "wire_utils.h" namespace { diff --git a/src/ifcgeom/kernels/opencascade/layerset.cpp b/src/ifcgeom/kernels/opencascade/layerset.cpp index 52d48d1eee..98ab95008d 100644 --- a/src/ifcgeom/kernels/opencascade/layerset.cpp +++ b/src/ifcgeom/kernels/opencascade/layerset.cpp @@ -1,5 +1,5 @@ #include "layerset.h" -#include "OpenCascadeConversionResult.h" +#include "opencascade_conversion_result.h" #include "base_utils.h" #include "boolean_utils.h" @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ifcgeom/kernels/opencascade/layerset.h b/src/ifcgeom/kernels/opencascade/layerset.h index 9b581a5f9a..cd4af8439a 100644 --- a/src/ifcgeom/kernels/opencascade/layerset.h +++ b/src/ifcgeom/kernels/opencascade/layerset.h @@ -1,7 +1,7 @@ #ifndef LAYERSET_H #define LAYERSET_H -#include "../../ConversionResult.h" +#include "../../conversion_result.h" #include #include diff --git a/src/ifcgeom/kernels/opencascade/loft.cpp b/src/ifcgeom/kernels/opencascade/loft.cpp index 4880e0ef09..9c41023fda 100644 --- a/src/ifcgeom/kernels/opencascade/loft.cpp +++ b/src/ifcgeom/kernels/opencascade/loft.cpp @@ -17,7 +17,7 @@ * * ********************************************************************************/ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "base_utils.h" #include diff --git a/src/ifcgeom/kernels/opencascade/loop.cpp b/src/ifcgeom/kernels/opencascade/loop.cpp index 2732efceb2..e1b8ca93ad 100644 --- a/src/ifcgeom/kernels/opencascade/loop.cpp +++ b/src/ifcgeom/kernels/opencascade/loop.cpp @@ -1,4 +1,4 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "wire_builder.h" #include diff --git a/src/ifcgeom/kernels/opencascade/matrix4.cpp b/src/ifcgeom/kernels/opencascade/matrix4.cpp index 89d9be3e05..b2a630ce68 100644 --- a/src/ifcgeom/kernels/opencascade/matrix4.cpp +++ b/src/ifcgeom/kernels/opencascade/matrix4.cpp @@ -1,4 +1,4 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" using namespace ifcopenshell::geom; using namespace ifcopenshell::geom::kernels; diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.cpp b/src/ifcgeom/kernels/opencascade/opencascade_conversion_result.cpp similarity index 99% rename from src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.cpp rename to src/ifcgeom/kernels/opencascade/opencascade_conversion_result.cpp index 2fbee1f77c..8402456a96 100644 --- a/src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.cpp +++ b/src/ifcgeom/kernels/opencascade/opencascade_conversion_result.cpp @@ -10,10 +10,10 @@ #include #include -#include "OpenCascadeConversionResult.h" +#include "opencascade_conversion_result.h" #include "../../../ifcparse/logger.h" -#include "../../../ifcgeom/IfcGeomRepresentation.h" +#include "../../../ifcgeom/representation.h" #include "base_utils.h" #include "boolean_utils.h" diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h b/src/ifcgeom/kernels/opencascade/opencascade_conversion_result.h similarity index 99% rename from src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h rename to src/ifcgeom/kernels/opencascade/opencascade_conversion_result.h index c2a7158d06..8e60189e4d 100644 --- a/src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h +++ b/src/ifcgeom/kernels/opencascade/opencascade_conversion_result.h @@ -31,7 +31,7 @@ #include #include -#include "../../../ifcgeom/ConversionResult.h" +#include "../../../ifcgeom/conversion_result.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" namespace ifcopenshell { diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp b/src/ifcgeom/kernels/opencascade/opencascade_kernel.cpp similarity index 99% rename from src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp rename to src/ifcgeom/kernels/opencascade/opencascade_kernel.cpp index cf3aaf82dd..f773bea85d 100644 --- a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.cpp +++ b/src/ifcgeom/kernels/opencascade/opencascade_kernel.cpp @@ -23,7 +23,7 @@ * * ********************************************************************************/ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "boolean_utils.h" #include "base_utils.h" diff --git a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h b/src/ifcgeom/kernels/opencascade/opencascade_kernel.h similarity index 96% rename from src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h rename to src/ifcgeom/kernels/opencascade/opencascade_kernel.h index ce6e88b0b4..feb9bf69b1 100644 --- a/src/ifcgeom/kernels/opencascade/OpenCascadeKernel.h +++ b/src/ifcgeom/kernels/opencascade/opencascade_kernel.h @@ -41,18 +41,18 @@ #include #include -#include "../../../ifcgeom/AbstractKernel.h" +#include "../../../ifcgeom/abstract_kernel.h" -#include "../../../ifcgeom/IfcGeomElement.h" -#include "../../../ifcgeom/IfcGeomRepresentation.h" -#include "../../../ifcgeom/ConversionResult.h" +#include "../../../ifcgeom/element.h" +#include "../../../ifcgeom/representation.h" +#include "../../../ifcgeom/conversion_result.h" -#include "../../../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../../../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" #include "../../../ifcgeom/taxonomy.h" -#include "../../../ifcgeom/ConversionSettings.h" +#include "../../../ifcgeom/conversion_settings.h" namespace { template diff --git a/src/ifcgeom/kernels/opencascade/plugin.cpp b/src/ifcgeom/kernels/opencascade/plugin.cpp index b41171a0f3..903a225482 100644 --- a/src/ifcgeom/kernels/opencascade/plugin.cpp +++ b/src/ifcgeom/kernels/opencascade/plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "../../kernel_plugin.h" -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include diff --git a/src/ifcgeom/kernels/opencascade/shell.cpp b/src/ifcgeom/kernels/opencascade/shell.cpp index bfb7f950f1..525cc8b4e4 100644 --- a/src/ifcgeom/kernels/opencascade/shell.cpp +++ b/src/ifcgeom/kernels/opencascade/shell.cpp @@ -1,4 +1,4 @@ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "base_utils.h" diff --git a/src/ifcgeom/kernels/opencascade/solid.cpp b/src/ifcgeom/kernels/opencascade/solid.cpp index 22bca85edc..e51fd98acd 100644 --- a/src/ifcgeom/kernels/opencascade/solid.cpp +++ b/src/ifcgeom/kernels/opencascade/solid.cpp @@ -17,7 +17,7 @@ * * ********************************************************************************/ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include #include diff --git a/src/ifcgeom/kernels/opencascade/sweep_along_curve.cpp b/src/ifcgeom/kernels/opencascade/sweep_along_curve.cpp index 0a40539df2..359abe1488 100644 --- a/src/ifcgeom/kernels/opencascade/sweep_along_curve.cpp +++ b/src/ifcgeom/kernels/opencascade/sweep_along_curve.cpp @@ -17,7 +17,7 @@ * * ********************************************************************************/ -#include "OpenCascadeKernel.h" +#include "opencascade_kernel.h" #include "base_utils.h" #include "wire_utils.h" diff --git a/src/ifcgeom/kernels/opencascade/IfcGeomTree.h b/src/ifcgeom/kernels/opencascade/tree.h similarity index 99% rename from src/ifcgeom/kernels/opencascade/IfcGeomTree.h rename to src/ifcgeom/kernels/opencascade/tree.h index d2594f2077..d25e51e62e 100644 --- a/src/ifcgeom/kernels/opencascade/IfcGeomTree.h +++ b/src/ifcgeom/kernels/opencascade/tree.h @@ -22,11 +22,11 @@ #include "../../../ifcparse/file.h" -#include "../../../ifcgeom/IfcGeomElement.h" -#include "../../../ifcgeom/Iterator.h" +#include "../../../ifcgeom/element.h" +#include "../../../ifcgeom/iterator.h" #include "../../../ifcgeom/tree.h" -#include "OpenCascadeConversionResult.h" -#include "OpenCascadeKernel.h" +#include "opencascade_conversion_result.h" +#include "opencascade_kernel.h" #include "base_utils.h" #include diff --git a/src/ifcgeom/kernels/opencascade/tree_backends.h b/src/ifcgeom/kernels/opencascade/tree_backends.h index 3bc2a546a6..c75ee3ecc1 100644 --- a/src/ifcgeom/kernels/opencascade/tree_backends.h +++ b/src/ifcgeom/kernels/opencascade/tree_backends.h @@ -23,7 +23,7 @@ #include "../../kernel_registry.h" #include "../../tree_registry.h" #include "../../../ifcparse/exception.h" -#include "IfcGeomTree.h" +#include "tree.h" namespace ifcopenshell { namespace geom { diff --git a/src/ifcgeom/kernels/opencascade/wire_builder.cpp b/src/ifcgeom/kernels/opencascade/wire_builder.cpp index a9c53d8ea9..562cd8225d 100644 --- a/src/ifcgeom/kernels/opencascade/wire_builder.cpp +++ b/src/ifcgeom/kernels/opencascade/wire_builder.cpp @@ -1,7 +1,7 @@ #include "wire_builder.h" #include "../../../ifcparse/logger.h" -#include "../../../ifcgeom/ConversionSettings.h" +#include "../../../ifcgeom/conversion_settings.h" #include #include diff --git a/src/ifcgeom/kernels/opencascade/wire_utils.cpp b/src/ifcgeom/kernels/opencascade/wire_utils.cpp index 3c8fb1eb0b..4321229075 100644 --- a/src/ifcgeom/kernels/opencascade/wire_utils.cpp +++ b/src/ifcgeom/kernels/opencascade/wire_utils.cpp @@ -1,15 +1,15 @@ #include "wire_utils.h" #include "../../../ifcparse/logger.h" -#include "../../../ifcgeom/ConversionSettings.h" +#include "../../../ifcgeom/conversion_settings.h" #include "base_utils.h" #include "boolean_utils.h" -#include "IfcGeomTree.h" +#include "tree.h" #include #include -#include +#include #include #include #include diff --git a/src/ifcgeom/kernels/passthrough/PassthroughConversionResult.cpp b/src/ifcgeom/kernels/passthrough/passthrough_conversion_result.cpp similarity index 99% rename from src/ifcgeom/kernels/passthrough/PassthroughConversionResult.cpp rename to src/ifcgeom/kernels/passthrough/passthrough_conversion_result.cpp index 02ef66f535..1e3e3efd45 100644 --- a/src/ifcgeom/kernels/passthrough/PassthroughConversionResult.cpp +++ b/src/ifcgeom/kernels/passthrough/passthrough_conversion_result.cpp @@ -1,6 +1,6 @@ -#include "PassthroughConversionResult.h" +#include "passthrough_conversion_result.h" -#include "../../../ifcgeom/IfcGeomRepresentation.h" +#include "../../../ifcgeom/representation.h" #include diff --git a/src/ifcgeom/kernels/passthrough/PassthroughConversionResult.h b/src/ifcgeom/kernels/passthrough/passthrough_conversion_result.h similarity index 98% rename from src/ifcgeom/kernels/passthrough/PassthroughConversionResult.h rename to src/ifcgeom/kernels/passthrough/passthrough_conversion_result.h index 02157abefd..37044b9fe9 100644 --- a/src/ifcgeom/kernels/passthrough/PassthroughConversionResult.h +++ b/src/ifcgeom/kernels/passthrough/passthrough_conversion_result.h @@ -1,7 +1,7 @@ #ifndef IFCGEOMPASSTHROUGHREPRESENTATION_H #define IFCGEOMPASSTHROUGHREPRESENTATION_H -#include "../../../ifcgeom/ConversionResult.h" +#include "../../../ifcgeom/conversion_result.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" namespace ifcopenshell { diff --git a/src/ifcgeom/kernels/passthrough/PassthroughKernel.cpp b/src/ifcgeom/kernels/passthrough/passthrough_kernel.cpp similarity index 99% rename from src/ifcgeom/kernels/passthrough/PassthroughKernel.cpp rename to src/ifcgeom/kernels/passthrough/passthrough_kernel.cpp index da0081054a..e5a18bf1cd 100644 --- a/src/ifcgeom/kernels/passthrough/PassthroughKernel.cpp +++ b/src/ifcgeom/kernels/passthrough/passthrough_kernel.cpp @@ -1,4 +1,4 @@ -#include "PassthroughKernel.h" +#include "passthrough_kernel.h" #include diff --git a/src/ifcgeom/kernels/passthrough/PassthroughKernel.h b/src/ifcgeom/kernels/passthrough/passthrough_kernel.h similarity index 90% rename from src/ifcgeom/kernels/passthrough/PassthroughKernel.h rename to src/ifcgeom/kernels/passthrough/passthrough_kernel.h index c1351ea1ed..df0a3bb3b4 100644 --- a/src/ifcgeom/kernels/passthrough/PassthroughKernel.h +++ b/src/ifcgeom/kernels/passthrough/passthrough_kernel.h @@ -1,9 +1,9 @@ #ifndef PASSTHROUGH_KERNEL_H #define PASSTHROUGH_KERNEL_H -#include "../../../ifcgeom/AbstractKernel.h" +#include "../../../ifcgeom/abstract_kernel.h" #include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h" -#include "../../../ifcgeom/kernels/passthrough/PassthroughConversionResult.h" +#include "../../../ifcgeom/kernels/passthrough/passthrough_conversion_result.h" namespace ifcopenshell { namespace geom { diff --git a/src/ifcgeom/kernels/passthrough/plugin.cpp b/src/ifcgeom/kernels/passthrough/plugin.cpp index ce51624cb3..17e08ac4bf 100644 --- a/src/ifcgeom/kernels/passthrough/plugin.cpp +++ b/src/ifcgeom/kernels/passthrough/plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "../../kernel_plugin.h" -#include "PassthroughKernel.h" +#include "passthrough_kernel.h" #include diff --git a/src/ifcgeom/IfcGeomRenderStyles.h b/src/ifcgeom/render_styles.h similarity index 100% rename from src/ifcgeom/IfcGeomRenderStyles.h rename to src/ifcgeom/render_styles.h diff --git a/src/ifcgeom/IfcGeomRepresentation.cpp b/src/ifcgeom/representation.cpp similarity index 99% rename from src/ifcgeom/IfcGeomRepresentation.cpp rename to src/ifcgeom/representation.cpp index a2dfa5d572..d6a6b4ef31 100644 --- a/src/ifcgeom/IfcGeomRepresentation.cpp +++ b/src/ifcgeom/representation.cpp @@ -17,7 +17,7 @@ * * ********************************************************************************/ -#include "IfcGeomRepresentation.h" +#include "representation.h" ifcopenshell::geom::Representation::serialization::serialization(const brep& brep) : representation(brep.settings(), brep.entity(), brep.id()) diff --git a/src/ifcgeom/IfcGeomRepresentation.h b/src/ifcgeom/representation.h similarity index 99% rename from src/ifcgeom/IfcGeomRepresentation.h rename to src/ifcgeom/representation.h index 706ae1fd39..4f4a038b7c 100644 --- a/src/ifcgeom/IfcGeomRepresentation.h +++ b/src/ifcgeom/representation.h @@ -20,8 +20,8 @@ #ifndef IFCGEOMREPRESENTATION_H #define IFCGEOMREPRESENTATION_H -#include "../ifcgeom/ConversionSettings.h" -#include "../ifcgeom/ConversionResult.h" +#include "../ifcgeom/conversion_settings.h" +#include "../ifcgeom/conversion_result.h" #include diff --git a/src/ifcgeom/Serialization/CMakeLists.txt b/src/ifcgeom/serialization/CMakeLists.txt similarity index 89% rename from src/ifcgeom/Serialization/CMakeLists.txt rename to src/ifcgeom/serialization/CMakeLists.txt index 6e233a4077..b823b2a167 100644 --- a/src/ifcgeom/Serialization/CMakeLists.txt +++ b/src/ifcgeom/serialization/CMakeLists.txt @@ -2,7 +2,7 @@ set(geometry_serialization_plugin_runtime_dir "${CMAKE_CURRENT_BINARY_DIR}/$ $ @@ -20,8 +20,8 @@ target_link_libraries(geometry_serializer plugin IfcGeom IfcParse geometry_kerne set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} "geometry_serializer") set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} PARENT_SCOPE) -install(FILES Serialization.h - DESTINATION ${INCLUDEDIR}/ifcgeom/Serialization +install(FILES serialization.h + DESTINATION ${INCLUDEDIR}/ifcgeom/serialization ) install( diff --git a/src/ifcgeom/Serialization/ifc_geomserialization_api.h b/src/ifcgeom/serialization/ifc_geomserialization_api.h similarity index 100% rename from src/ifcgeom/Serialization/ifc_geomserialization_api.h rename to src/ifcgeom/serialization/ifc_geomserialization_api.h diff --git a/src/ifcgeom/Serialization/opencascade_geometry_ifc_writer_plugin.cpp b/src/ifcgeom/serialization/opencascade_geometry_ifc_writer_plugin.cpp similarity index 100% rename from src/ifcgeom/Serialization/opencascade_geometry_ifc_writer_plugin.cpp rename to src/ifcgeom/serialization/opencascade_geometry_ifc_writer_plugin.cpp diff --git a/src/ifcgeom/Serialization/opencascade_geometry_ifc_writer_plugin.h b/src/ifcgeom/serialization/opencascade_geometry_ifc_writer_plugin.h similarity index 98% rename from src/ifcgeom/Serialization/opencascade_geometry_ifc_writer_plugin.h rename to src/ifcgeom/serialization/opencascade_geometry_ifc_writer_plugin.h index 76f81f4dbe..470b956a54 100644 --- a/src/ifcgeom/Serialization/opencascade_geometry_ifc_writer_plugin.h +++ b/src/ifcgeom/serialization/opencascade_geometry_ifc_writer_plugin.h @@ -20,7 +20,7 @@ #ifndef IFCOPENSHELL_OPENCASCADE_GEOMETRY_IFC_WRITER_PLUGIN_H #define IFCOPENSHELL_OPENCASCADE_GEOMETRY_IFC_WRITER_PLUGIN_H -#include "Serialization.h" +#include "serialization.h" #include diff --git a/src/ifcgeom/Serialization/schema/CMakeLists.txt b/src/ifcgeom/serialization/schema/CMakeLists.txt similarity index 93% rename from src/ifcgeom/Serialization/schema/CMakeLists.txt rename to src/ifcgeom/serialization/schema/CMakeLists.txt index a85568ce8f..02d04f7f05 100644 --- a/src/ifcgeom/Serialization/schema/CMakeLists.txt +++ b/src/ifcgeom/serialization/schema/CMakeLists.txt @@ -1,7 +1,7 @@ if (NOT WASM_BUILD) foreach(schema ${SCHEMA_VERSIONS}) - add_library(geometry_serializer_ifc${schema} SHARED Serialization.cpp plugin.cpp) + add_library(geometry_serializer_ifc${schema} SHARED serialization.cpp plugin.cpp) target_link_libraries(geometry_serializer_ifc${schema} PRIVATE plugin geometry_serializer IfcGeom IfcParse parse_schema_ifc${schema} ${OpenCASCADE_LIBRARIES}) set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIfcSchema=Ifc${schema}" diff --git a/src/ifcgeom/Serialization/schema/plugin.cpp b/src/ifcgeom/serialization/schema/plugin.cpp similarity index 97% rename from src/ifcgeom/Serialization/schema/plugin.cpp rename to src/ifcgeom/serialization/schema/plugin.cpp index 1769d29514..2734b87d5c 100644 --- a/src/ifcgeom/Serialization/schema/plugin.cpp +++ b/src/ifcgeom/serialization/schema/plugin.cpp @@ -19,7 +19,7 @@ #include "../opencascade_geometry_ifc_writer_plugin.h" -#include "../../../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../../../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include "../../../ifcparse/exception.h" #include "../../../ifcparse/macros.h" diff --git a/src/ifcgeom/Serialization/schema/Serialization.cpp b/src/ifcgeom/serialization/schema/serialization.cpp similarity index 100% rename from src/ifcgeom/Serialization/schema/Serialization.cpp rename to src/ifcgeom/serialization/schema/serialization.cpp diff --git a/src/ifcgeom/Serialization/Serialization.cpp b/src/ifcgeom/serialization/serialization.cpp similarity index 96% rename from src/ifcgeom/Serialization/Serialization.cpp rename to src/ifcgeom/serialization/serialization.cpp index 7ffeb9a615..2fd66af1a8 100644 --- a/src/ifcgeom/Serialization/Serialization.cpp +++ b/src/ifcgeom/serialization/serialization.cpp @@ -1,7 +1,7 @@ -#include "Serialization.h" +#include "serialization.h" #include "opencascade_geometry_ifc_writer_plugin.h" -#include "../../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include "../../ifcparse/file.h" #include diff --git a/src/ifcgeom/Serialization/Serialization.h b/src/ifcgeom/serialization/serialization.h similarity index 97% rename from src/ifcgeom/Serialization/Serialization.h rename to src/ifcgeom/serialization/serialization.h index d87fa71280..68b30c053b 100644 --- a/src/ifcgeom/Serialization/Serialization.h +++ b/src/ifcgeom/serialization/serialization.h @@ -3,7 +3,7 @@ #include "../../ifcparse/express.h" #include "../../plugin/plugin.h" -#include "../../ifcgeom/ConversionResult.h" +#include "../../ifcgeom/conversion_result.h" #include "ifc_geomserialization_api.h" diff --git a/src/ifcgeom/Serializer.h b/src/ifcgeom/serializer.h similarity index 100% rename from src/ifcgeom/Serializer.h rename to src/ifcgeom/serializer.h diff --git a/src/ifcgeom/SurfaceStyle.cpp b/src/ifcgeom/surface_style.cpp similarity index 99% rename from src/ifcgeom/SurfaceStyle.cpp rename to src/ifcgeom/surface_style.cpp index d15a15b9c5..7f280caf2e 100644 --- a/src/ifcgeom/SurfaceStyle.cpp +++ b/src/ifcgeom/surface_style.cpp @@ -1,4 +1,4 @@ -#include "../ifcgeom/IfcGeomRenderStyles.h" +#include "../ifcgeom/render_styles.h" #include #include diff --git a/src/ifcgeom/taxonomy.h b/src/ifcgeom/taxonomy.h index 5c8183168d..240d4749a5 100644 --- a/src/ifcgeom/taxonomy.h +++ b/src/ifcgeom/taxonomy.h @@ -4,7 +4,7 @@ #include "../ifcparse/express.h" #include "../ifcparse/logger.h" -#include "ConversionSettings.h" +#include "conversion_settings.h" #include #include diff --git a/src/ifcgeom/tests/test_ifcopenshell_geometry.cpp b/src/ifcgeom/tests/test_ifcopenshell_geometry.cpp index 6d072318b8..8dc2909abf 100644 --- a/src/ifcgeom/tests/test_ifcopenshell_geometry.cpp +++ b/src/ifcgeom/tests/test_ifcopenshell_geometry.cpp @@ -4,7 +4,7 @@ #include -#include "ifcgeom/Converter.h" +#include "ifcgeom/converter.h" #include "ifcgeom/kernel_registry.h" #include "ifcparse/hierarchy_helper.h" #include "ifcparse/macros.h" diff --git a/src/ifcgeom/tree.cpp b/src/ifcgeom/tree.cpp index c9f8ca40df..292d0750b5 100644 --- a/src/ifcgeom/tree.cpp +++ b/src/ifcgeom/tree.cpp @@ -19,7 +19,7 @@ #include "tree.h" -#include "Iterator.h" +#include "iterator.h" #include "tree_registry.h" #include "../ifcparse/exception.h" diff --git a/src/ifcgeom/tree.h b/src/ifcgeom/tree.h index 1365e01bb1..8dcc11b1a8 100644 --- a/src/ifcgeom/tree.h +++ b/src/ifcgeom/tree.h @@ -20,7 +20,7 @@ #ifndef IFCOPENSHELL_TREE_H #define IFCOPENSHELL_TREE_H -#include "IfcGeomElement.h" +#include "element.h" #include #include diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp index d5c7ebbcc5..f52ee5feeb 100644 --- a/src/ifcgeomserver/IfcGeomServer.cpp +++ b/src/ifcgeomserver/IfcGeomServer.cpp @@ -41,10 +41,10 @@ #include #endif -#include "../ifcgeom/Iterator.h" -#include "../ifcgeom/IfcGeomElement.h" +#include "../ifcgeom/iterator.h" +#include "../ifcgeom/element.h" #include "../ifcgeom/kernel_registry.h" -#include "../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include "../ifcparse/file.h" #include "../ifcparse/logger.h" diff --git a/src/ifcmax/IfcMax.cpp b/src/ifcmax/IfcMax.cpp index f5abfe2e45..80a48ffad2 100644 --- a/src/ifcmax/IfcMax.cpp +++ b/src/ifcmax/IfcMax.cpp @@ -1,4 +1,4 @@ -/******************************************************************************** +/******************************************************************************** * * * This file is part of IfcOpenShell. * * * @@ -25,9 +25,9 @@ #include "IfcMax.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom_schema_agnostic/IfcGeomiterator.h" #include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h" -#include "../ifcgeom/IfcGeomElement.h" +#include "../ifcgeom/element.h" static const int NUM_MATERIAL_SLOTS = 24; diff --git a/src/ifcopenshell-python/ifcopenshell/geom/main.py b/src/ifcopenshell-python/ifcopenshell/geom/main.py index 9787f7efe5..5db8191625 100644 --- a/src/ifcopenshell-python/ifcopenshell/geom/main.py +++ b/src/ifcopenshell-python/ifcopenshell/geom/main.py @@ -169,7 +169,7 @@ SETTING = Literal[ # NOTE: hybrid-cgal-simple-opencascade is added just as an example # It's possible to use any hybrid combination by the format below: # "hybrid-library1-library2". -# List is updated from AbstractKernel.cpp. +# List is updated from abstract_kernel.cpp. GEOMETRY_LIBRARY = Literal["cgal", "cgal-simple", "opencascade", "hybrid-cgal-simple-opencascade"] diff --git a/src/ifcopenshell-python/ifcopenshell/util/shape.py b/src/ifcopenshell-python/ifcopenshell/util/shape.py index 7732412861..1fc32abdc1 100644 --- a/src/ifcopenshell-python/ifcopenshell/util/shape.py +++ b/src/ifcopenshell-python/ifcopenshell/util/shape.py @@ -46,7 +46,7 @@ MatrixType = npt.NDArray[np.float64] tol = 1e-6 -# NOTE: See IfcGeomRepresentation.h for W.Triangulation buffer types. +# NOTE: See representation.h for W.Triangulation buffer types. # NOTE: For functions that return a single scalar ensure to use .item() to # return the Python float instead of numpy float diff --git a/src/ifcviewer/GeometryStreamer.cpp b/src/ifcviewer/GeometryStreamer.cpp index ec39451c43..d5f3a91bae 100644 --- a/src/ifcviewer/GeometryStreamer.cpp +++ b/src/ifcviewer/GeometryStreamer.cpp @@ -21,7 +21,7 @@ #include "AppSettings.h" #include "../ifcgeom/hybrid_kernel.h" #include "../ifcgeom/taxonomy.h" -#include "../ifcgeom/IfcGeomFilter.h" +#include "../ifcgeom/filter.h" #include "../ifcparse/express.h" #include diff --git a/src/ifcviewer/GeometryStreamer.h b/src/ifcviewer/GeometryStreamer.h index ded9b79631..50debc0ac7 100644 --- a/src/ifcviewer/GeometryStreamer.h +++ b/src/ifcviewer/GeometryStreamer.h @@ -30,7 +30,7 @@ #include #include "../ifcparse/file.h" -#include "../ifcgeom/Iterator.h" +#include "../ifcgeom/iterator.h" #include "InstancedGeometry.h" diff --git a/src/ifcwrap/IfcGeomWrapper.i b/src/ifcwrap/IfcGeomWrapper.i index 4cfddab0d4..e6efee9e52 100644 --- a/src/ifcwrap/IfcGeomWrapper.i +++ b/src/ifcwrap/IfcGeomWrapper.i @@ -284,13 +284,13 @@ namespace { %shared_ptr(ifcopenshell::geom::taxonomy::node); %include "../ifcgeom/ifc_geom_api.h" -%include "../ifcgeom/ConversionResult.h" +%include "../ifcgeom/conversion_result.h" // The implementation tuple is intentionally opaque to Python. Letting SWIG // emit a type token for all setting descriptors exceeds MSVC's token limit. %ignore ifcopenshell::geom::settings_container; %ignore ifcopenshell::geom::geometry_setting_types; %ignore ifcopenshell::geom::settings::settings_tuple; -%include "../ifcgeom/ConversionSettings.h" +%include "../ifcgeom/conversion_settings.h" // Keep the owning element alive while its geometry is referenced (#1124). %define GEOMETRY_WITH_BACKREF(cls) @@ -307,10 +307,10 @@ GEOMETRY_WITH_BACKREF(ifcopenshell::geom::triangulation_element) GEOMETRY_WITH_BACKREF(ifcopenshell::geom::serialized_element) GEOMETRY_WITH_BACKREF(ifcopenshell::geom::brep_element) -%include "../ifcgeom/IfcGeomElement.h" -%include "../ifcgeom/IfcGeomRepresentation.h" -%include "../ifcgeom/Iterator.h" -%include "../ifcgeom/GeometrySerializer.h" +%include "../ifcgeom/element.h" +%include "../ifcgeom/representation.h" +%include "../ifcgeom/iterator.h" +%include "../ifcgeom/geometry_serializer.h" %include "../ifcgeom/taxonomy.h" %include "../ifcgeom/function_item_evaluator.h" diff --git a/src/ifcwrap/IfcParseWrapper.i b/src/ifcwrap/IfcParseWrapper.i index fc54705371..d967542566 100644 --- a/src/ifcwrap/IfcParseWrapper.i +++ b/src/ifcwrap/IfcParseWrapper.i @@ -982,7 +982,7 @@ from .entity_instance import entity_instance_mixin %include "../ifcparse/express.h" %include "../ifcparse/schema.h" -%include "../serializers/RocksDbSerializer.h" +%include "../serializers/rocks_db_serializer.h" %include "../ifcparse/logger.h" // The file* returned by open() is to be freed by SWIG/Python diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i index d0569bcd9f..e811c59b34 100644 --- a/src/ifcwrap/IfcPython.i +++ b/src/ifcwrap/IfcPython.i @@ -104,7 +104,7 @@ %ignore ifcopenshell::geom::taxonomy::topology_error; // settings, can this done more generally? -// GeometrySerializer.h +// geometry_serializer.h %ignore UseElementNames; %ignore UseElementGuids; %ignore UseElementStepIds; @@ -144,7 +144,7 @@ %ignore SvgPrintSpaceNames; %ignore SvgPrintSpaceAreas; %ignore SvgSpaceNameTransform; -// ConversionSettings.h +// conversion_settings.h %ignore MesherLinearDeflection; %ignore MesherAngularDeflection; %ignore ReorientShells; @@ -239,9 +239,9 @@ // can probably be reduced, but for now it's identical to the includes // of the module definition below. %{ - #include "../ifcgeom/Iterator.h" + #include "../ifcgeom/iterator.h" #include "../ifcgeom/tree.h" - #include "../ifcgeom/Serialization/Serialization.h" + #include "../ifcgeom/serialization/serialization.h" #include "../ifcgeom/taxonomy.h" #include "../ifcgeom/function_item_evaluator.h" @@ -250,13 +250,13 @@ #include "../ifcparse/schema.h" #include "../ifcparse/utils.h" - #include "../ifcgeom/ConversionSettings.h" - #include "../ifcgeom/ConversionResult.h" + #include "../ifcgeom/conversion_settings.h" + #include "../ifcgeom/conversion_result.h" #include "../svgfill/src/svgfill.h" // @todo abstract into plug-in interface - #include "../serializers/RocksDbSerializer.h" + #include "../serializers/rocks_db_serializer.h" %} // Create docstrings for generated python code. @@ -269,28 +269,28 @@ %include "utils/typemaps_out.i" %module ifcopenshell_wrapper %{ - #include "../ifcgeom/Converter.h" + #include "../ifcgeom/converter.h" #include "../ifcgeom/tree.h" - #include "../ifcgeom/Serialization/Serialization.h" + #include "../ifcgeom/serialization/serialization.h" #include "../ifcgeom/taxonomy.h" #include "../ifcgeom/function_item_evaluator.h" - #include "../ifcgeom/Iterator.h" - #include "../ifcgeom/ConversionResult.h" + #include "../ifcgeom/iterator.h" + #include "../ifcgeom/conversion_result.h" #include "../ifcgeom/hybrid_kernel.h" - #include "../ifcgeom/GeometrySerializer.h" + #include "../ifcgeom/geometry_serializer.h" #include "../ifcparse/express.h" #include "../ifcparse/file.h" #include "../ifcparse/schema.h" #include "../ifcparse/utils.h" - #include "../ifcgeom/ConversionSettings.h" - #include "../ifcgeom/ConversionResult.h" + #include "../ifcgeom/conversion_settings.h" + #include "../ifcgeom/conversion_result.h" #include "../svgfill/src/svgfill.h" // @todo abstract into plug-in interface - #include "../serializers/RocksDbSerializer.h" + #include "../serializers/rocks_db_serializer.h" %} %{ diff --git a/src/serializers/CMakeLists.txt b/src/serializers/CMakeLists.txt index 3766c15317..8af97d2200 100644 --- a/src/serializers/CMakeLists.txt +++ b/src/serializers/CMakeLists.txt @@ -56,7 +56,7 @@ function(add_geometry_serializer_plugin target output_name) endfunction() if(WITH_ROCKSDB) - add_document_serializer_plugin(document_serializer_rdb "document.rdb" SOURCES document_rdb_plugin.cpp RocksDbSerializer.cpp LIBRARIES ${IFCOPENSHELL_ROCKSDB_TARGET}) + add_document_serializer_plugin(document_serializer_rdb "document.rdb" SOURCES document_rdb_plugin.cpp rocks_db_serializer.cpp LIBRARIES ${IFCOPENSHELL_ROCKSDB_TARGET}) endif() add_subdirectory(schema_dependent) @@ -66,28 +66,28 @@ set(ttl_geometry_serializer_libraries) if(WITH_OPENCASCADE) set(ttl_geometry_serializer_libraries geometry_kernel_opencascade ${OpenCASCADE_LIBRARIES}) endif() -add_geometry_serializer_plugin(geometry_serializer_ttl "geometry.ttl" SOURCES geometry_ttl_plugin.cpp TtlWktSerializer.cpp LIBRARIES ${ttl_geometry_serializer_libraries}) +add_geometry_serializer_plugin(geometry_serializer_ttl "geometry.ttl" SOURCES geometry_ttl_plugin.cpp ttl_wkt_serializer.cpp LIBRARIES ${ttl_geometry_serializer_libraries}) endif() -add_geometry_serializer_plugin(geometry_serializer_obj "geometry.obj" SOURCES geometry_obj_plugin.cpp WavefrontObjSerializer.cpp) +add_geometry_serializer_plugin(geometry_serializer_obj "geometry.obj" SOURCES geometry_obj_plugin.cpp wavefront_obj_serializer.cpp) if(OPENCOLLADA_FOUND) - add_geometry_serializer_plugin(geometry_serializer_dae "geometry.dae" SOURCES geometry_dae_plugin.cpp ColladaSerializer.cpp LIBRARIES OpenCOLLADA::OpenCOLLADA DEFINITIONS WITH_OPENCOLLADA) + add_geometry_serializer_plugin(geometry_serializer_dae "geometry.dae" SOURCES geometry_dae_plugin.cpp collada_serializer.cpp LIBRARIES OpenCOLLADA::OpenCOLLADA DEFINITIONS WITH_OPENCOLLADA) endif() if(GLTF_SUPPORT) - add_geometry_serializer_plugin(geometry_serializer_glb "geometry.glb" SOURCES geometry_glb_plugin.cpp GltfSerializer.cpp LIBRARIES nlohmann_json::nlohmann_json DEFINITIONS WITH_GLTF) + add_geometry_serializer_plugin(geometry_serializer_glb "geometry.glb" SOURCES geometry_glb_plugin.cpp gltf_serializer.cpp LIBRARIES nlohmann_json::nlohmann_json DEFINITIONS WITH_GLTF) endif() if(USD_SUPPORT) - add_geometry_serializer_plugin(geometry_serializer_usd "geometry.usd" SOURCES geometry_usd_plugin.cpp USDSerializer.cpp LIBRARIES pxr::USD) + add_geometry_serializer_plugin(geometry_serializer_usd "geometry.usd" SOURCES geometry_usd_plugin.cpp usd_serializer.cpp LIBRARIES pxr::USD) endif() if(WITH_OPENCASCADE AND NOT WASM_BUILD) set(opencascade_geometry_serializer_libraries geometry_kernel_opencascade ${OpenCASCADE_LIBRARIES}) - add_geometry_serializer_plugin(geometry_serializer_stp "geometry.stp" SOURCES geometry_stp_plugin.cpp OpenCascadeBasedSerializer.cpp LIBRARIES ${opencascade_geometry_serializer_libraries}) - add_geometry_serializer_plugin(geometry_serializer_igs "geometry.igs" SOURCES geometry_igs_plugin.cpp OpenCascadeBasedSerializer.cpp LIBRARIES ${opencascade_geometry_serializer_libraries}) - add_geometry_serializer_plugin(geometry_serializer_svg "geometry.svg" SOURCES geometry_svg_plugin.cpp SvgSerializer.cpp util.cpp LIBRARIES ${opencascade_geometry_serializer_libraries}) + add_geometry_serializer_plugin(geometry_serializer_stp "geometry.stp" SOURCES geometry_stp_plugin.cpp open_cascade_based_serializer.cpp LIBRARIES ${opencascade_geometry_serializer_libraries}) + add_geometry_serializer_plugin(geometry_serializer_igs "geometry.igs" SOURCES geometry_igs_plugin.cpp open_cascade_based_serializer.cpp LIBRARIES ${opencascade_geometry_serializer_libraries}) + add_geometry_serializer_plugin(geometry_serializer_svg "geometry.svg" SOURCES geometry_svg_plugin.cpp svg_serializer.cpp util.cpp LIBRARIES ${opencascade_geometry_serializer_libraries}) endif() install(TARGETS ${document_serializer_libraries} ${geometry_serializer_libraries}) diff --git a/src/serializers/ColladaSerializer.cpp b/src/serializers/collada_serializer.cpp similarity index 99% rename from src/serializers/ColladaSerializer.cpp rename to src/serializers/collada_serializer.cpp index f1507ac14f..a752cfc3c5 100644 --- a/src/serializers/ColladaSerializer.cpp +++ b/src/serializers/collada_serializer.cpp @@ -19,7 +19,7 @@ #ifdef WITH_OPENCOLLADA -#include "ColladaSerializer.h" +#include "collada_serializer.h" #include diff --git a/src/serializers/ColladaSerializer.h b/src/serializers/collada_serializer.h similarity index 99% rename from src/serializers/ColladaSerializer.h rename to src/serializers/collada_serializer.h index f707036482..3381c8d2b9 100644 --- a/src/serializers/ColladaSerializer.h +++ b/src/serializers/collada_serializer.h @@ -41,10 +41,10 @@ #pragma GCC diagnostic pop #endif -#include "../ifcgeom/Iterator.h" +#include "../ifcgeom/iterator.h" #include "../serializers/serializers_api.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" #include #include diff --git a/src/serializers/document_rdb_plugin.cpp b/src/serializers/document_rdb_plugin.cpp index f47172f7f4..f99a659403 100644 --- a/src/serializers/document_rdb_plugin.cpp +++ b/src/serializers/document_rdb_plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "document_serializer_plugin.h" -#include "RocksDbSerializer.h" +#include "rocks_db_serializer.h" #ifdef IFOPSH_WITH_ROCKSDB diff --git a/src/serializers/document_serializer_plugin.h b/src/serializers/document_serializer_plugin.h index d6e630e78a..9db27f2f1d 100644 --- a/src/serializers/document_serializer_plugin.h +++ b/src/serializers/document_serializer_plugin.h @@ -21,7 +21,7 @@ #define IFCOPENSHELL_DOCUMENT_SERIALIZER_PLUGIN_H #include "../serializers/serializers_api.h" -#include "../ifcgeom/Serializer.h" +#include "../ifcgeom/serializer.h" #include "../ifcparse/file.h" #include "../plugin/plugin.h" diff --git a/src/serializers/geometry_dae_plugin.cpp b/src/serializers/geometry_dae_plugin.cpp index 45576e4584..1c430d71c2 100644 --- a/src/serializers/geometry_dae_plugin.cpp +++ b/src/serializers/geometry_dae_plugin.cpp @@ -19,7 +19,7 @@ #ifdef WITH_OPENCOLLADA -#include "ColladaSerializer.h" +#include "collada_serializer.h" #include "geometry_serializer_plugin.h" #include diff --git a/src/serializers/geometry_glb_plugin.cpp b/src/serializers/geometry_glb_plugin.cpp index 0d3092cbc9..c877ac3b80 100644 --- a/src/serializers/geometry_glb_plugin.cpp +++ b/src/serializers/geometry_glb_plugin.cpp @@ -20,7 +20,7 @@ #ifdef WITH_GLTF #include "geometry_serializer_plugin.h" -#include "GltfSerializer.h" +#include "gltf_serializer.h" #include #include diff --git a/src/serializers/geometry_igs_plugin.cpp b/src/serializers/geometry_igs_plugin.cpp index dd5688c9cb..9fec3c5a53 100644 --- a/src/serializers/geometry_igs_plugin.cpp +++ b/src/serializers/geometry_igs_plugin.cpp @@ -20,7 +20,7 @@ #ifdef IFOPSH_WITH_OPENCASCADE #include "geometry_serializer_plugin.h" -#include "IgesSerializer.h" +#include "iges_serializer.h" #include #include diff --git a/src/serializers/geometry_obj_plugin.cpp b/src/serializers/geometry_obj_plugin.cpp index fd173acc6f..74d43e4138 100644 --- a/src/serializers/geometry_obj_plugin.cpp +++ b/src/serializers/geometry_obj_plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "geometry_serializer_plugin.h" -#include "WavefrontObjSerializer.h" +#include "wavefront_obj_serializer.h" #include "../ifcparse/utils.h" diff --git a/src/serializers/geometry_serializer_plugin.h b/src/serializers/geometry_serializer_plugin.h index 9fc26e3cc8..5f424cb032 100644 --- a/src/serializers/geometry_serializer_plugin.h +++ b/src/serializers/geometry_serializer_plugin.h @@ -21,7 +21,7 @@ #define IFCOPENSHELL_GEOMETRY_SERIALIZER_PLUGIN_H #include "../serializers/serializers_api.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" #include "../plugin/plugin.h" #include diff --git a/src/serializers/geometry_stp_plugin.cpp b/src/serializers/geometry_stp_plugin.cpp index fa0bf4b21c..95176eb992 100644 --- a/src/serializers/geometry_stp_plugin.cpp +++ b/src/serializers/geometry_stp_plugin.cpp @@ -20,7 +20,7 @@ #ifdef IFOPSH_WITH_OPENCASCADE #include "geometry_serializer_plugin.h" -#include "StepSerializer.h" +#include "step_serializer.h" #include #include diff --git a/src/serializers/geometry_svg_plugin.cpp b/src/serializers/geometry_svg_plugin.cpp index 2b1eeb8687..502ecaa747 100644 --- a/src/serializers/geometry_svg_plugin.cpp +++ b/src/serializers/geometry_svg_plugin.cpp @@ -20,7 +20,7 @@ #ifdef IFOPSH_WITH_OPENCASCADE #include "geometry_serializer_plugin.h" -#include "SvgSerializer.h" +#include "svg_serializer.h" #include #include diff --git a/src/serializers/geometry_ttl_plugin.cpp b/src/serializers/geometry_ttl_plugin.cpp index 07b2a872ba..b40fa3906d 100644 --- a/src/serializers/geometry_ttl_plugin.cpp +++ b/src/serializers/geometry_ttl_plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "geometry_serializer_plugin.h" -#include "TtlWktSerializer.h" +#include "ttl_wkt_serializer.h" #include #include diff --git a/src/serializers/geometry_usd_plugin.cpp b/src/serializers/geometry_usd_plugin.cpp index c148aee4a7..2522476714 100644 --- a/src/serializers/geometry_usd_plugin.cpp +++ b/src/serializers/geometry_usd_plugin.cpp @@ -20,7 +20,7 @@ #ifdef WITH_USD #include "geometry_serializer_plugin.h" -#include "USDSerializer.h" +#include "usd_serializer.h" #include #include diff --git a/src/serializers/GltfSerializer.cpp b/src/serializers/gltf_serializer.cpp similarity index 99% rename from src/serializers/GltfSerializer.cpp rename to src/serializers/gltf_serializer.cpp index 4f13b8c9b2..04e6b2716b 100644 --- a/src/serializers/GltfSerializer.cpp +++ b/src/serializers/gltf_serializer.cpp @@ -19,7 +19,7 @@ #ifdef WITH_GLTF -#include "GltfSerializer.h" +#include "gltf_serializer.h" #include "../ifcparse/utils.h" diff --git a/src/serializers/GltfSerializer.h b/src/serializers/gltf_serializer.h similarity index 98% rename from src/serializers/GltfSerializer.h rename to src/serializers/gltf_serializer.h index 5a17e21419..aee2ca1bb6 100644 --- a/src/serializers/GltfSerializer.h +++ b/src/serializers/gltf_serializer.h @@ -23,7 +23,7 @@ #ifdef WITH_GLTF #include "../serializers/serializers_api.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" #include using json = nlohmann::json; diff --git a/src/serializers/IgesSerializer.h b/src/serializers/iges_serializer.h similarity index 98% rename from src/serializers/IgesSerializer.h rename to src/serializers/iges_serializer.h index ab20637e7f..ae5ceeb81c 100644 --- a/src/serializers/IgesSerializer.h +++ b/src/serializers/iges_serializer.h @@ -22,7 +22,7 @@ #ifndef IGESSERIALIZER_H #define IGESSERIALIZER_H -#include "OpenCascadeBasedSerializer.h" +#include "open_cascade_based_serializer.h" #include "../ifcparse/logger.h" #include diff --git a/src/serializers/JsonSerializer.h b/src/serializers/json_serializer.h similarity index 97% rename from src/serializers/JsonSerializer.h rename to src/serializers/json_serializer.h index e07682f970..5aa1c45520 100644 --- a/src/serializers/JsonSerializer.h +++ b/src/serializers/json_serializer.h @@ -3,7 +3,7 @@ #ifdef WITH_GLTF -#include "../ifcgeom/Serializer.h" +#include "../ifcgeom/serializer.h" #include "../ifcparse/file.h" #include "../plugin/plugin.h" #include "../serializers/serializers_api.h" diff --git a/src/serializers/OpenCascadeBasedSerializer.cpp b/src/serializers/open_cascade_based_serializer.cpp similarity index 95% rename from src/serializers/OpenCascadeBasedSerializer.cpp rename to src/serializers/open_cascade_based_serializer.cpp index 73c739b53d..c0a6a4fa5a 100644 --- a/src/serializers/OpenCascadeBasedSerializer.cpp +++ b/src/serializers/open_cascade_based_serializer.cpp @@ -19,10 +19,10 @@ #ifdef IFOPSH_WITH_OPENCASCADE -#include "OpenCascadeBasedSerializer.h" +#include "open_cascade_based_serializer.h" #include "../ifcparse/utils.h" -#include "../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include #include diff --git a/src/serializers/OpenCascadeBasedSerializer.h b/src/serializers/open_cascade_based_serializer.h similarity index 97% rename from src/serializers/OpenCascadeBasedSerializer.h rename to src/serializers/open_cascade_based_serializer.h index c03642e760..7c72aadeb6 100644 --- a/src/serializers/OpenCascadeBasedSerializer.h +++ b/src/serializers/open_cascade_based_serializer.h @@ -23,9 +23,9 @@ #define OPENCASCADEBASEDSERIALIZER_H #include "../serializers/serializers_api.h" -#include "../ifcgeom/Iterator.h" +#include "../ifcgeom/iterator.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" #include diff --git a/src/serializers/RocksDbSerializer.cpp b/src/serializers/rocks_db_serializer.cpp similarity index 99% rename from src/serializers/RocksDbSerializer.cpp rename to src/serializers/rocks_db_serializer.cpp index 5eca4a7320..b593c41805 100644 --- a/src/serializers/RocksDbSerializer.cpp +++ b/src/serializers/rocks_db_serializer.cpp @@ -1,6 +1,6 @@ #ifdef IFOPSH_WITH_ROCKSDB -#include "RocksDbSerializer.h" +#include "rocks_db_serializer.h" #include diff --git a/src/serializers/RocksDbSerializer.h b/src/serializers/rocks_db_serializer.h similarity index 96% rename from src/serializers/RocksDbSerializer.h rename to src/serializers/rocks_db_serializer.h index b8a1bf94d4..07b61373a5 100644 --- a/src/serializers/RocksDbSerializer.h +++ b/src/serializers/rocks_db_serializer.h @@ -3,7 +3,7 @@ #ifdef IFOPSH_WITH_ROCKSDB #include "../serializers/serializers_api.h" -#include "../ifcgeom/Serializer.h" +#include "../ifcgeom/serializer.h" #include #include diff --git a/src/serializers/schema_dependent/CMakeLists.txt b/src/serializers/schema_dependent/CMakeLists.txt index 419f2a90da..96a80f2d75 100644 --- a/src/serializers/schema_dependent/CMakeLists.txt +++ b/src/serializers/schema_dependent/CMakeLists.txt @@ -5,14 +5,14 @@ foreach(schema ${SCHEMA_VERSIONS}) set(schema_plugin_library) endif() - add_document_serializer_plugin(document_serializer_xml_ifc${schema} "document.xml.ifc${schema}" SOURCES XmlSerializer.cpp xml_plugin.cpp LIBRARIES ${schema_plugin_library}) + add_document_serializer_plugin(document_serializer_xml_ifc${schema} "document.xml.ifc${schema}" SOURCES xml_serializer.cpp xml_plugin.cpp LIBRARIES ${schema_plugin_library}) target_compile_definitions(document_serializer_xml_ifc${schema} PRIVATE IfcSchema=Ifc${schema}) if(WASM_BUILD) target_link_options(document_serializer_xml_ifc${schema} PRIVATE "SHELL:-s ERROR_ON_UNDEFINED_SYMBOLS=0") endif() if(GLTF_SUPPORT) - add_document_serializer_plugin(document_serializer_json_ifc${schema} "document.json.ifc${schema}" SOURCES JsonSerializer.cpp json_plugin.cpp LIBRARIES nlohmann_json::nlohmann_json ${schema_plugin_library} DEFINITIONS WITH_GLTF) + add_document_serializer_plugin(document_serializer_json_ifc${schema} "document.json.ifc${schema}" SOURCES json_serializer.cpp json_plugin.cpp LIBRARIES nlohmann_json::nlohmann_json ${schema_plugin_library} DEFINITIONS WITH_GLTF) target_compile_definitions(document_serializer_json_ifc${schema} PRIVATE IfcSchema=Ifc${schema}) if(WASM_BUILD) target_link_options(document_serializer_json_ifc${schema} PRIVATE "SHELL:-s ERROR_ON_UNDEFINED_SYMBOLS=0") diff --git a/src/serializers/schema_dependent/json_plugin.cpp b/src/serializers/schema_dependent/json_plugin.cpp index cc1d4bab9c..e3eebb30a5 100644 --- a/src/serializers/schema_dependent/json_plugin.cpp +++ b/src/serializers/schema_dependent/json_plugin.cpp @@ -20,7 +20,7 @@ #ifdef WITH_GLTF #include "../document_serializer_plugin.h" -#include "JsonSerializer.h" +#include "json_serializer.h" #include "../../ifcparse/macros.h" diff --git a/src/serializers/schema_dependent/JsonSerializer.cpp b/src/serializers/schema_dependent/json_serializer.cpp similarity index 99% rename from src/serializers/schema_dependent/JsonSerializer.cpp rename to src/serializers/schema_dependent/json_serializer.cpp index 6ac93fbbdc..f83c30510d 100644 --- a/src/serializers/schema_dependent/JsonSerializer.cpp +++ b/src/serializers/schema_dependent/json_serializer.cpp @@ -19,7 +19,7 @@ #ifdef WITH_GLTF -#include "JsonSerializer.h" +#include "json_serializer.h" #include #include diff --git a/src/serializers/schema_dependent/JsonSerializer.h b/src/serializers/schema_dependent/json_serializer.h similarity index 98% rename from src/serializers/schema_dependent/JsonSerializer.h rename to src/serializers/schema_dependent/json_serializer.h index c0e54056af..1f3030bdb4 100644 --- a/src/serializers/schema_dependent/JsonSerializer.h +++ b/src/serializers/schema_dependent/json_serializer.h @@ -24,7 +24,7 @@ #include "../../ifcgeom/abstract_mapping.h" #include "../../ifcparse/macros.h" -#include "../../serializers/JsonSerializer.h" +#include "../../serializers/json_serializer.h" #define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/schemas/x.h) #include INCLUDE_PARENT_PARENT_DIR(IfcSchema) diff --git a/src/serializers/schema_dependent/xml_plugin.cpp b/src/serializers/schema_dependent/xml_plugin.cpp index 6a7ad68687..07d109e512 100644 --- a/src/serializers/schema_dependent/xml_plugin.cpp +++ b/src/serializers/schema_dependent/xml_plugin.cpp @@ -18,7 +18,7 @@ ********************************************************************************/ #include "../document_serializer_plugin.h" -#include "XmlSerializer.h" +#include "xml_serializer.h" #include "../../ifcparse/macros.h" diff --git a/src/serializers/schema_dependent/XmlSerializer.cpp b/src/serializers/schema_dependent/xml_serializer.cpp similarity index 99% rename from src/serializers/schema_dependent/XmlSerializer.cpp rename to src/serializers/schema_dependent/xml_serializer.cpp index 9b7b69f81f..fde10c1db4 100644 --- a/src/serializers/schema_dependent/XmlSerializer.cpp +++ b/src/serializers/schema_dependent/xml_serializer.cpp @@ -22,7 +22,7 @@ #include #include -#include "XmlSerializer.h" +#include "xml_serializer.h" #include diff --git a/src/serializers/schema_dependent/XmlSerializer.h b/src/serializers/schema_dependent/xml_serializer.h similarity index 98% rename from src/serializers/schema_dependent/XmlSerializer.h rename to src/serializers/schema_dependent/xml_serializer.h index 22824c2abb..d3184577f2 100644 --- a/src/serializers/schema_dependent/XmlSerializer.h +++ b/src/serializers/schema_dependent/xml_serializer.h @@ -22,7 +22,7 @@ #include "../../ifcgeom/abstract_mapping.h" #include "../../ifcparse/macros.h" -#include "../../serializers/XmlSerializer.h" +#include "../../serializers/xml_serializer.h" #define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/schemas/x.h) #include INCLUDE_PARENT_PARENT_DIR(IfcSchema) diff --git a/src/serializers/StepSerializer.h b/src/serializers/step_serializer.h similarity index 96% rename from src/serializers/StepSerializer.h rename to src/serializers/step_serializer.h index 4e0ad4cc33..11edd4703b 100644 --- a/src/serializers/StepSerializer.h +++ b/src/serializers/step_serializer.h @@ -25,9 +25,9 @@ #include #include -#include "../ifcgeom/Iterator.h" +#include "../ifcgeom/iterator.h" -#include "../serializers/OpenCascadeBasedSerializer.h" +#include "../serializers/open_cascade_based_serializer.h" class step_serializer : public open_cascade_based_serializer { diff --git a/src/serializers/SvgSerializer.cpp b/src/serializers/svg_serializer.cpp similarity index 99% rename from src/serializers/SvgSerializer.cpp rename to src/serializers/svg_serializer.cpp index 0ef6c23084..b45f2c9187 100644 --- a/src/serializers/SvgSerializer.cpp +++ b/src/serializers/svg_serializer.cpp @@ -92,13 +92,13 @@ #include "../ifcgeom/kernels/opencascade/boolean_utils.h" #include "../ifcgeom/kernels/opencascade/wire_utils.h" -#include "../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include #include #include -#include "SvgSerializer.h" +#include "svg_serializer.h" namespace { @@ -1541,7 +1541,7 @@ void svg_serializer::write(const geometry_data& data) { // face topology, pre-HLR) into per-class edge-only sub-compounds. The full shape // is still registered via add()/it->second.add() below, unchanged, for correct // occlusion; these buckets only affect which class each edge's visible portion is - // later extracted as (see hlr_calc::extract() in SvgSerializer.h). + // later extracted as (see hlr_calc::extract() in svg_serializer.h). // // Gated behind svg_use_edge_classification_ (default false): the whole block must // be skipped, not just individually suppressed per-edge, so that when disabled diff --git a/src/serializers/SvgSerializer.h b/src/serializers/svg_serializer.h similarity index 99% rename from src/serializers/SvgSerializer.h rename to src/serializers/svg_serializer.h index 26e33cf219..b9a464e5ae 100644 --- a/src/serializers/SvgSerializer.h +++ b/src/serializers/svg_serializer.h @@ -24,7 +24,7 @@ #ifndef SVGSERIALIZER_H #define SVGSERIALIZER_H -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" #include "../ifcgeom/kernels/opencascade/base_utils.h" #include "../serializers/serializers_api.h" #include "../serializers/util.h" @@ -590,7 +590,7 @@ protected: int profile_threshold_; - // SVG edge classification (issue #3668): see classify_edge_from_faces() in SvgSerializer.cpp. + // SVG edge classification (issue #3668): see classify_edge_from_faces() in svg_serializer.cpp. double svg_ridge_angle_min_deg_; double svg_valley_angle_min_deg_; bool svg_emit_flush_edges_; diff --git a/src/serializers/TtlWktSerializer.cpp b/src/serializers/ttl_wkt_serializer.cpp similarity index 99% rename from src/serializers/TtlWktSerializer.cpp rename to src/serializers/ttl_wkt_serializer.cpp index c6e6c295e9..3d6c0d5dc5 100644 --- a/src/serializers/TtlWktSerializer.cpp +++ b/src/serializers/ttl_wkt_serializer.cpp @@ -17,10 +17,10 @@ * * ********************************************************************************/ -#include "TtlWktSerializer.h" +#include "ttl_wkt_serializer.h" #ifdef IFOPSH_WITH_OPENCASCADE -#include "../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../ifcgeom/kernels/opencascade/opencascade_conversion_result.h" #include #if OCC_VERSION_HEX >= 0x80000 diff --git a/src/serializers/TtlWktSerializer.h b/src/serializers/ttl_wkt_serializer.h similarity index 98% rename from src/serializers/TtlWktSerializer.h rename to src/serializers/ttl_wkt_serializer.h index 2ca3eb170c..100f584269 100644 --- a/src/serializers/TtlWktSerializer.h +++ b/src/serializers/ttl_wkt_serializer.h @@ -25,7 +25,7 @@ #include #include "../serializers/serializers_api.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" class SERIALIZERS_API ttl_wkt_serializer : public ifcopenshell::geom::write_only_geometry_serializer { private: diff --git a/src/serializers/USDSerializer.cpp b/src/serializers/usd_serializer.cpp similarity index 99% rename from src/serializers/USDSerializer.cpp rename to src/serializers/usd_serializer.cpp index f331086bc6..f02632c940 100644 --- a/src/serializers/USDSerializer.cpp +++ b/src/serializers/usd_serializer.cpp @@ -23,7 +23,7 @@ // error C2589: '(': illegal token on right side of '::' #define NOMINMAX -#include "USDSerializer.h" +#include "usd_serializer.h" #include "pxr/base/gf/vec3f.h" #include "pxr/usd/usdGeom/xform.h" diff --git a/src/serializers/USDSerializer.h b/src/serializers/usd_serializer.h similarity index 98% rename from src/serializers/USDSerializer.h rename to src/serializers/usd_serializer.h index ce61523d40..4bf9b2c734 100644 --- a/src/serializers/USDSerializer.h +++ b/src/serializers/usd_serializer.h @@ -26,7 +26,7 @@ #define __TBB_LIB_NAME bier #include "../serializers/serializers_api.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" #include "../ifcparse/utils.h" // undefine opencascade Handle macro, because it conflicts with USD diff --git a/src/serializers/WavefrontObjSerializer.cpp b/src/serializers/wavefront_obj_serializer.cpp similarity index 98% rename from src/serializers/WavefrontObjSerializer.cpp rename to src/serializers/wavefront_obj_serializer.cpp index 49dae4ba76..bf891f5d9f 100644 --- a/src/serializers/WavefrontObjSerializer.cpp +++ b/src/serializers/wavefront_obj_serializer.cpp @@ -18,9 +18,9 @@ ********************************************************************************/ -#include "WavefrontObjSerializer.h" +#include "wavefront_obj_serializer.h" -#include "../ifcgeom/IfcGeomRenderStyles.h" +#include "../ifcgeom/render_styles.h" #include "../ifcparse/utils.h" diff --git a/src/serializers/WavefrontObjSerializer.h b/src/serializers/wavefront_obj_serializer.h similarity index 98% rename from src/serializers/WavefrontObjSerializer.h rename to src/serializers/wavefront_obj_serializer.h index 12ae07adaf..7eb0bb4e43 100644 --- a/src/serializers/WavefrontObjSerializer.h +++ b/src/serializers/wavefront_obj_serializer.h @@ -25,7 +25,7 @@ #include #include "../serializers/serializers_api.h" -#include "../ifcgeom/GeometrySerializer.h" +#include "../ifcgeom/geometry_serializer.h" // http://people.sc.fsu.edu/~jburkardt/txt/obj_format.txt class SERIALIZERS_API wavefront_obj_serializer : public ifcopenshell::geom::write_only_geometry_serializer { diff --git a/src/serializers/XmlSerializer.h b/src/serializers/xml_serializer.h similarity index 97% rename from src/serializers/XmlSerializer.h rename to src/serializers/xml_serializer.h index 759027e2fd..359d69d2f5 100644 --- a/src/serializers/XmlSerializer.h +++ b/src/serializers/xml_serializer.h @@ -4,7 +4,7 @@ #define SCHEMA_METHOD #include "../serializers/serializers_api.h" -#include "../ifcgeom/Serializer.h" +#include "../ifcgeom/serializer.h" #include "../ifcparse/file.h" #include "../plugin/plugin.h" #include "../serializers/document_serializer_plugin.h"