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

Comparing ray/src/common/modobject.c (file contents):
Revision 2.23 by greg, Sun Dec 8 20:48:15 2024 UTC vs.
Revision 2.24 by greg, Sat Jun 21 00:15:30 2025 UTC

# Line 30 | Line 30 | objndx(                                /* get object number from pointer */
30   )
31   {
32          int     i;
33        long    j;
33  
34 <        for (i = (nobjects-1)>>OBJBLKSHFT; i >= 0; i--) {
35 <                j = op - objblock[i];
36 <                if ((0 <= j) & (j < OBJBLKSIZ))
37 <                        return(((OBJECT)i<<OBJBLKSHFT) + (OBJECT)j);
38 <        }
34 >        for (i = (nobjects-1)>>OBJBLKSHFT; i >= 0; i--)
35 >                if ((objblock[i] <= op) & (op < objblock[i]+OBJBLKSIZ))
36 >                        return( ((OBJECT)i << OBJBLKSHFT) +
37 >                                        (OBJECT)(op - objblock[i]) );
38 >
39          return(OVOID);          /* not in our array -- may still be valid */
40   }
41  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines