Revision: 56556
http://sourceforge.net/p/brlcad/code/56556
Author: brlcad
Date: 2013-08-05 04:22:12 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
remove dead code
Modified Paths:
--------------
brlcad/trunk/src/librt/cut.c
brlcad/trunk/src/librt/primitives/arb8/arb8.c
Modified: brlcad/trunk/src/librt/cut.c
===================================================================
--- brlcad/trunk/src/librt/cut.c 2013-08-05 04:21:57 UTC (rev 56555)
+++ brlcad/trunk/src/librt/cut.c 2013-08-05 04:22:12 UTC (rev 56556)
@@ -393,13 +393,10 @@
nstart += shp->hg_bins[hindex];
nend += ehp->hg_bins[hindex];
pos += shp->hg_clumpsize;
-#if 1
- if (nstart < nu_sol_per_cell &&
- nend < nu_sol_per_cell) continue;
-#else
- if (nstart + nend < 2 * nu_sol_per_cell)
+
+ if (nstart < nu_sol_per_cell && nend < nu_sol_per_cell)
continue;
-#endif
+
/* End current interval, start new one */
nugnp->nu_axis[i][axi].nu_epos = pos;
nugnp->nu_axis[i][axi].nu_width =
@@ -465,28 +462,19 @@
++nend;
}
-#if 1
- if (nstart < nu_sol_per_cell &&
- nend < nu_sol_per_cell)
-#else
- if (nstart + nend < nu_sol_per_cell)
-#endif
- continue;
+ if (nstart < nu_sol_per_cell && nend < nu_sol_per_cell)
+ continue;
/* Don't make really teeny intervals. */
if (pos <= nugnp->nu_axis[i][axi].nu_spos
-#if 1
+ 1.0
-#endif
+ rtip->rti_tol.dist)
continue;
/* don't make any more cuts if we've gone
past the end. */
if (pos >= fromp->bn_max[i]
-#if 1
- 1.0
-#endif
- rtip->rti_tol.dist)
continue;
@@ -1465,7 +1453,6 @@
* terms, each box must be at least 1mm wide after cut.
*/
axis = AXIS(depth);
-#if 1
did_a_cut = 0;
for (i=0; i<3; i++, axis += 1) {
if (axis > Z) {
@@ -1488,18 +1475,6 @@
if (!did_a_cut) {
return;
}
-#else
- if (cutp->bn.bn_max[axis]-cutp->bn.bn_min[axis] < 2.0)
- return;
- if (rt_ct_old_assess(cutp, axis, &where, &offcenter) <= 0)
- return; /* not practical */
- if (rt_ct_box(rtip, cutp, axis, where, 0) == 0) {
- if (rt_ct_old_assess(cutp, AXIS(depth+1), &where, &offcenter) <= 0)
- return; /* not practical */
- if (rt_ct_box(rtip, cutp, AXIS(depth+1), where, 0) == 0)
- return; /* hopeless */
- }
-#endif
if (rt_ct_piececount(cutp->cn.cn_l) >= oldlen &&
rt_ct_piececount(cutp->cn.cn_r) >= oldlen) {
if (RT_G_DEBUG&DEBUG_CUTDETAIL)
Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c 2013-08-05 04:21:57 UTC
(rev 56555)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c 2013-08-05 04:22:12 UTC
(rev 56556)
@@ -1585,14 +1585,8 @@
/* Associate face geometry */
for (i=0; i < pa.pa_faces; i++) {
-#if 1
/* We already know the plane equations, this is fast */
nmg_face_g(fu[i], pa.pa_face[i].peqn);
-#else
- /* For the cautious, ensure topology and geometry match */
- if (nmg_fu_planeeqn(fu[i], tol) < 0)
- return -1; /* FAIL */
-#endif
}
/* Mark edges as real */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
