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

Don't rely on operator bool() but on bool operator!() for truthiness of boost::optionals. Fixes compilation with boost 1.56+.

Browse Source
This commit is contained in:
Thomas Krijnen
2015-01-16 13:24:40 +00:00
parent 53c95db28f
commit 414b761453
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomObjects.cpp
+4 -4
View File
@@ -812,10 +812,10 @@ IfcParse::IfcFile* IfcGeomObjects::GetFile() {
static double black[3] = {0,0,0}; static double black[3] = {0,0,0};
IfcGeomObjects::Material::Material(const IfcGeom::SurfaceStyle* style) : style(style) {} IfcGeomObjects::Material::Material(const IfcGeom::SurfaceStyle* style) : style(style) {}
bool IfcGeomObjects::Material::hasDiffuse() const { return style->Diffuse(); } bool IfcGeomObjects::Material::hasDiffuse() const { return style->Diffuse() ? true : false; }
bool IfcGeomObjects::Material::hasSpecular() const { return style->Specular(); } bool IfcGeomObjects::Material::hasSpecular() const { return style->Specular() ? true : false; }
bool IfcGeomObjects::Material::hasTransparency() const { return style->Transparency(); } bool IfcGeomObjects::Material::hasTransparency() const { return style->Transparency() ? true : false; }
bool IfcGeomObjects::Material::hasSpecularity() const { return style->Specularity(); } bool IfcGeomObjects::Material::hasSpecularity() const { return style->Specularity() ? true : false; }
const double* IfcGeomObjects::Material::diffuse() const { if (hasDiffuse()) return &((*style->Diffuse()).R()); else return black; } const double* IfcGeomObjects::Material::diffuse() const { if (hasDiffuse()) return &((*style->Diffuse()).R()); else return black; }
const double* IfcGeomObjects::Material::specular() const { if (hasSpecular()) return &((*style->Specular()).R()); else return black; } const double* IfcGeomObjects::Material::specular() const { if (hasSpecular()) return &((*style->Specular()).R()); else return black; }
double IfcGeomObjects::Material::transparency() const { if (hasTransparency()) return *style->Transparency(); else return 0; } double IfcGeomObjects::Material::transparency() const { if (hasTransparency()) return *style->Transparency(); else return 0; }