ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/oocnn.c
(Generate patch)

Comparing ray/src/rt/oocnn.c (file contents):
Revision 2.1 by rschregle, Tue May 17 17:39:47 2016 UTC vs.
Revision 2.3 by rschregle, Tue Mar 23 00:16:38 2021 UTC

# Line 1 | Line 1
1 + #ifndef lint
2 + static const char RCSid[] = "$Id$";
3 + #endif
4 +
5 +
6   /*
7     =========================================================================
8     k-nearest neighbour lookup routines for out-of-core octree data structure
# Line 11 | Line 16
16   */
17  
18  
19 + #if !defined(_WIN32) && !defined(_WIN64) || defined(PMAP_OOC)
20 + /* No Windoze support for now */
21  
22   #include "oocnn.h"
23   #include "oocsort.h"
# Line 199 | Line 206 | float OOC_FindNearest (OOC_Octree *oct, OOC_Node *node
206     for (kid0 = 0, i = 0; i < 3; i++)
207        kid0 |= (key [i] > org [i] + kidSize) << i;
208        
209 <   for (i = 0; i < 7; i++) {
209 >   for (i = 0; i < 8; i++) {
210        kid = kid0 ^ i;
211        kidNode = node;
212        kidDataIdx = dataIdx + OOC_GetKid(oct, &kidNode, kid);
# Line 272 | Line 279 | float OOC_Find1Nearest (OOC_Octree *oct, OOC_Node *nod
279     for (kid0 = 0, i = 0; i < 3; i++)
280        kid0 |= (key [i] > org [i] + kidSize) << i;
281        
282 <   for (i = 0; i < 7; i++) {
282 >   for (i = 0; i < 8; i++) {
283        kid = kid0 ^ i;
284        kidNode = node;
285        kidDataIdx = dataIdx + OOC_GetKid(oct, &kidNode, kid);
# Line 318 | Line 325 | float OOC_Find1Nearest (OOC_Octree *oct, OOC_Node *nod
325     return maxDist2;
326   }
327  
328 + #endif /* NIX / PMAP_OOC */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines