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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.108 by greg, Tue May 14 17:39:10 2019 UTC vs.
Revision 2.117 by greg, Sat Jan 28 19:08:56 2023 UTC

# Line 22 | Line 22 | static const char      RCSid[] = "$Id$";
22   #define  OCTSCALE       1.0     /* ceil((valid rad.)/(cube size)) */
23   #endif
24  
25 – extern char  *shm_boundary;     /* memory sharing boundary */
26 –
25   #ifndef  MAXASET
26   #define  MAXASET        4095    /* maximum number of elements in ambient set */
27   #endif
# Line 37 | Line 35 | static AMBTREE atrunk;         /* our ambient trunk node */
35   static FILE  *ambfp = NULL;     /* ambient file pointer */
36   static int  nunflshed = 0;      /* number of unflushed ambient values */
37  
40 – #ifndef SORT_THRESH
41 – #ifdef SMLMEM
42 – #define SORT_THRESH     ((16L<<20)/sizeof(AMBVAL))
43 – #else
44 – #define SORT_THRESH     ((64L<<20)/sizeof(AMBVAL))
45 – #endif
46 – #endif
47 – #ifndef SORT_INTVL
48 – #define SORT_INTVL      (SORT_THRESH<<1)
49 – #endif
50 – #ifndef MAX_SORT_INTVL
51 – #define MAX_SORT_INTVL  (SORT_INTVL<<6)
52 – #endif
53 –
54 –
38   static double  avsum = 0.;              /* computed ambient value sum (log) */
39   static unsigned int  navsum = 0;        /* number of values in avsum */
40   static unsigned int  nambvals = 0;      /* total number of indirect values */
41   static unsigned int  nambshare = 0;     /* number of values from file */
59 – static unsigned long  ambclock = 0;     /* ambient access clock */
60 – static unsigned long  lastsort = 0;     /* time of last value sort */
61 – static long  sortintvl = SORT_INTVL;    /* time until next sort */
42   static FILE  *ambinp = NULL;            /* auxiliary file for input */
43   static long  lastpos = -1;              /* last flush position */
44  
65 – #define MAXACLOCK       (1L<<30)        /* clock turnover value */
66 –        /*
67 –         * Track access times unless we are sharing ambient values
68 –         * through memory on a multiprocessor, when we want to avoid
69 –         * claiming our own memory (copy on write).  Go ahead anyway
70 –         * if more than two thirds of our values are unshared.
71 –         * Compile with -Dtracktime=0 to turn this code off.
72 –         */
73 – #ifndef tracktime
74 – #define tracktime       (shm_boundary == NULL || nambvals > 3*nambshare)
75 – #endif
76 –
45   #define  AMBFLUSH       (BUFSIZ/AMBVALSIZ)
46  
47   #define  newambval()    (AMBVAL *)malloc(sizeof(AMBVAL))
48  
49 < #define  tfunc(lwr, x, upr)     (((x)-(lwr))/((upr)-(lwr)))
49 > #define  tfunc(x0, x, x1)       (((x)-(x0))/((x1)-(x0)))
50  
51   static void initambfile(int creat);
52   static void avsave(AMBVAL *av);
# Line 88 | Line 56 | static void freeambtree(AMBTREE  *atp);
56  
57   typedef void unloadtf_t(AMBVAL *);
58   static unloadtf_t avinsert;
91 – static unloadtf_t av2list;
59   static unloadtf_t avfree;
60   static void unloadatree(AMBTREE  *at, unloadtf_t *f);
61  
62 < static int aposcmp(const void *avp1, const void *avp2);
96 < static int avlmemi(AMBVAL *avaddr);
97 < static void sortambvals(int always);
62 > static void sortambvals(void);
63  
64   static int      plugaleak(RAY *r, AMBVAL *ap, FVECT anorm, double ang);
65   static double   sumambient(COLOR acol, RAY *r, FVECT rn, int al,
# Line 142 | Line 107 | setambacc(                             /* set ambient accuracy */
107          if (fabs(newa - olda) >= .05*(newa + olda)) {
108                  ambacc = newa;
109                  if (ambacc > FTINY && nambvals > 0)
110 <                        sortambvals(1);         /* rebuild tree */
110 >                        sortambvals();          /* rebuild tree */
111          }
112   }
113  
# Line 229 | Line 194 | ambdone(void)                  /* close ambient file and free memory
194          navsum = 0;
195          nambvals = 0;
196          nambshare = 0;
232 –        ambclock = 0;
233 –        lastsort = 0;
234 –        sortintvl = SORT_INTVL;
197   }
198  
199  
# Line 272 | Line 234 | multambient(           /* compute ambient component & multiply
234          FVECT  nrm
235   )
236   {
237 +        static double  logAvgAbsorp = 1;
238          static int  rdepth = 0;                 /* ambient recursion */
239          COLOR   acol, caustic;
240          int     i, ok;
# Line 283 | Line 246 | multambient(           /* compute ambient component & multiply
246          if (ambPmap(aval, r, rdepth))
247                  return;
248  
249 +        if (logAvgAbsorp > 0)                   /* exclude in -aw to avoid growth */
250 +                logAvgAbsorp = log(1.-AVGREFL);
251 +
252          /* PMAP: Factor in specular-diffuse ambient (caustics) from photon
253           * map, if enabled and ray is primary, else caustic is zero.  Continue
254           * with RADIANCE ambient calculation */
# Line 327 | Line 293 | multambient(           /* compute ambient component & multiply
293                  addcolor(aval, caustic);
294                  return;
295          }
330 –
331 –        if (tracktime)                          /* sort to minimize thrashing */
332 –                sortambvals(0);
296                                                  /* interpolate ambient value */
297          setcolor(acol, 0.0, 0.0, 0.0);
298          d = sumambient(acol, r, nrm, rdepth,
# Line 368 | Line 331 | dumbamb:                                       /* return global value */
331          
332          l = bright(ambval);                     /* average in computations */  
333          if (l > FTINY) {
334 <                d = (log(l)*(double)ambvwt + avsum) /
334 >                d = (log(l)*(double)ambvwt + avsum + logAvgAbsorp*navsum) /
335                                  (double)(ambvwt + navsum);
336                  d = exp(d) / l;
337                  scalecolor(aval, d);
338                  multcolor(aval, ambval);        /* apply color of ambval */
339          } else {
340 <                d = exp( avsum / (double)navsum );
340 >                d = exp( avsum/(double)navsum + logAvgAbsorp );
341                  scalecolor(aval, d);            /* neutral color */
342          }
343   }
# Line 461 | Line 424 | sumambient(            /* get interpolated ambient value */
424                                                          at->kid+i, ck0, s);
425                  }
426                                          /* good enough? */
427 <                if (wsum >= 0.05 && s > minarad*10.0)
427 >                if ((wsum >= 0.05) & (s*ambacc > minarad))
428                          return(wsum);
429          }
430                                          /* adjust maximum angle */
# Line 472 | Line 435 | sumambient(            /* get interpolated ambient value */
435                  double  u, v, d, delta_r2, delta_t2;
436                  COLOR   ct;
437                  FVECT   uvw[3];
475 –                                        /* record access */
476 –                if (tracktime)
477 –                        av->latick = ambclock;
438                  /*
439                   *  Ambient level test
440                   */
# Line 496 | Line 456 | sumambient(            /* get interpolated ambient value */
456                   */
457                  VSUB(ck0, r->rop, av->pos);
458                  d = DOT(ck0, uvw[2]);
459 <                if (d < -minarad*ambacc-.001)
459 >                if (d < -minarad*ambacc)
460                          continue;
461                  d /= av->rad[0];
462                  delta_t2 = d*d;
# Line 583 | Line 543 | extambient(            /* extrapolate value at pv, nv */
543   )
544   {
545          const double    min_d = 0.05;
546 +        const double    max_d = 20.;
547          static FVECT    my_uvw[3];
548          FVECT           v1;
549          int             i;
# Line 602 | Line 563 | extambient(            /* extrapolate value at pv, nv */
563          for (i = 3; i--; )
564                  d += v1[i] * (ap->gdir[0]*uvw[0][i] + ap->gdir[1]*uvw[1][i]);
565          
566 <        if (d < min_d)                  /* should not use if we can avoid it */
566 >        if (d < min_d)                  /* clamp min/max scaling */
567                  d = min_d;
568 +        else if (d > max_d)
569 +                d = max_d;
570          copycolor(cr, ap->val);
571          scalecolor(cr, d);
572          return(d > min_d);
# Line 676 | Line 639 | initambfile(           /* initialize ambient file */
639                                  ambvwt, ambounce, ambacc);
640                  fprintf(ambfp, "-ad %d -as %d -ar %d ",
641                                  ambdiv, ambssamp, ambres);
642 +                fprintf(ambfp, "-dr %d -ds %g -dt %g -dc %g ", directrelay,
643 +                                srcsizerat, shadthresh, shadcert);
644 +                fprintf(ambfp, "-ss %g -st %g -lr %d -lw %g ", specjitter,
645 +                                specthresh, maxdepth, minweight);
646                  if (octname != NULL)
647                          fputs(octname, ambfp);
648                  fputc('\n', ambfp);
# Line 719 | Line 686 | avstore(                               /* allocate memory and save aval */
686          if ((av = newambval()) == NULL)
687                  error(SYSTEM, "out of memory in avstore");
688          *av = *aval;
722 –        av->latick = ambclock;
689          av->next = NULL;
690          nambvals++;
691          d = bright(av->val);
# Line 792 | Line 758 | unloadatree(                   /* unload an ambient value tree */
758   }
759  
760  
795 – static struct avl {
796 –        AMBVAL  *p;
797 –        unsigned long   t;
798 – }       *avlist1;                       /* ambient value list with ticks */
799 – static AMBVAL   **avlist2;              /* memory positions for sorting */
800 – static int      i_avlist;               /* index for lists */
801 –
802 – static int alatcmp(const void *av1, const void *av2);
803 –
761   static void
762   avfree(AMBVAL *av)
763   {
764          free(av);
765   }
766  
767 +
768   static void
769 < av2list(
812 <        AMBVAL *av
813 < )
769 > sortambvals(void)                       /* resort ambient values */
770   {
771 < #ifdef DEBUG
816 <        if (i_avlist >= nambvals)
817 <                error(CONSISTENCY, "too many ambient values in av2list1");
818 < #endif
819 <        avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
820 <        avlist1[i_avlist++].t = av->latick;
821 < }
771 >        AMBTREE  oldatrunk = atrunk;
772  
773 <
774 < static int
775 < alatcmp(                        /* compare ambient values for MRA */
826 <        const void *av1,
827 <        const void *av2
828 < )
829 < {
830 <        long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
831 <        return(lc<0 ? -1 : lc>0 ? 1 : 0);
773 >        atrunk.alist = NULL;
774 >        atrunk.kid = NULL;
775 >        unloadatree(&oldatrunk, avinsert);
776   }
777  
778  
835 – /* GW NOTE 2002/10/3:
836 – * I used to compare AMBVAL pointers, but found that this was the
837 – * cause of a serious consistency error with gcc, since the optimizer
838 – * uses some dangerous trick in pointer subtraction that
839 – * assumes pointers differ by exact struct size increments.
840 – */
841 – static int
842 – aposcmp(                        /* compare ambient value positions */
843 –        const void      *avp1,
844 –        const void      *avp2
845 – )
846 – {
847 –        long    diff = *(char * const *)avp1 - *(char * const *)avp2;
848 –        if (diff < 0)
849 –                return(-1);
850 –        return(diff > 0);
851 – }
852 –
853 –
854 – static int
855 – avlmemi(                                /* find list position from address */
856 –        AMBVAL  *avaddr
857 – )
858 – {
859 –        AMBVAL  **avlpp;
860 –
861 –        avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
862 –                        nambvals, sizeof(AMBVAL *), aposcmp);
863 –        if (avlpp == NULL)
864 –                error(CONSISTENCY, "address not found in avlmemi");
865 –        return(avlpp - avlist2);
866 – }
867 –
868 –
869 – static void
870 – sortambvals(                    /* resort ambient values */
871 –        int     always
872 – )
873 – {
874 –        AMBTREE  oldatrunk;
875 –        AMBVAL  tav, *tap, *pnext;
876 –        int     i, j;
877 –                                        /* see if it's time yet */
878 –        if (!always && (ambclock++ < lastsort+sortintvl ||
879 –                        nambvals < SORT_THRESH))
880 –                return;
881 –        /*
882 –         * The idea here is to minimize memory thrashing
883 –         * in VM systems by improving reference locality.
884 –         * We do this by periodically sorting our stored ambient
885 –         * values in memory in order of most recently to least
886 –         * recently accessed.  This ordering was chosen so that new
887 –         * ambient values (which tend to be less important) go into
888 –         * higher memory with the infrequently accessed values.
889 –         *      Since we expect our values to need sorting less
890 –         * frequently as the process continues, we double our
891 –         * waiting interval after each call.
892 –         *      This routine is also called by setambacc() with
893 –         * the "always" parameter set to 1 so that the ambient
894 –         * tree will be rebuilt with the new accuracy parameter.
895 –         */
896 –        if (tracktime) {                /* allocate pointer arrays to sort */
897 –                avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
898 –                avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl));
899 –        } else {
900 –                avlist2 = NULL;
901 –                avlist1 = NULL;
902 –        }
903 –        if (avlist1 == NULL) {          /* no time tracking -- rebuild tree? */
904 –                if (avlist2 != NULL)
905 –                        free(avlist2);
906 –                if (always) {           /* rebuild without sorting */
907 –                        oldatrunk = atrunk;
908 –                        atrunk.alist = NULL;
909 –                        atrunk.kid = NULL;
910 –                        unloadatree(&oldatrunk, avinsert);
911 –                }
912 –        } else {                        /* sort memory by last access time */
913 –                /*
914 –                 * Sorting memory is tricky because it isn't contiguous.
915 –                 * We have to sort an array of pointers by MRA and also
916 –                 * by memory position.  We then copy values in "loops"
917 –                 * to minimize memory hits.  Nevertheless, we will visit
918 –                 * everyone at least twice, and this is an expensive process
919 –                 * when we're thrashing, which is when we need to do it.
920 –                 */
921 – #ifdef DEBUG
922 –                sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...",
923 –                                nambvals, ambclock);
924 –                eputs(errmsg);
925 – #endif
926 –                i_avlist = 0;
927 –                unloadatree(&atrunk, av2list);  /* empty current tree */
928 – #ifdef DEBUG
929 –                if (i_avlist < nambvals)
930 –                        error(CONSISTENCY, "missing ambient values in sortambvals");
931 – #endif
932 –                qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
933 –                qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
934 –                for (i = 0; i < nambvals; i++) {
935 –                        if (avlist1[i].p == NULL)
936 –                                continue;
937 –                        tap = avlist2[i];
938 –                        tav = *tap;
939 –                        for (j = i; (pnext = avlist1[j].p) != tap;
940 –                                        j = avlmemi(pnext)) {
941 –                                *(avlist2[j]) = *pnext;
942 –                                avinsert(avlist2[j]);
943 –                                avlist1[j].p = NULL;
944 –                        }
945 –                        *(avlist2[j]) = tav;
946 –                        avinsert(avlist2[j]);
947 –                        avlist1[j].p = NULL;
948 –                }
949 –                free(avlist1);
950 –                free(avlist2);
951 –                                                /* compute new sort interval */
952 –                sortintvl = ambclock - lastsort;
953 –                if (sortintvl >= MAX_SORT_INTVL/2)
954 –                        sortintvl = MAX_SORT_INTVL;
955 –                else
956 –                        sortintvl <<= 1;        /* wait twice as long next */
957 – #ifdef DEBUG
958 –                eputs("done\n");
959 – #endif
960 –        }
961 –        if (ambclock >= MAXACLOCK)
962 –                ambclock = MAXACLOCK/2;
963 –        lastsort = ambclock;
964 – }
965 –
966 –
779   #ifdef  F_SETLKW
780  
781   static void
# Line 975 | Line 787 | aflock(                        /* lock/unlock ambient file */
787  
788          if (typ == fls.l_type)          /* already called? */
789                  return;
790 +
791          fls.l_type = typ;
792 <        if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
793 <                error(SYSTEM, "cannot (un)lock ambient file");
792 >        do
793 >                if (fcntl(fileno(ambfp), F_SETLKW, &fls) != -1)
794 >                        return;
795 >        while (errno == EINTR);
796 >        
797 >        error(SYSTEM, "cannot (un)lock ambient file");
798   }
799  
800  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines