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

Comparing ray/src/rt/srcobstr.c (file contents):
Revision 2.8 by greg, Wed Sep 8 17:10:16 2004 UTC vs.
Revision 2.15 by greg, Sat Dec 12 00:03:42 2009 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11  
12   #include  "otspecial.h"
13  
14 + #include  "rtotypes.h"
15 +
16   #include  "source.h"
17  
18   #define ABS(x)  ((x)>0 ? (x) : -(x))
# Line 19 | Line 21 | static const char RCSid[] = "$Id$";
21   #if  SHADCACHE                  /* preemptive shadow checking */
22  
23  
24 + OBJECT *        antimodlist = NULL;     /* set of clipped materials */
25 +
26 +
27   static int                              /* cast source ray to first blocker */
28   castshadow(int sn, FVECT rorg, FVECT rdir)
29   {
# Line 27 | Line 32 | castshadow(int sn, FVECT rorg, FVECT rdir)
32          VCOPY(rt.rorg, rorg);
33          VCOPY(rt.rdir, rdir);
34          rt.rmax = 0;
35 <        rayorigin(&rt, NULL, PRIMARY, 1.0);
35 >        rayorigin(&rt, PRIMARY, NULL, NULL);
36                                          /* check for intersection */
37          while (localhit(&rt, &thescene)) {
38                  RAY     rt1 = rt;       /* pretend we were aimed at source */
# Line 175 | Line 180 | initobscache(int sn)
180   static OBJECT *                 /* return occluder cache entry */
181   srcobstructp(register RAY *r)
182   {
183 <        static unsigned long    lastrno = ~0;
183 >        static RNUMBER  lastrno = ~0;
184          static OBJECT   noobs;
185          static OBJECT   *lastobjp;
186          SRCREC          *srcp;
# Line 290 | Line 295 | srcblocker(register RAY *r)
295          if (r->robj == OVOID || objptr(r->robj) != r->ro ||
296                          isvolume(r->ro->otype))
297                  return(0);              /* don't record complex blockers */
298 +        if (r->rsrc < 0 || source[r->rsrc].so == r->ro)
299 +                return(0);              /* just a mistake, that's all */
300 +        if (antimodlist != NULL && inset(antimodlist, r->ro->omod))
301 +                return(0);              /* could be clipped */
302          m = findmaterial(r->ro);
303          if (m == NULL)
304                  return(0);              /* no material?! */
# Line 308 | Line 317 | srcblocked(RAY *r)
317  
318          if (obs == OVOID)
319                  return(0);
320 <        op = objptr(obs);               /* check for intersection */
321 <        return((*ofun[op->otype].funp)(op, r));
320 >        op = objptr(obs);               /* check blocker intersection */
321 >        if (!(*ofun[op->otype].funp)(op, r))
322 >                return(0);
323 >        if (source[r->rsrc].sflags & SDISTANT)
324 >                return(1);
325 >        op = source[r->rsrc].so;        /* check source intersection */
326 >        if (!(*ofun[op->otype].funp)(op, r))
327 >                return(1);
328 >        rayclear(r);
329 >        return(0);                      /* source in front */
330 > }
331 >
332 >
333 > void                            /* record potentially clipped materials */
334 > markclip(OBJREC *m)
335 > {
336 >        OBJECT  *set2add, *oldset;
337 >
338 >        m_clip(m, NULL);                /* initialize modifier list */
339 >        if ((set2add = (OBJECT *)m->os) == NULL || !set2add[0])
340 >                return;
341 >
342 >        if (antimodlist == NULL) {      /* start of list */
343 >                antimodlist = setsave(set2add);
344 >                return;
345 >        }
346 >                                        /* else add to previous list */
347 >        oldset = antimodlist;
348 >        antimodlist = (OBJECT *)malloc((oldset[0]+set2add[0]+1)*sizeof(OBJECT));
349 >        if (antimodlist == NULL)
350 >                error(SYSTEM, "out of memory in markclip");
351 >        setunion(antimodlist, oldset, set2add);
352 >        free((void *)oldset);
353 > }
354 >
355 >
356 > #else   /* SHADCACHE */
357 >
358 >
359 > void                            /* no-op also avoids linker warning */
360 > markclip(OBJREC *m)
361 > {
362 >        (void)m;
363   }
364  
365  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines