Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-07 00:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve styles handling (partially support non-shading styles/fix bugs)

Browse Source 
1) Previously create_shape (was failing with "RuntimeError: Unexpected topology") or iterator (was hanging indefinetely trying initialize with a IfcSlab from #4898) were breaking if element had a material that had IfcSurfaceStyle with just IfcExternallyDefinedSurfaceStyle and no IfcSurfaceStyleShading.

Now get_surface_style is returning IfcSurfaceStyle as first element of the pair even if there was no IfcSurfaceStyleShading - so it can be used to create a `taxonomy::style::ptr` with it to indicate that geometry is still referring to some style.

2) Added logs for unsupported presentation styles (non-IfcSurfaceStyles) to both `mapping::map_impl(const IfcSchema::IfcStyledItem* inst)` and `mapping::map_impl(const IfcSchema::IfcMaterial* material)`. Also `map_impl` will not break now if it will meet IfcCurveStyle.
This commit is contained in:
Andrej730
2024-07-09 17:25:01 +05:00
parent 7e1eadf54c
commit 355cca3679
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/mapping/mapping.cpp
+27 -11
View File
@@ -399,9 +399,10 @@ namespace {
}
#endif
IfcSchema::IfcSurfaceStyle *surface_style = nullptr;
for (auto& style : prs_styles) {
if (style->declaration().is(IfcSchema::IfcSurfaceStyle::Class())) {
IfcSchema::IfcSurfaceStyle* surface_style = (IfcSchema::IfcSurfaceStyle*)style;
surface_style = (IfcSchema::IfcSurfaceStyle*)style;
if (surface_style->Side() != IfcSchema::IfcSurfaceSide::IfcSurfaceSide_NEGATIVE) {
auto styles_elements = surface_style->Styles();
for (auto mt = styles_elements->begin(); mt != styles_elements->end(); ++mt) {
@@ -412,8 +413,7 @@ namespace {
}
}
}
return std::make_pair<IfcSchema::IfcSurfaceStyle*, T*>(nullptr, nullptr);
return std::make_pair(surface_style, nullptr);
}
bool process_colour(IfcSchema::IfcColourRgb* colour, double* rgb) {
@@ -473,7 +473,16 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcMaterial* material) {
styles->push((**it).Items()->as<IfcSchema::IfcStyledItem>());
}
if (styles->size() == 1) {
return map(*styles->begin());
IfcSchema::IfcStyledItem *styled_item = *styles->begin();
auto mapped_item = map(styled_item);
if (mapped_item) {
return mapped_item;
}
// Check if it's failed or just some unsupported case.
if (failed_on_purpose_.find(styled_item) == failed_on_purpose_.end()) {
return nullptr;
}
Logger::Warning("Skipping unsupported material style for material: ", material);
}
}
@@ -500,25 +509,32 @@ taxonomy::ptr mapping::map_impl(const IfcSchema::IfcStyledItem* inst) {
IfcSchema::IfcSurfaceStyleShading* shading = style_pair.second;
if (style == nullptr) {
// @todo we should probably log something that the kind of style,
// such as IfcCurveStyle, in this collections are unsupported.
// E.g. IfcCurveStyle is skipped as unsupported.
Logger::Warning("Only IfcSurfaceStyle is supported, couldn't find it in IfcStyledItem: ", inst);
failed_on_purpose_.insert(inst);
return nullptr;
}
static taxonomy::colour white = taxonomy::colour(1., 1., 1.);
taxonomy::style::ptr surface_style = taxonomy::make<taxonomy::style>();
surface_style->instance = style;
if (settings_.get<settings::UseMaterialNames>().get() && style->Name()) {
surface_style->name = *style->Name();
} else {
std::ostringstream oss;
oss << shading->declaration().name() << "-" << shading->data().id();
if (shading) {
oss << shading->declaration().name() << "-" << shading->data().id();
} else {
oss << "-";
}
surface_style->name = oss.str();
}
if (shading == nullptr) {
// E.g. IfcSurface style has only IfcExternallyDefinedSurfaceStyle.
return surface_style;
}
static taxonomy::colour white = taxonomy::colour(1., 1., 1.);
double rgb[3];
if (process_colour(shading->SurfaceColour(), rgb)) {
surface_style->diffuse.components() << rgb[0], rgb[1], rgb[2];