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.
This commit is contained in:
Thomas Krijnen
2026-08-08 14:19:57 +02:00
parent 02481b3247
commit 7ae6bf4374
132 changed files with 217 additions and 217 deletions
+1 -1
View File
@@ -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 <QDebug>
+1 -1
View File
@@ -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 <vld.h>
+1 -1
View File
@@ -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 <vld.h>
+1 -1
View File
@@ -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 "-";
}
+4 -4
View File
@@ -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
@@ -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 <CGAL/Polygon_mesh_processing/measure.h>
#include <CGAL/Polygon_mesh_processing/bbox.h>
+3 -3
View File
@@ -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 <CGAL/box_intersection_d.h>
+1 -1
View File
@@ -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()
@@ -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;
@@ -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 <string_view>
+1 -1
View File
@@ -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 <boost/function.hpp>
@@ -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
{
@@ -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 <algorithm>
@@ -1,4 +1,4 @@
#include "ConversionSettings.h"
#include "conversion_settings.h"
template <typename T>
void istream_helper(std::istream& in, T& vs) {
@@ -1,6 +1,6 @@
#include "Converter.h"
#include "converter.h"
#include "../ifcgeom/IfcGeomElement.h"
#include "../ifcgeom/element.h"
using namespace ifcopenshell::geom;
@@ -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 <boost/function.hpp>
@@ -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 {
@@ -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"
@@ -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 <fstream>
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -2,7 +2,7 @@
#define LINEAR_SWEEP_HELPER_H
#include "taxonomy.h"
#include "ConversionSettings.h"
#include "conversion_settings.h"
#include "ifc_geom_api.h"
@@ -1,4 +1,4 @@
#include "Iterator.h"
#include "iterator.h"
/**
* Initialize iterator's list of tasks.
@@ -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 <boost/algorithm/string.hpp>
+1 -1
View File
@@ -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 <boost/function.hpp>
@@ -1,5 +1,5 @@
#include "CgalConversionResult.h"
#include "CgalKernel.h"
#include "cgal_conversion_result.h"
#include "cgal_kernel.h"
#include <CGAL/Polygon_mesh_processing/repair.h>
#include <CGAL/Polygon_mesh_processing/self_intersections.h>
@@ -7,7 +7,7 @@
#include <CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h>
#include "../../../ifcparse/logger.h"
#include "../../../ifcgeom/IfcGeomRepresentation.h"
#include "../../../ifcgeom/representation.h"
using ifcopenshell::geom::opaque_number;
using ifcopenshell::geom::opaque_coordinate;
@@ -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<kernel_> cgal_shape_t;
typedef boost::graph_traits<CGAL::Polyhedron_3<kernel_>>::vertex_descriptor cgal_vertex_descriptor_t;
typedef boost::graph_traits<CGAL::Polyhedron_3<kernel_>>::face_descriptor cgal_face_descriptor_t;
#include "../../../ifcgeom/ConversionResult.h"
#include "../../../ifcgeom/conversion_result.h"
namespace ifcopenshell { namespace geom {
@@ -19,10 +19,10 @@
#define _USE_MATH_DEFINES
#include <cmath>
#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
@@ -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 <CGAL/Polygon_2.h>
+1 -1
View File
@@ -18,7 +18,7 @@
********************************************************************************/
#include "../../kernel_plugin.h"
#include "CgalKernel.h"
#include "cgal_kernel.h"
#include <boost/dll/alias.hpp>
@@ -1,6 +1,6 @@
#include "ManifoldConversionResult.h"
#include "manifold_conversion_result.h"
#include "../../../ifcgeom/IfcGeomRepresentation.h"
#include "../../../ifcgeom/representation.h"
#include <Eigen/Dense>
@@ -3,7 +3,7 @@
#include <manifold/manifold.h>
#include "../../../ifcgeom/ConversionResult.h"
#include "../../../ifcgeom/conversion_result.h"
#include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h"
#include <optional>
@@ -1,4 +1,4 @@
#include "ManifoldKernel.h"
#include "manifold_kernel.h"
#include "../../../ifcparse/logger.h"
@@ -3,9 +3,9 @@
#include <manifold/manifold.h>
#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 {
+1 -1
View File
@@ -18,7 +18,7 @@
********************************************************************************/
#include "../../kernel_plugin.h"
#include "ManifoldKernel.h"
#include "manifold_kernel.h"
#include <boost/dll/alias.hpp>
@@ -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 <Standard_Version.hxx>
+1 -1
View File
@@ -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 <gp_Pln.hxx>
@@ -1,4 +1,4 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "boolean_utils.h"
#include "base_utils.h"
@@ -1,6 +1,6 @@
#include "boolean_utils.h"
#include "IfcGeomTree.h"
#include "tree.h"
#include "base_utils.h"
#include <BRepBuilderAPI_Copy.hxx>
@@ -1,4 +1,4 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include <Geom_BSplineSurface.hxx>
@@ -1,4 +1,4 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include <BRepPrimAPI_MakePrism.hxx>
+2 -2
View File
@@ -27,7 +27,7 @@
#include <TopoDS_Wire.hxx>
#include <TopoDS_Face.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS_iterator.hxx>
#include <ShapeFix_Shape.hxx>
#include <ShapeFix_ShapeTolerance.hxx>
#include <BRep_Tool.hxx>
@@ -58,7 +58,7 @@
#include <BRepAdaptor_HCompCurve.hxx>
#endif
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "face_definition.h"
#include "wire_utils.h"
#include "base_utils.h"
@@ -3,7 +3,7 @@
#include <TopoDS.hxx>
#include <Geom_Line.hxx>
#include <BRep_Tool.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS_iterator.hxx>
/* Returns whether wire conforms to a polyhedron, i.e. only edges with linear curves*/
bool ifcopenshell::geom::util::is_polyhedron(const TopoDS_Wire & wire) {
@@ -1,6 +1,6 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "IfcGeomTree.h"
#include "tree.h"
#include "wire_utils.h"
namespace {
+2 -2
View File
@@ -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 <TopoDS.hxx>
#include <TopoDS_Solid.hxx>
#include <TopoDS_Shell.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS_iterator.hxx>
#include <TopExp_Explorer.hxx>
#include <Standard_Macro.hxx>
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef LAYERSET_H
#define LAYERSET_H
#include "../../ConversionResult.h"
#include "../../conversion_result.h"
#include <Geom_Surface.hxx>
#include <TopoDS_Shape.hxx>
+1 -1
View File
@@ -17,7 +17,7 @@
* *
********************************************************************************/
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "base_utils.h"
#include <TopExp.hxx>
+1 -1
View File
@@ -1,4 +1,4 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "wire_builder.h"
#include <Geom_Line.hxx>
+1 -1
View File
@@ -1,4 +1,4 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
using namespace ifcopenshell::geom;
using namespace ifcopenshell::geom::kernels;
@@ -10,10 +10,10 @@
#include <TopoDS_Compound.hxx>
#include <BRep_Builder.hxx>
#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"
@@ -31,7 +31,7 @@
#include <BRepAdaptor_Curve.hxx>
#include <GCPnts_QuasiUniformDeflection.hxx>
#include "../../../ifcgeom/ConversionResult.h"
#include "../../../ifcgeom/conversion_result.h"
#include "../../../ifcgeom/kernels/ifc_geomlibrary_api.h"
namespace ifcopenshell {
@@ -23,7 +23,7 @@
* *
********************************************************************************/
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "boolean_utils.h"
#include "base_utils.h"
@@ -41,18 +41,18 @@
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
#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 <typename Fn>
+1 -1
View File
@@ -18,7 +18,7 @@
********************************************************************************/
#include "../../kernel_plugin.h"
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include <boost/dll/alias.hpp>
+1 -1
View File
@@ -1,4 +1,4 @@
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "base_utils.h"
+1 -1
View File
@@ -17,7 +17,7 @@
* *
********************************************************************************/
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include <BRepPrimAPI_MakeHalfSpace.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
@@ -17,7 +17,7 @@
* *
********************************************************************************/
#include "OpenCascadeKernel.h"
#include "opencascade_kernel.h"
#include "base_utils.h"
#include "wire_utils.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 <NCollection_UBTree.hxx>
@@ -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 {
@@ -1,7 +1,7 @@
#include "wire_builder.h"
#include "../../../ifcparse/logger.h"
#include "../../../ifcgeom/ConversionSettings.h"
#include "../../../ifcgeom/conversion_settings.h"
#include <TopExp.hxx>
#include <TopoDS.hxx>
@@ -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 <TopExp.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS_iterator.hxx>
#include <ShapeFix_Wire.hxx>
#include <BRep_Tool.hxx>
#include <BRepTools_WireExplorer.hxx>
@@ -1,6 +1,6 @@
#include "PassthroughConversionResult.h"
#include "passthrough_conversion_result.h"
#include "../../../ifcgeom/IfcGeomRepresentation.h"
#include "../../../ifcgeom/representation.h"
#include <Eigen/Dense>
@@ -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 {
@@ -1,4 +1,4 @@
#include "PassthroughKernel.h"
#include "passthrough_kernel.h"
#include <Eigen/Dense>
@@ -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 {
+1 -1
View File
@@ -18,7 +18,7 @@
********************************************************************************/
#include "../../kernel_plugin.h"
#include "PassthroughKernel.h"
#include "passthrough_kernel.h"
#include <boost/dll/alias.hpp>
@@ -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())
@@ -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 <map>
@@ -2,7 +2,7 @@ set(geometry_serialization_plugin_runtime_dir "${CMAKE_CURRENT_BINARY_DIR}/$<CON
add_subdirectory(schema)
add_library(geometry_serializer Serialization.cpp opencascade_geometry_ifc_writer_plugin.cpp)
add_library(geometry_serializer serialization.cpp opencascade_geometry_ifc_writer_plugin.cpp)
target_include_directories(geometry_serializer PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
@@ -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(
@@ -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 <filesystem>
@@ -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}"
@@ -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"
@@ -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 <boost/algorithm/string/case_conv.hpp>
@@ -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"
@@ -1,4 +1,4 @@
#include "../ifcgeom/IfcGeomRenderStyles.h"
#include "../ifcgeom/render_styles.h"
#include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp>
+1 -1
View File
@@ -4,7 +4,7 @@
#include "../ifcparse/express.h"
#include "../ifcparse/logger.h"
#include "ConversionSettings.h"
#include "conversion_settings.h"
#include <boost/variant.hpp>
#include <boost/functional/hash.hpp>
@@ -4,7 +4,7 @@
#include <catch2/catch_test_macros.hpp>
#include "ifcgeom/Converter.h"
#include "ifcgeom/converter.h"
#include "ifcgeom/kernel_registry.h"
#include "ifcparse/hierarchy_helper.h"
#include "ifcparse/macros.h"
+1 -1
View File
@@ -19,7 +19,7 @@
#include "tree.h"
#include "Iterator.h"
#include "iterator.h"
#include "tree_registry.h"
#include "../ifcparse/exception.h"
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef IFCOPENSHELL_TREE_H
#define IFCOPENSHELL_TREE_H
#include "IfcGeomElement.h"
#include "element.h"
#include <array>
#include <cstdint>
+3 -3
View File
@@ -41,10 +41,10 @@
#include <fcntl.h>
#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"
+3 -3
View File
@@ -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;
@@ -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"]
@@ -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
+1 -1
View File
@@ -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 <Eigen/Dense>
+1 -1
View File
@@ -30,7 +30,7 @@
#include <mutex>
#include "../ifcparse/file.h"
#include "../ifcgeom/Iterator.h"
#include "../ifcgeom/iterator.h"
#include "InstancedGeometry.h"
+6 -6
View File
@@ -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"
+1 -1
View File
@@ -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
+15 -15
View File
@@ -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"
%}
%{
+9 -9
View File
@@ -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})
@@ -19,7 +19,7 @@
#ifdef WITH_OPENCOLLADA
#include "ColladaSerializer.h"
#include "collada_serializer.h"
#include <boost/foreach.hpp>
@@ -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 <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/io.hpp>
+1 -1
View File
@@ -18,7 +18,7 @@
********************************************************************************/
#include "document_serializer_plugin.h"
#include "RocksDbSerializer.h"
#include "rocks_db_serializer.h"
#ifdef IFOPSH_WITH_ROCKSDB
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -19,7 +19,7 @@
#ifdef WITH_OPENCOLLADA
#include "ColladaSerializer.h"
#include "collada_serializer.h"
#include "geometry_serializer_plugin.h"
#include <boost/dll/alias.hpp>
+1 -1
View File
@@ -20,7 +20,7 @@
#ifdef WITH_GLTF
#include "geometry_serializer_plugin.h"
#include "GltfSerializer.h"
#include "gltf_serializer.h"
#include <boost/dll/alias.hpp>
#include <boost/make_shared.hpp>

Some files were not shown because too many files have changed in this diff Show More