Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-12 06:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v0.6.0

Browse Source 
# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomShapes.cpp
#	src/serializers/ColladaSerializer.cpp
#	src/serializers/schema_dependent/XmlSerializer.cpp
This commit is contained in:
Thomas Krijnen
2018-09-04 13:23:11 +02:00
parent 4babe84941 c2f4c2cf74
commit 4d33ed5cb8
66 changed files with 550 additions and 113668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/ColladaSerializer.h
+5 -1
View File
@@ -189,7 +189,6 @@ private:
COLLADABU::NativeString filename;
COLLADASW::StreamWriter stream;
ColladaScene scene;
std::string differentiateSlabTypes(const IfcGeom::TriangulationElement<real_t>* o);
public:
/// @param double_precision Whether to use "double precision" (up to 16 decimals) or not (6 or 7 decimals).
ColladaExporter(const std::string& scene_name, const std::string& fn, ColladaSerializer *_serializer,
@@ -235,6 +234,11 @@ public:
unit_magnitude = magnitude;
}
void setFile(IfcParse::IfcFile*) {}
std::string object_id(const IfcGeom::Element<real_t>* o) /*override*/;
private:
static std::string differentiateSlabTypes(const IfcUtil::IfcBaseEntity* slab);
};
#endif