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

Append line segment indices in the IfcGeomServer

Browse Source
This commit is contained in:
Thomas Krijnen
2015-04-25 09:13:14 +00:00
parent c97cf661a2
commit b37a684eb9
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeomserver/IfcGeomServer.cpp
+32 -6
View File
@@ -187,6 +187,7 @@ public:
class Entity : public Command { class Entity : public Command {
private: private:
const IfcGeom::TriangulationElement<float>* geom; const IfcGeom::TriangulationElement<float>* geom;
bool append_line_data;
protected: protected:
void read_content(std::istream& s) {} void read_content(std::istream& s) {}
void write_content(std::ostream& s) { void write_content(std::ostream& s) {
@@ -206,11 +207,35 @@ protected:
swrite<int32_t>(s, geom->geometry().id()); swrite<int32_t>(s, geom->geometry().id());
swrite(s, std::string((char*)geom->geometry().verts().data(), geom->geometry().verts().size() * sizeof(float))); swrite(s, std::string((char*)geom->geometry().verts().data(), geom->geometry().verts().size() * sizeof(float)));
swrite(s, std::string((char*)geom->geometry().normals().data(), geom->geometry().normals().size() * sizeof(float))); swrite(s, std::string((char*)geom->geometry().normals().data(), geom->geometry().normals().size() * sizeof(float)));
{ std::vector<int32_t> indices; {
for (std::vector<int>::const_iterator it = geom->geometry().faces().begin(); it != geom->geometry().faces().end(); ++it) { std::vector<int32_t> indices;
indices.push_back(*it); const std::vector<int>& faces = geom->geometry().faces();
} indices.reserve(faces.size());
swrite(s, std::string((char*) indices.data(), indices.size() * sizeof(int32_t))); } for (std::vector<int>::const_iterator it = indices.begin(); it != indices.end(); ++it) {
indices.push_back(*it);
}
swrite(s, std::string((char*) indices.data(), indices.size() * sizeof(int32_t)));
if (append_line_data) {
std::vector<int32_t> lines;
std::set<int32_t> faces_set (indices.begin(), indices.end());
const std::vector<int>& edges = geom->geometry().edges();
for ( std::vector<int>::const_iterator it = edges.begin(); it != edges.end(); ) {
const int32_t i1 = *(it++);
const int32_t i2 = *(it++);
if (faces_set.find(i1) != faces_set.end() || faces_set.find(i2) != faces_set.end()) {
continue;
}
lines.push_back(i1);
lines.push_back(i2);
}
swrite(s, std::string((char*) lines.data(), lines.size() * sizeof(int32_t)));
}
}
{ std::vector<float> diffuse_color_array; { std::vector<float> diffuse_color_array;
for (std::vector<IfcGeom::Material>::const_iterator it = geom->geometry().materials().begin(); it != geom->geometry().materials().end(); ++it) { for (std::vector<IfcGeom::Material>::const_iterator it = geom->geometry().materials().begin(); it != geom->geometry().materials().end(); ++it) {
const IfcGeom::Material& m = *it; const IfcGeom::Material& m = *it;
@@ -238,7 +263,7 @@ protected:
swrite(s, std::string((char*) material_indices.data(), material_indices.size() * sizeof(int32_t))); } swrite(s, std::string((char*) material_indices.data(), material_indices.size() * sizeof(int32_t))); }
} }
public: public:
Entity(const IfcGeom::TriangulationElement<float>* geom) : Command(ENTITY), geom(geom) {}; Entity(const IfcGeom::TriangulationElement<float>* geom) : Command(ENTITY), geom(geom), append_line_data(true) {};
}; };
class Next : public Command { class Next : public Command {
@@ -297,6 +322,7 @@ int main (int argc, char** argv) {
settings.weld_vertices() = false; settings.weld_vertices() = false;
settings.convert_back_units() = true; settings.convert_back_units() = true;
settings.force_ccw_face_orientation() = true; settings.force_ccw_face_orientation() = true;
settings.include_curves() = true;
iterator = new IfcGeom::Iterator<float>(settings, data, len); iterator = new IfcGeom::Iterator<float>(settings, data, len);
has_more = iterator->initialize(); has_more = iterator->initialize();