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

Rounded rectangles work now, def must be before rectangles

Browse Source
This commit is contained in:
Ken Arroyo Ohori
2017-03-07 13:41:04 -06:00
parent 31d4de228a
commit 66048610e2
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalEntityMapping.h
+1 -1
View File
@@ -52,8 +52,8 @@ FACE(IfcArbitraryClosedProfileDef);
FACE(IfcCircleHollowProfileDef); FACE(IfcCircleHollowProfileDef);
FACE(IfcCircleProfileDef); FACE(IfcCircleProfileDef);
FACE(IfcFace); FACE(IfcFace);
FACE(IfcRectangleProfileDef);
FACE(IfcRoundedRectangleProfileDef); FACE(IfcRoundedRectangleProfileDef);
FACE(IfcRectangleProfileDef);
FACE(IfcTrapeziumProfileDef); FACE(IfcTrapeziumProfileDef);
FACE(IfcEllipseProfileDef); FACE(IfcEllipseProfileDef);
src/ifcgeom/kernels/cgal/CgalIfcGeomFaces.cpp
+11 -6
View File
@@ -43,6 +43,8 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRectangleProfileDef* l, cg
// TODO: Untested // TODO: Untested
bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRoundedRectangleProfileDef* l, cgal_face_t& face) { bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRoundedRectangleProfileDef* l, cgal_face_t& face) {
std::cout << "IfcRoundedRectangleProfileDef" << std::endl;
const double x = l->XDim() / 2.0f * getValue(GV_LENGTH_UNIT); const double x = l->XDim() / 2.0f * getValue(GV_LENGTH_UNIT);
const double y = l->YDim() / 2.0f * getValue(GV_LENGTH_UNIT); const double y = l->YDim() / 2.0f * getValue(GV_LENGTH_UNIT);
const double r = l->RoundingRadius() * getValue(GV_LENGTH_UNIT); const double r = l->RoundingRadius() * getValue(GV_LENGTH_UNIT);
@@ -73,14 +75,17 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRoundedRectangleProfileDef
for (int current_segment = 0; current_segment <= segments; ++current_segment) { for (int current_segment = 0; current_segment <= segments; ++current_segment) {
double current_angle = current_segment*0.5*3.141592653589793/((double)segments); double current_angle = current_segment*0.5*3.141592653589793/((double)segments);
face.outer.push_back(Kernel::Point_3(x-r+r*cos(current_angle), y-r+r*sin(current_angle), 0)); face.outer.push_back(Kernel::Point_3(x-r+r*cos(current_angle), y-r+r*sin(current_angle), 0));
} for (int current_segment = 0; current_segment <= segments; ++current_segment) { }
double current_angle = (0.5*3.141592653589793+current_segment*0.5*3.141592653589793)/((double)segments); for (int current_segment = 0; current_segment <= segments; ++current_segment) {
double current_angle = 0.5*3.141592653589793+current_segment*0.5*3.141592653589793/((double)segments);
face.outer.push_back(Kernel::Point_3(-x+r+r*cos(current_angle), y-r+r*sin(current_angle), 0)); face.outer.push_back(Kernel::Point_3(-x+r+r*cos(current_angle), y-r+r*sin(current_angle), 0));
} for (int current_segment = 0; current_segment <= segments; ++current_segment) { }
double current_angle = (1.0*3.141592653589793+current_segment*0.5*3.141592653589793)/((double)segments); for (int current_segment = 0; current_segment <= segments; ++current_segment) {
double current_angle = 1.0*3.141592653589793+current_segment*0.5*3.141592653589793/((double)segments);
face.outer.push_back(Kernel::Point_3(-x+r+r*cos(current_angle), -y+r+r*sin(current_angle), 0)); face.outer.push_back(Kernel::Point_3(-x+r+r*cos(current_angle), -y+r+r*sin(current_angle), 0));
} for (int current_segment = 0; current_segment <= segments; ++current_segment) { }
double current_angle = (1.5*3.141592653589793+current_segment*0.5*3.141592653589793)/((double)segments); for (int current_segment = 0; current_segment <= segments; ++current_segment) {
double current_angle = 1.5*3.141592653589793+current_segment*0.5*3.141592653589793/((double)segments);
face.outer.push_back(Kernel::Point_3(x-r+r*cos(current_angle), -y+r+r*sin(current_angle), 0)); face.outer.push_back(Kernel::Point_3(x-r+r*cos(current_angle), -y+r+r*sin(current_angle), 0));
} }
} }