Revision: 50620
http://brlcad.svn.sourceforge.net/brlcad/?rev=50620&view=rev
Author: phoenixyjll
Date: 2012-05-21 13:55:56 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Fixed the bug of wrong id & od for pipe, by changing some prevp to curp.
Modified Paths:
--------------
brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp
Modified: brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp 2012-05-18
21:16:11 UTC (rev 50619)
+++ brlcad/trunk/src/librt/primitives/pipe/pipe_brep.cpp 2012-05-21
13:55:56 UTC (rev 50620)
@@ -215,7 +215,7 @@
plane_x_dir = ON_3dVector(x_dir);
plane_y_dir = ON_3dVector(y_dir);
endplane = new ON_Plane(plane_origin, plane_x_dir, plane_y_dir);
- generate_curves(prevp->pp_id, prevp->pp_od, endplane,
&endoutercurves, &endinnercurves);
+ generate_curves(curp->pp_id, curp->pp_od, endplane,
&endoutercurves, &endinnercurves);
make_linear_surfaces(b, &startoutercurves, &endoutercurves,
&startinnercurves, &endinnercurves);
break;
}
@@ -240,7 +240,7 @@
plane_x_dir = ON_3dVector(x_dir);
plane_y_dir = ON_3dVector(y_dir);
endplane = new ON_Plane(plane_origin, plane_x_dir,
plane_y_dir);
- generate_curves(prevp->pp_id, prevp->pp_od, endplane,
&endoutercurves, &endinnercurves);
+ generate_curves(curp->pp_id, curp->pp_od, endplane,
&endoutercurves, &endinnercurves);
make_linear_surfaces(b, &startoutercurves, &endoutercurves,
&startinnercurves, &endinnercurves);
VMOVE(current_point, curp->pp_coord);
} else {
@@ -261,7 +261,7 @@
plane_x_dir = ON_3dVector(x_dir);
plane_y_dir = ON_3dVector(y_dir);
endplane = new ON_Plane(plane_origin, plane_x_dir,
plane_y_dir);
- generate_curves(prevp->pp_id, prevp->pp_od, endplane,
&endoutercurves, &endinnercurves);
+ generate_curves(curp->pp_id, curp->pp_od, endplane,
&endoutercurves, &endinnercurves);
make_linear_surfaces(b, &startoutercurves, &endoutercurves,
&startinnercurves, &endinnercurves);
// Now do curved section
@@ -279,7 +279,7 @@
plane_x_dir = ON_3dVector(x_dir);
plane_y_dir = ON_3dVector(y_dir);
endplane = new ON_Plane(plane_origin, plane_x_dir,
plane_y_dir);
- generate_curves(prevp->pp_id, prevp->pp_od, endplane,
&startoutercurves, &startinnercurves);
+ generate_curves(curp->pp_id, curp->pp_od, endplane,
&startoutercurves, &startinnercurves);
VMOVE(current_point, bend_end);
}
@@ -301,7 +301,7 @@
plane_y_dir = ON_3dVector(y_dir);
endplane = new ON_Plane(plane_origin, plane_x_dir, plane_y_dir);
- generate_curves(prevp->pp_id, prevp->pp_od, endplane, &endoutercurves,
&endinnercurves);
+ generate_curves(curp->pp_id, curp->pp_od, endplane, &endoutercurves,
&endinnercurves);
ON_PlaneSurface* ebp = new ON_PlaneSurface();
ebp->m_plane = (*endplane);
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
