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

IfcGeomServer, small fixes: refrain from using auto type and restore std::cout rdbuf on exit so implicit flush doesn't segfault

Browse Source
This commit is contained in:
aothms
2014-04-06 12:50:51 +00:00
parent 64f88cbf25
commit 9a75a1f12d
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeomserver/IfcGeomServer.cpp
+19 -8
View File
@@ -206,7 +206,7 @@ protected:
swrite(s, std::string((char*) indices.data(), indices.size() * sizeof(int32_t))); } swrite(s, std::string((char*) indices.data(), indices.size() * sizeof(int32_t))); }
{ std::vector<float> diffuse_color_array; { std::vector<float> diffuse_color_array;
for (std::vector<IfcGeomObjects::Material>::const_iterator it = geom->mesh().materials().begin(); it != geom->mesh().materials().end(); ++it) { for (std::vector<IfcGeomObjects::Material>::const_iterator it = geom->mesh().materials().begin(); it != geom->mesh().materials().end(); ++it) {
const auto& m = *it; const IfcGeomObjects::Material& m = *it;
if (m.hasDiffuse()) { if (m.hasDiffuse()) {
const double* color = m.diffuse(); const double* color = m.diffuse();
diffuse_color_array.push_back(static_cast<float>(color[0])); diffuse_color_array.push_back(static_cast<float>(color[0]));
@@ -272,6 +272,8 @@ int main (int argc, char** argv) {
bool has_more = false; bool has_more = false;
Hello().write(std::cout); Hello().write(std::cout);
int exit_code = 0;
while (1) { while (1) {
const int32_t msg_type = sread<int32_t>(std::cin); const int32_t msg_type = sread<int32_t>(std::cin);
switch (msg_type) { switch (msg_type) {
@@ -288,14 +290,17 @@ int main (int argc, char** argv) {
has_more = IfcGeomObjects::Init(data, len); has_more = IfcGeomObjects::Init(data, len);
More(has_more).write(std::cout); More(has_more).write(std::cout);
break; continue;
} }
case GET: { case GET: {
Get g; g.read(std::cin); Get g; g.read(std::cin);
if (!has_more) return 1; if (!has_more) {
exit_code = 1;
break;
}
const IfcGeomObjects::IfcGeomObject* geom = IfcGeomObjects::Get(); const IfcGeomObjects::IfcGeomObject* geom = IfcGeomObjects::Get();
Entity(geom).write(std::cout); Entity(geom).write(std::cout);
break; continue;
} }
case NEXT: { case NEXT: {
Next n; n.read(std::cin); Next n; n.read(std::cin);
@@ -304,18 +309,24 @@ int main (int argc, char** argv) {
IfcGeomObjects::CleanUp(); IfcGeomObjects::CleanUp();
} }
More(has_more).write(std::cout); More(has_more).write(std::cout);
break; continue;
} }
case GET_LOG: { case GET_LOG: {
GetLog gl; gl.read(std::cin); GetLog gl; gl.read(std::cin);
WriteLog(IfcGeomObjects::GetLog()).write(std::cout); WriteLog(IfcGeomObjects::GetLog()).write(std::cout);
break; continue;
} }
case BYE: { case BYE: {
Bye().write(std::cout); Bye().write(std::cout);
return 0; exit_code = 0;
break;
} }
default: return 1; default:
exit_code = 1;
break;
} }
break;
} }
std::cout.rdbuf(stdout_orig);
return exit_code;
} }