From 9ae55ab303ec366a255be214434282cfe5b5140a Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 6 Jun 2017 17:12:46 +0200 Subject: [PATCH] Small fixes to transformations --- src/ifcgeom/kernels/cgal/CgalConversionResult.h | 10 +++------- src/ifcgeom/kernels/cgal/CgalIfcGeomPrimitives.cpp | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.h b/src/ifcgeom/kernels/cgal/CgalConversionResult.h index b02e6e5c95..5ed715a50f 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionResult.h +++ b/src/ifcgeom/kernels/cgal/CgalConversionResult.h @@ -34,17 +34,13 @@ namespace IfcGeom { operator const cgal_placement_t& () { return trsf_; } virtual double Value(int i, int j) const { - // TODO: Check -// std::cout << "Getting CgalPlacement with i = " << i << " and j = " << j << std::endl; - return CGAL::to_double(trsf_.cartesian(i-1, j-1)); + return CGAL::to_double(trsf_.cartesian(i-1, j-1)); } virtual void Multiply(const ConversionResultPlacement* other) { - // TODO: Check - trsf_ = ((CgalPlacement *)other)->trsf_ * trsf_; + trsf_ = trsf_ * ((CgalPlacement *)other)->trsf_; } virtual void PreMultiply(const ConversionResultPlacement* other) { - // TODO: Check - trsf_ = trsf_ * ((CgalPlacement *)other)->trsf_; + trsf_ = ((CgalPlacement *)other)->trsf_ * trsf_; } virtual ConversionResultPlacement* clone() const { return new CgalPlacement(trsf_); diff --git a/src/ifcgeom/kernels/cgal/CgalIfcGeomPrimitives.cpp b/src/ifcgeom/kernels/cgal/CgalIfcGeomPrimitives.cpp index 34f5b6c10c..f91617f8f3 100644 --- a/src/ifcgeom/kernels/cgal/CgalIfcGeomPrimitives.cpp +++ b/src/ifcgeom/kernels/cgal/CgalIfcGeomPrimitives.cpp @@ -236,10 +236,9 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcCartesianTransformationOpe return true; } -bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcCartesianTransformationOperator2DnonUniform* l, cgal_placement_t& gtrsf) { +bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcCartesianTransformationOperator2DnonUniform* l, cgal_placement_t& trsf) { // IN_CACHE(IfcCartesianTransformationOperator2DnonUniform,l,cgal_placement_t,gtrsf) - cgal_placement_t trsf; cgal_point_t origin; cgal_direction_t axis1 (1.,0.,0.); cgal_direction_t axis2 (0.,1.,0.);