Revision: 51297 http://brlcad.svn.sourceforge.net/brlcad/?rev=51297&view=rev Author: phoenixyjll Date: 2012-06-23 02:32:32 +0000 (Sat, 23 Jun 2012) Log Message: ----------- Add conditional logic to deal with spheres.
Modified Paths: -------------- brlcad/trunk/src/librt/primitives/part/part_brep.cpp Modified: brlcad/trunk/src/librt/primitives/part/part_brep.cpp =================================================================== --- brlcad/trunk/src/librt/primitives/part/part_brep.cpp 2012-06-22 21:53:12 UTC (rev 51296) +++ brlcad/trunk/src/librt/primitives/part/part_brep.cpp 2012-06-23 02:32:32 UTC (rev 51297) @@ -71,12 +71,14 @@ ON_NurbsSurface *part_nurbs_surf = ON_NurbsSurface::New(); part_surf->GetNurbForm(*part_nurbs_surf, 0.0); - (*b)->m_S.Append(part_nurbs_surf); - int surfindex = (*b)->m_S.Count(); - ON_BrepFace& face = (*b)->NewFace(surfindex - 1); - // (*b)->FlipFace(face); - int faceindex = (*b)->m_F.Count(); - (*b)->NewOuterLoop(faceindex-1); + if (!EQUAL(fabs(temp), ON_PI/2.0)) { + (*b)->m_S.Append(part_nurbs_surf); + int surfindex = (*b)->m_S.Count(); + ON_BrepFace& face = (*b)->NewFace(surfindex - 1); + // (*b)->FlipFace(face); + int faceindex = (*b)->m_F.Count(); + (*b)->NewOuterLoop(faceindex-1); + } vect_t minusH; VREVERSE(minusH, pip->part_H); @@ -94,12 +96,14 @@ ON_NurbsSurface *v_nurbs_surf = ON_NurbsSurface::New(); v_sph_surf->GetNurbForm(*v_nurbs_surf, 0.0); - (*b)->m_S.Append(v_nurbs_surf); - surfindex = (*b)->m_S.Count(); - face = (*b)->NewFace(surfindex - 1); - (*b)->FlipFace(face); - faceindex = (*b)->m_F.Count(); - (*b)->NewOuterLoop(faceindex-1); + if (!EQUAL(temp, -ON_PI/2.0)) { + (*b)->m_S.Append(v_nurbs_surf); + int surfindex = (*b)->m_S.Count(); + ON_BrepFace& face = (*b)->NewFace(surfindex - 1); + (*b)->FlipFace(face); + int faceindex = (*b)->m_F.Count(); + (*b)->NewOuterLoop(faceindex-1); + } ON_Plane hplane = ON_Plane(ON_3dPoint(origin), ON_3dPoint(pip->part_H), ON_3dPoint(r)); ON_Circle hcircle = ON_Circle(hplane, pip->part_hrad); @@ -116,12 +120,14 @@ ON_NurbsSurface *h_nurbs_surf = ON_NurbsSurface::New(); h_sph_surf->GetNurbForm(*h_nurbs_surf, 0.0); - (*b)->m_S.Append(h_nurbs_surf); - surfindex = (*b)->m_S.Count(); - ON_BrepFace& face2 = (*b)->NewFace(surfindex - 1); - (*b)->FlipFace(face2); - faceindex = (*b)->m_F.Count(); - (*b)->NewOuterLoop(faceindex-1); + if (!EQUAL(temp, ON_PI/2.0)) { + (*b)->m_S.Append(h_nurbs_surf); + int surfindex = (*b)->m_S.Count(); + ON_BrepFace& face2 = (*b)->NewFace(surfindex - 1); + (*b)->FlipFace(face2); + int faceindex = (*b)->m_F.Count(); + (*b)->NewOuterLoop(faceindex-1); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits