Revision: 56134
          http://sourceforge.net/p/brlcad/code/56134
Author:   brlcad
Date:     2013-07-19 19:05:52 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
revert r56106 as it breaks the nirt regression.  hit results seem to be shifted 
by the distance introduced in that change, which increased the bounding box by 
2 times the distance tolerance.

Revision Links:
--------------
    http://sourceforge.net/p/brlcad/code/56106

Modified Paths:
--------------
    brlcad/trunk/src/librt/prep.c

Modified: brlcad/trunk/src/librt/prep.c
===================================================================
--- brlcad/trunk/src/librt/prep.c       2013-07-19 19:01:48 UTC (rev 56133)
+++ brlcad/trunk/src/librt/prep.c       2013-07-19 19:05:52 UTC (rev 56134)
@@ -204,7 +204,6 @@
     register int i;
     struct resource *resp;
     vect_t diag;
-    fastf_t dist2;
 
     RT_CK_RTI(rtip);
 
@@ -255,13 +254,12 @@
      * Enlarge the model RPP just slightly, to avoid nasty effects
      * with a solid's face being exactly on the edge
      */
-    dist2 = 2.0 * rtip->rti_tol.dist;
-    rtip->mdl_min[X] -= dist2;
-    rtip->mdl_min[Y] -= dist2;
-    rtip->mdl_min[Z] -= dist2;
-    rtip->mdl_max[X] += dist2;
-    rtip->mdl_max[Y] += dist2;
-    rtip->mdl_max[Z] += dist2;
+    rtip->mdl_min[X] = floor(rtip->mdl_min[X]);
+    rtip->mdl_min[Y] = floor(rtip->mdl_min[Y]);
+    rtip->mdl_min[Z] = floor(rtip->mdl_min[Z]);
+    rtip->mdl_max[X] = ceil(rtip->mdl_max[X]);
+    rtip->mdl_max[Y] = ceil(rtip->mdl_max[Y]);
+    rtip->mdl_max[Z] = ceil(rtip->mdl_max[Z]);
 
     /* Compute radius of a model bounding sphere */
     VSUB2(diag, rtip->mdl_max, rtip->mdl_min);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to