diff --git a/include/Algo/Export/exportPov.h b/include/Algo/Export/exportPov.h index 67acd12598a074b8ade320bd40aa47a57076fb98..0b97ad352cc8e66acf72e1ac1dc846d6c52a56a7 100644 --- a/include/Algo/Export/exportPov.h +++ b/include/Algo/Export/exportPov.h @@ -95,7 +95,7 @@ void exportMeshWire(std::ofstream& out, typename PFP::MAP& map, typename PFP::TV if(position[dd][0]!=position[map.phi1(dd)][0] || position[dd][1]!=position[map.phi1(dd)][1] || position[dd][2]!=position[map.phi1(dd)][2]) { out << "cylinder{ " << std::endl; out << "<" << position[dd][0] << "," << position[dd][2] << "," << position[dd][1] << ">," << std::endl; - out << "<" << position[map.phi1(dd)][0] << "," << position[map.phi1(dd)][2] << "," << position[map.phi1(dd)][1] << ">, 1.5" << std::endl; + out << "<" << position[map.phi1(dd)][0] << "," << position[map.phi1(dd)][2] << "," << position[map.phi1(dd)][1] << ">, 0.5" << std::endl; out << "}" << std::endl; } dd = map.phi1(dd); diff --git a/include/Geometry/intersection.hpp b/include/Geometry/intersection.hpp index f2d66d859306fd0f4f603c2c21976d987a49054e..d73e71eef60d0faaa3e3f7f89cc4046cbc629611 100644 --- a/include/Geometry/intersection.hpp +++ b/include/Geometry/intersection.hpp @@ -462,12 +462,12 @@ Intersection intersection2DSegmentSegment(const VEC3& PA, const VEC3& PB, const else Inter = VEC3((PA[0]*delta+vp1p2[0]*coeff)/delta,(PA[1]*delta+vp1p2[1]*coeff)/delta,(PA[2]*delta+vp1p2[2]*coeff)/delta); - //test if inter point is outside the edges - if( (Inter[0]PA[0] && Inter[0]>PB[0]) - || (Inter[0]QA[0] && Inter[0]>QB[0]) - || (Inter[1]PA[1] && Inter[1]>PB[1]) - || (Inter[1]QA[1] && Inter[1]>QB[1]) + if( + (Inter[0]PA[0] && Inter[0]>PB[0]) || + (Inter[0]QA[0] && Inter[0]>QB[0]) || + (Inter[1]PA[1] && Inter[1]>PB[1]) || + (Inter[1]QA[1] && Inter[1]>QB[1]) ) return NO_INTERSECTION;