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

Fixed bug in cylinders/cones

Browse Source
This commit is contained in:
Ken Arroyo Ohori
2017-03-03 13:12:05 -06:00
parent 7145b1ae85
commit c59ae03cb3
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalIfcGeomShapes.cpp
+7 -7
View File
@@ -623,15 +623,15 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRightCircularCylinder* l,
// Base // Base
face_list.push_back(cgal_face_t()); face_list.push_back(cgal_face_t());
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*3.141592653589793/((double)segments); double current_angle = current_segment*2.0*3.141592653589793/((double)segments);
face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0));
} }
// Side faces // Side faces
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*3.141592653589793/((double)segments); double current_angle = current_segment*2.0*3.141592653589793/((double)segments);
int next_segment = (current_segment+1)%segments; int next_segment = (current_segment+1)%segments;
double next_angle = next_segment*3.141592653589793/((double)segments); double next_angle = next_segment*2.0*3.141592653589793/((double)segments);
face_list.push_back(cgal_face_t()); face_list.push_back(cgal_face_t());
face_list.back().outer.push_back(Kernel::Point_3(r*cos(next_angle), r*sin(next_angle), 0)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(next_angle), r*sin(next_angle), 0));
face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0));
@@ -642,7 +642,7 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRightCircularCylinder* l,
// Top // Top
face_list.push_back(cgal_face_t()); face_list.push_back(cgal_face_t());
for (int current_segment = segments-1; current_segment >= 0; --current_segment) { for (int current_segment = segments-1; current_segment >= 0; --current_segment) {
double current_angle = current_segment*3.141592653589793/((double)segments); double current_angle = current_segment*2.0*3.141592653589793/((double)segments);
face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), h)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), h));
} }
@@ -681,15 +681,15 @@ bool IfcGeom::CgalKernel::convert(const IfcSchema::IfcRightCircularCone* l, cgal
// Base // Base
face_list.push_back(cgal_face_t()); face_list.push_back(cgal_face_t());
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*3.141592653589793/((double)segments); double current_angle = current_segment*2.0*3.141592653589793/((double)segments);
face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0));
} }
// Side faces // Side faces
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*3.141592653589793/((double)segments); double current_angle = current_segment*2.0*3.141592653589793/((double)segments);
int next_segment = (current_segment+1)%segments; int next_segment = (current_segment+1)%segments;
double next_angle = next_segment*3.141592653589793/((double)segments); double next_angle = next_segment*2.0*3.141592653589793/((double)segments);
face_list.push_back(cgal_face_t()); face_list.push_back(cgal_face_t());
face_list.back().outer.push_back(Kernel::Point_3(r*cos(next_angle), r*sin(next_angle), 0)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(next_angle), r*sin(next_angle), 0));
face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0)); face_list.back().outer.push_back(Kernel::Point_3(r*cos(current_angle), r*sin(current_angle), 0));