Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-27 10:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Schema dependent serializers

Browse Source
This commit is contained in:
Thomas Krijnen
2018-03-16 13:49:11 +01:00
parent d374fd3778
commit 834780b726
11 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CMakeLists.txt
+9 -7
View File
@@ -430,6 +430,10 @@ ElSE()
endif() endif()
ENDIF() ENDIF()
if (IFCCONVERT_DOUBLE_PRECISION)
SET(CONVERT_PRECISION "-DIFCCONVERT_DOUBLE_PRECISION")
endif()
INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS} INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
${ICU_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${ICU_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}
) )
@@ -554,7 +558,7 @@ if(NOT MSVC)
endif() endif()
endif() endif()
set(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom_ifc2x3 IfcGeom_ifc4 IfcGeom IfcGeom_ifc2x3 IfcGeom_ifc4 IfcGeom Serializers_ifc2x3 Serializers_ifc4 IfcGeom Serializers_ifc2x3 Serializers_ifc4 IfcGeom) set(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom_ifc2x3 IfcGeom_ifc4 IfcGeom IfcGeom_ifc2x3 IfcGeom_ifc4 IfcGeom Serializers_ifc2x3 Serializers_ifc4 Serializers Serializers_ifc2x3 Serializers_ifc4 Serializers)
# IfcParse # IfcParse
file(GLOB IFCPARSE_H_FILES ../src/ifcparse/*.h) file(GLOB IFCPARSE_H_FILES ../src/ifcparse/*.h)
@@ -603,15 +607,15 @@ set(SERIALIZERS_S_FILES ${SERIALIZERS_S_H_FILES} ${SERIALIZERS_S_CPP_FILES})
add_library(Serializers_ifc2x3 ${SERIALIZERS_S_FILES}) add_library(Serializers_ifc2x3 ${SERIALIZERS_S_FILES})
add_library(Serializers_ifc4 ${SERIALIZERS_S_FILES}) add_library(Serializers_ifc4 ${SERIALIZERS_S_FILES})
set_target_properties(Serializers_ifc2x3 PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc2x3") set_target_properties(Serializers_ifc2x3 PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc2x3 ${CONVERT_PRECISION}")
# TODO: Detect based on IfcSchema # TODO: Detect based on IfcSchema
set_target_properties(Serializers_ifc4 PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc4 -DUSE_IFC4") set_target_properties(Serializers_ifc4 PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc4 -DUSE_IFC4 ${CONVERT_PRECISION}")
TARGET_LINK_LIBRARIES(Serializers_ifc2x3 IfcGeom ${OPENCASCADE_LIBRARIES}) TARGET_LINK_LIBRARIES(Serializers_ifc2x3 IfcGeom ${OPENCASCADE_LIBRARIES})
TARGET_LINK_LIBRARIES(Serializers_ifc4 IfcGeom ${OPENCASCADE_LIBRARIES}) TARGET_LINK_LIBRARIES(Serializers_ifc4 IfcGeom ${OPENCASCADE_LIBRARIES})
add_library(Serializers ${SERIALIZERS_FILES}) add_library(Serializers ${SERIALIZERS_FILES})
set_target_properties(Serializers PROPERTIES COMPILE_FLAGS -DIFC_GEOM_EXPORTS) set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS ${CONVERT_PRECISION}")
TARGET_LINK_LIBRARIES(Serializers Serializers_ifc2x3 Serializers_ifc4) TARGET_LINK_LIBRARIES(Serializers Serializers_ifc2x3 Serializers_ifc4)
@@ -621,9 +625,7 @@ if(BUILD_CONVERT)
file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h) file(GLOB IFCCONVERT_H_FILES ../src/ifcconvert/*.h)
set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES}) set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
ADD_EXECUTABLE(IfcConvert ${IFCCONVERT_FILES}) ADD_EXECUTABLE(IfcConvert ${IFCCONVERT_FILES})
if (IFCCONVERT_DOUBLE_PRECISION) set_target_properties(IfcConvert PROPERTIES COMPILE_FLAGS "${CONVERT_PRECISION}")
set_target_properties(IfcConvert PROPERTIES COMPILE_FLAGS -DIFCCONVERT_DOUBLE_PRECISION)
endif()
TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${ICU_LIBRARIES}) TARGET_LINK_LIBRARIES(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${ICU_LIBRARIES})
if ((NOT WIN32) AND BUILD_SHARED_LIBS) if ((NOT WIN32) AND BUILD_SHARED_LIBS)
src/ifcconvert/IfcConvert.cpp
+5 -5
View File
@@ -26,11 +26,11 @@
* * * *
********************************************************************************/ ********************************************************************************/
#include "../ifcconvert/ColladaSerializer.h" #include "../serializers/ColladaSerializer.h"
#include "../ifcconvert/IgesSerializer.h" #include "../serializers/IgesSerializer.h"
#include "../ifcconvert/StepSerializer.h" #include "../serializers/StepSerializer.h"
#include "../ifcconvert/WavefrontObjSerializer.h" #include "../serializers/WavefrontObjSerializer.h"
#include "../ifcconvert/SvgSerializer.h" #include "../serializers/SvgSerializer.h"
#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
src/ifcgeom_schema_agnostic/Kernel.h
+11 -11
View File
@@ -12,17 +12,17 @@
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
namespace IfcGeom { namespace {
// LayerAssignments renamed from plural to singular, LayerAssignment, so work around that
namespace impl { IfcEntityList::ptr getLayerAssignments(Ifc2x3::IfcRepresentationItem* item) {
// LayerAssignments renamed from plural to singular, LayerAssignment, so work around that return item->LayerAssignments()->generalize();
IfcEntityList::ptr getLayerAssignments(Ifc2x3::IfcRepresentationItem* item) {
return item->LayerAssignments()->generalize();
}
IfcEntityList::ptr getLayerAssignments(Ifc4::IfcRepresentationItem* item) {
return item->LayerAssignment()->generalize();
}
} }
IfcEntityList::ptr getLayerAssignments(Ifc4::IfcRepresentationItem* item) {
return item->LayerAssignment()->generalize();
}
}
namespace IfcGeom {
template <typename T> template <typename T>
class BRepElement; class BRepElement;
@@ -110,7 +110,7 @@ namespace IfcGeom {
Schema::IfcRepresentationItem::list::ptr items = r->as<Schema::IfcRepresentationItem>(); Schema::IfcRepresentationItem::list::ptr items = r->as<Schema::IfcRepresentationItem>();
for (Schema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) { for (Schema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) {
Schema::IfcPresentationLayerAssignment::list::ptr a = impl::getLayerAssignments(*it)->as<Schema::IfcPresentationLayerAssignment>(); Schema::IfcPresentationLayerAssignment::list::ptr a = getLayerAssignments(*it)->as<Schema::IfcPresentationLayerAssignment>();
for (Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) { for (Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
layers[(*jt)->Name()] = *jt; layers[(*jt)->Name()] = *jt;
} }
src/serializers/ColladaSerializer.h
+2 -2
View File
@@ -43,7 +43,7 @@
#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
#include "../ifcconvert/GeometrySerializer.h" #include "../serializers/GeometrySerializer.h"
#include <boost/numeric/ublas/matrix.hpp> #include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/io.hpp> #include <boost/numeric/ublas/io.hpp>
@@ -86,7 +86,7 @@ private:
const std::string scene_id; const std::string scene_id;
bool scene_opened; bool scene_opened;
std::stack<COLLADASW::Node*> parentNodes; std::stack<COLLADASW::Node*> parentNodes;
std::stack<IfcGeom::Transformation<double> > matrixStack; std::stack<IfcGeom::Transformation<real_t> > matrixStack;
public: public:
ColladaScene(const std::string& scene_id, COLLADASW::StreamWriter& stream, ColladaSerializer *_serializer) ColladaScene(const std::string& scene_id, COLLADASW::StreamWriter& stream, ColladaSerializer *_serializer)
: COLLADASW::LibraryVisualScenes(&stream) : COLLADASW::LibraryVisualScenes(&stream)
src/serializers/GeometrySerializer.h
+1 -1
View File
@@ -26,7 +26,7 @@ typedef double real_t;
typedef float real_t; typedef float real_t;
#endif #endif
#include "../ifcconvert/Serializer.h" #include "../serializers/Serializer.h"
#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
#include "../ifcgeom/IfcGeomElement.h" #include "../ifcgeom/IfcGeomElement.h"
src/serializers/OpenCascadeBasedSerializer.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
#include "../ifcconvert/GeometrySerializer.h" #include "../serializers/GeometrySerializer.h"
class OpenCascadeBasedSerializer : public GeometrySerializer { class OpenCascadeBasedSerializer : public GeometrySerializer {
OpenCascadeBasedSerializer(const OpenCascadeBasedSerializer&); //N/A OpenCascadeBasedSerializer(const OpenCascadeBasedSerializer&); //N/A
src/serializers/StepSerializer.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
#include "../ifcconvert/OpenCascadeBasedSerializer.h" #include "../serializers/OpenCascadeBasedSerializer.h"
class StepSerializer : public OpenCascadeBasedSerializer class StepSerializer : public OpenCascadeBasedSerializer
{ {
src/serializers/SvgSerializer.h
+2 -2
View File
@@ -22,8 +22,8 @@
#ifndef SVGSERIALIZER_H #ifndef SVGSERIALIZER_H
#define SVGSERIALIZER_H #define SVGSERIALIZER_H
#include "../ifcconvert/GeometrySerializer.h" #include "../serializers/GeometrySerializer.h"
#include "../ifcconvert/util.h" #include "../serializers/util.h"
#include <sstream> #include <sstream>
#include <string> #include <string>
src/serializers/WavefrontObjSerializer.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include <string> #include <string>
#include <fstream> #include <fstream>
#include "../ifcconvert/GeometrySerializer.h" #include "../serializers/GeometrySerializer.h"
// http://people.sc.fsu.edu/~jburkardt/txt/obj_format.txt // http://people.sc.fsu.edu/~jburkardt/txt/obj_format.txt
class WaveFrontOBJSerializer : public GeometrySerializer { class WaveFrontOBJSerializer : public GeometrySerializer {
src/ifcconvert/util.cpp → src/serializers/util.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <set> #include <set>
#include <iostream> #include <iostream>
#include "../ifcconvert/util.h" #include "../serializers/util.h"
using namespace util; using namespace util;
src/ifcconvert/util.h → src/serializers/util.h
View File