Revision: 55045
http://brlcad.svn.sourceforge.net/brlcad/?rev=55045&view=rev
Author: starseeker
Date: 2013-04-04 13:31:29 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
Rename function bn_coplanar_tri_tri_isect to bn_tri_tri_isect_coplanar
Modified Paths:
--------------
brlcad/trunk/include/bn.h
brlcad/trunk/src/libbn/tests/bn_coplanar_tri_tri_isect.c
brlcad/trunk/src/libbn/tri_tri.c
brlcad/trunk/src/librt/test_bot2nurbs.cpp
Modified: brlcad/trunk/include/bn.h
===================================================================
--- brlcad/trunk/include/bn.h 2013-04-04 12:23:17 UTC (rev 55044)
+++ brlcad/trunk/include/bn.h 2013-04-04 13:31:29 UTC (rev 55045)
@@ -4013,7 +4013,7 @@
* Journal of Graphics Tools, 2(2), 1997
*/
-BN_EXPORT extern int bn_coplanar_tri_tri_isect(point_t V0,
+BN_EXPORT extern int bn_tri_tri_isect_coplanar(point_t V0,
point_t V1,
point_t V2,
point_t U0,
Modified: brlcad/trunk/src/libbn/tests/bn_coplanar_tri_tri_isect.c
===================================================================
--- brlcad/trunk/src/libbn/tests/bn_coplanar_tri_tri_isect.c 2013-04-04
12:23:17 UTC (rev 55044)
+++ brlcad/trunk/src/libbn/tests/bn_coplanar_tri_tri_isect.c 2013-04-04
13:31:29 UTC (rev 55045)
@@ -60,7 +60,7 @@
sscanf(argv[7], "%d", &area_flag);
sscanf(argv[8], "%d", &expected_result);
- actual_result = bn_coplanar_tri_tri_isect(V0,V1,V2,U0,U1,U2,area_flag);
+ actual_result = bn_tri_tri_isect_coplanar(V0,V1,V2,U0,U1,U2,area_flag);
bu_log("result: %d\n", actual_result);
Modified: brlcad/trunk/src/libbn/tri_tri.c
===================================================================
--- brlcad/trunk/src/libbn/tri_tri.c 2013-04-04 12:23:17 UTC (rev 55044)
+++ brlcad/trunk/src/libbn/tri_tri.c 2013-04-04 13:31:29 UTC (rev 55045)
@@ -16,7 +16,7 @@
*
* Calculate whether two coplanar triangles intersect:
*
- * int bn_coplanar_tri_tri_isect(point_t V0, point_t V1, point_t V2,
+ * int bn_tri_tri_isect_coplanar(point_t V0, point_t V1, point_t V2,
* point_t U0, point_t U1, point_t U2,
* int area_flag)
* parameters: vertices of triangle 1: V0, V1, V2
@@ -175,7 +175,7 @@
}
-int bn_coplanar_tri_tri_isect(point_t V0, point_t V1, point_t V2,
+int bn_tri_tri_isect_coplanar(point_t V0, point_t V1, point_t V2,
point_t U0, point_t U1, point_t U2, int area_flag)
{
int ret;
Modified: brlcad/trunk/src/librt/test_bot2nurbs.cpp
===================================================================
--- brlcad/trunk/src/librt/test_bot2nurbs.cpp 2013-04-04 12:23:17 UTC (rev
55044)
+++ brlcad/trunk/src/librt/test_bot2nurbs.cpp 2013-04-04 13:31:29 UTC (rev
55045)
@@ -702,7 +702,7 @@
VSET(u0, onpt_u0.x, onpt_u0.y, onpt_u0.z);
VSET(u1, onpt_u1.x, onpt_u1.y, onpt_u1.z);
VSET(u2, onpt_u2.x, onpt_u2.y, onpt_u2.z);
- int overlap = bn_coplanar_tri_tri_isect(v0, v1, v2,
u0, u1, u2, 1);
+ int overlap = bn_tri_tri_isect_coplanar(v0, v1, v2,
u0, u1, u2, 1);
if (overlap) {
std::cout << "Patch " << (*p_it).first << "
overlap: (" << *sizet_it << "," << *ef_it2 << ")\n";
split_overlapping_patch(*sizet_it, *ef_it2,
(*p_it).first, patches, info);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
