Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-23 04:29:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't write materials without diffuse color in geom server

Browse Source
This commit is contained in:
Thomas Krijnen
2019-10-15 10:38:49 +02:00
parent fa3431f983
commit f9b76ce022
1 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeomserver/IfcGeomServer.cpp
+44 -22
View File
@@ -344,31 +344,53 @@ protected:
swrite_array<int32_t>(s, lines); swrite_array<int32_t>(s, lines);
} }
} }
{ std::vector<float> diffuse_color_array; {
for (std::vector<IfcGeom::Material>::const_iterator it = geom->geometry().materials().begin(); it != geom->geometry().materials().end(); ++it) { // We remove the blanks here from the material array. I.e. materials without a diffuse color
const IfcGeom::Material& mat = *it; std::vector<boost::optional<std::array<float, 4> > > diffuse_color_array;
if (mat.hasDiffuse()) { for (std::vector<IfcGeom::Material>::const_iterator it = geom->geometry().materials().begin(); it != geom->geometry().materials().end(); ++it) {
const double* color = mat.diffuse(); const IfcGeom::Material& mat = *it;
diffuse_color_array.push_back(static_cast<float>(color[0])); if (mat.hasDiffuse()) {
diffuse_color_array.push_back(static_cast<float>(color[1])); const double* color = mat.diffuse();
diffuse_color_array.push_back(static_cast<float>(color[2])); diffuse_color_array.push_back(std::array<float, 4>{
} else { static_cast<float>(color[0]),
diffuse_color_array.push_back(0.f); static_cast<float>(color[1]),
diffuse_color_array.push_back(0.f); static_cast<float>(color[2]),
diffuse_color_array.push_back(0.f); mat.hasTransparency() ? static_cast<float>(1. - mat.transparency()) : 1.f
});
} else {
diffuse_color_array.emplace_back();
}
} }
if (mat.hasTransparency()) {
diffuse_color_array.push_back(static_cast<float>(1. - mat.transparency())); std::map<int, int> orig_to_condensed_index_map;
} else { std::vector<float> diffuse_color_array_condensed;
diffuse_color_array.push_back(1.f);
int new_index = 0;
for (int orig = 0; orig < diffuse_color_array.size(); ++orig) {
auto& m = diffuse_color_array[orig];
if (m) {
for (int i = 0; i < 4; ++i) {
diffuse_color_array_condensed.push_back((*m)[i]);
orig_to_condensed_index_map[orig] = new_index++;
}
}
} }
swrite(s, std::string((char*) diffuse_color_array_condensed.data(), diffuse_color_array_condensed.size() * sizeof(float)));
std::vector<int32_t> material_indices;
for (std::vector<int>::const_iterator it = geom->geometry().material_ids().begin(); it != geom->geometry().material_ids().end(); ++it) {
// @todo use something like std::equal_range() ?
auto jt = orig_to_condensed_index_map.find(*it);
if (jt == orig_to_condensed_index_map.end()) {
material_indices.push_back(-1);
} else {
material_indices.push_back(jt->second);
}
}
swrite(s, std::string((char*) material_indices.data(), material_indices.size() * sizeof(int32_t)));
} }
swrite(s, std::string((char*) diffuse_color_array.data(), diffuse_color_array.size() * sizeof(float))); }
{ std::vector<int32_t> material_indices;
for (std::vector<int>::const_iterator it = geom->geometry().material_ids().begin(); it != geom->geometry().material_ids().end(); ++it) {
material_indices.push_back(*it);
}
swrite(s, std::string((char*) material_indices.data(), material_indices.size() * sizeof(int32_t))); }
if (eext_) { if (eext_) {
eext_->write_contents(s); eext_->write_contents(s);
} }