#ifdef away the two trailing precision arguments for gp_Trsf::SetValues() when OCC >= 6.8.0

This commit is contained in:
Thomas Krijnen
2015-02-06 12:49:53 +00:00
parent 79817341e0
commit d23dee551c
2 changed files with 12 additions and 5 deletions
@@ -46,8 +46,10 @@ void OpenCascadeBasedSerializer::write(const IfcGeom::BRepElement<double>* o) {
o_trsf.SetValues( o_trsf.SetValues(
matrix[0], matrix[3], matrix[6], matrix[ 9], matrix[0], matrix[3], matrix[6], matrix[ 9],
matrix[1], matrix[4], matrix[7], matrix[10], matrix[1], matrix[4], matrix[7], matrix[10],
matrix[2], matrix[5], matrix[8], matrix[11], matrix[2], matrix[5], matrix[8], matrix[11]
1e-5, 1e-5 #if OCC_VERSION_HEX < 0x60800
, Precision::Angular(), Precision::Confusion()
#endif
); );
gtrsf.PreMultiply(o_trsf); gtrsf.PreMultiply(o_trsf);
+8 -3
View File
@@ -545,9 +545,14 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcRectangularPyramid* l, TopoDS_
BRepPrimAPI_MakeWedge builder(dx, dz, dy, dx / 2., dy / 2., dx / 2., dy / 2.); BRepPrimAPI_MakeWedge builder(dx, dz, dy, dx / 2., dy / 2., dx / 2., dy / 2.);
gp_Trsf trsf1, trsf2; gp_Trsf trsf1, trsf2;
trsf2.SetValues(1, 0, 0, 0, trsf2.SetValues(
0, 0, 1, 0, 1, 0, 0, 0,
0, 1, 0, 0, Precision::Confusion(), Precision::Confusion()); 0, 0, 1, 0,
0, 1, 0, 0
#if OCC_VERSION_HEX < 0x60800
, Precision::Angular(), Precision::Confusion()
#endif
);
IfcGeom::Kernel::convert(l->Position(), trsf1); IfcGeom::Kernel::convert(l->Position(), trsf1);
shape = BRepBuilderAPI_Transform(builder.Solid(), trsf1 * trsf2); shape = BRepBuilderAPI_Transform(builder.Solid(), trsf1 * trsf2);