Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-12 14:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefix array with tr1 to accomodate older compilers

Browse Source
This commit is contained in:
Thomas Krijnen
2013-05-13 07:12:42 +00:00
parent 1d1fd49608
commit 12a0571bf4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomObjects.cpp
+1
View File
@@ -18,6 +18,7 @@
********************************************************************************/ ********************************************************************************/
#include <map> #include <map>
#include <stdexcept>
#include <gp_Mat.hxx> #include <gp_Mat.hxx>
#include <gp_Mat2d.hxx> #include <gp_Mat2d.hxx>
src/ifcgeom/IfcGeomRenderStyles.cpp
+5 -5
View File
@@ -18,7 +18,7 @@
********************************************************************************/ ********************************************************************************/
#include <map> #include <map>
#include <array> #include <tr1/array>
#include "IfcGeomRenderStyles.h" #include "IfcGeomRenderStyles.h"
@@ -31,7 +31,7 @@ namespace IfcGeom {
} }
} }
bool process_colour(Ifc2x3::IfcColourRgb* colour, std::array<double, 3>& rgb) { bool process_colour(Ifc2x3::IfcColourRgb* colour, std::tr1::array<double, 3>& rgb) {
if (colour != 0) { if (colour != 0) {
rgb[0] = colour->Red(); rgb[0] = colour->Red();
rgb[1] = colour->Green(); rgb[1] = colour->Green();
@@ -40,7 +40,7 @@ bool process_colour(Ifc2x3::IfcColourRgb* colour, std::array<double, 3>& rgb) {
return colour != 0; return colour != 0;
} }
bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::array<double, 3>& rgb) { bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::tr1::array<double, 3>& rgb) {
if (factor != 0) { if (factor != 0) {
const double f = *factor->wrappedValue(); const double f = *factor->wrappedValue();
rgb[0] = rgb[1] = rgb[2] = f; rgb[0] = rgb[1] = rgb[2] = f;
@@ -48,7 +48,7 @@ bool process_colour(IfcUtil::IfcArgumentSelect* factor, std::array<double, 3>& r
return factor != 0; return factor != 0;
} }
bool process_colour(Ifc2x3::IfcColourOrFactor colour_or_factor, std::array<double, 3>& rgb) { bool process_colour(Ifc2x3::IfcColourOrFactor colour_or_factor, std::tr1::array<double, 3>& rgb) {
if (colour_or_factor == 0) { if (colour_or_factor == 0) {
return false; return false;
} else if (colour_or_factor->is(Ifc2x3::Type::IfcColourRgb)) { } else if (colour_or_factor->is(Ifc2x3::Type::IfcColourRgb)) {
@@ -76,7 +76,7 @@ const IfcGeom::SurfaceStyle* IfcGeom::get_style(Ifc2x3::IfcRepresentationItem* i
} else { } else {
surface_style = SurfaceStyle(surface_style_id); surface_style = SurfaceStyle(surface_style_id);
} }
std::array<double, 3> rgb; std::tr1::array<double, 3> rgb;
if (process_colour(shading_styles.second->SurfaceColour(), rgb)) { if (process_colour(shading_styles.second->SurfaceColour(), rgb)) {
surface_style.Diffuse().reset(SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2])); surface_style.Diffuse().reset(SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2]));
} }
src/ifcgeom/IfcGeomRenderStyles.h
+2 -2
View File
@@ -20,7 +20,7 @@
#ifndef IFCGEOMRENDERSTYLES_H #ifndef IFCGEOMRENDERSTYLES_H
#define IFCGEOMRENDERSTYLES_H #define IFCGEOMRENDERSTYLES_H
#include <array> #include <tr1/array>
#include "../ifcparse/Ifc2x3.h" #include "../ifcparse/Ifc2x3.h"
@@ -29,7 +29,7 @@ namespace IfcGeom {
public: public:
class ColorComponent { class ColorComponent {
private: private:
std::array<double, 3> data; std::tr1::array<double, 3> data;
public: public:
ColorComponent(double r, double g, double b) { ColorComponent(double r, double g, double b) {
data[0] = r; data[1] = g; data[2] = b; data[0] = r; data[1] = g; data[2] = b;