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.110 by greg, Fri Feb 19 22:05:46 2021 UTC vs.
Revision 2.116 by greg, Fri Jan 27 19:57:08 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))
# 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 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 679 | 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 722 | Line 686 | avstore(                               /* allocate memory and save aval */
686          if ((av = newambval()) == NULL)
687                  error(SYSTEM, "out of memory in avstore");
688          *av = *aval;
725 –        av->latick = ambclock;
689          av->next = NULL;
690          nambvals++;
691          d = bright(av->val);
# Line 795 | Line 758 | unloadatree(                   /* unload an ambient value tree */
758   }
759  
760  
798 – static struct avl {
799 –        AMBVAL  *p;
800 –        unsigned long   t;
801 – }       *avlist1;                       /* ambient value list with ticks */
802 – static AMBVAL   **avlist2;              /* memory positions for sorting */
803 – static int      i_avlist;               /* index for lists */
804 –
805 – static int alatcmp(const void *av1, const void *av2);
806 –
761   static void
762   avfree(AMBVAL *av)
763   {
764          free(av);
765   }
766  
813 – static void
814 – av2list(
815 –        AMBVAL *av
816 – )
817 – {
818 – #ifdef DEBUG
819 –        if (i_avlist >= nambvals)
820 –                error(CONSISTENCY, "too many ambient values in av2list1");
821 – #endif
822 –        avlist1[i_avlist].p = avlist2[i_avlist] = (AMBVAL*)av;
823 –        avlist1[i_avlist++].t = av->latick;
824 – }
767  
826 –
827 – static int
828 – alatcmp(                        /* compare ambient values for MRA */
829 –        const void *av1,
830 –        const void *av2
831 – )
832 – {
833 –        long  lc = ((struct avl *)av2)->t - ((struct avl *)av1)->t;
834 –        return(lc<0 ? -1 : lc>0 ? 1 : 0);
835 – }
836 –
837 –
838 – /* GW NOTE 2002/10/3:
839 – * I used to compare AMBVAL pointers, but found that this was the
840 – * cause of a serious consistency error with gcc, since the optimizer
841 – * uses some dangerous trick in pointer subtraction that
842 – * assumes pointers differ by exact struct size increments.
843 – */
844 – static int
845 – aposcmp(                        /* compare ambient value positions */
846 –        const void      *avp1,
847 –        const void      *avp2
848 – )
849 – {
850 –        long    diff = *(char * const *)avp1 - *(char * const *)avp2;
851 –        if (diff < 0)
852 –                return(-1);
853 –        return(diff > 0);
854 – }
855 –
856 –
857 – static int
858 – avlmemi(                                /* find list position from address */
859 –        AMBVAL  *avaddr
860 – )
861 – {
862 –        AMBVAL  **avlpp;
863 –
864 –        avlpp = (AMBVAL **)bsearch(&avaddr, avlist2,
865 –                        nambvals, sizeof(AMBVAL *), aposcmp);
866 –        if (avlpp == NULL)
867 –                error(CONSISTENCY, "address not found in avlmemi");
868 –        return(avlpp - avlist2);
869 – }
870 –
871 –
768   static void
769 < sortambvals(                    /* resort ambient values */
874 <        int     always
875 < )
769 > sortambvals(void)                       /* resort ambient values */
770   {
771 <        AMBTREE  oldatrunk;
772 <        AMBVAL  tav, *tap, *pnext;
773 <        int     i, j;
774 <                                        /* see if it's time yet */
775 <        if (!always && (ambclock++ < lastsort+sortintvl ||
882 <                        nambvals < SORT_THRESH))
883 <                return;
884 <        /*
885 <         * The idea here is to minimize memory thrashing
886 <         * in VM systems by improving reference locality.
887 <         * We do this by periodically sorting our stored ambient
888 <         * values in memory in order of most recently to least
889 <         * recently accessed.  This ordering was chosen so that new
890 <         * ambient values (which tend to be less important) go into
891 <         * higher memory with the infrequently accessed values.
892 <         *      Since we expect our values to need sorting less
893 <         * frequently as the process continues, we double our
894 <         * waiting interval after each call.
895 <         *      This routine is also called by setambacc() with
896 <         * the "always" parameter set to 1 so that the ambient
897 <         * tree will be rebuilt with the new accuracy parameter.
898 <         */
899 <        if (tracktime) {                /* allocate pointer arrays to sort */
900 <                avlist2 = (AMBVAL **)malloc(nambvals*sizeof(AMBVAL *));
901 <                avlist1 = (struct avl *)malloc(nambvals*sizeof(struct avl));
902 <        } else {
903 <                avlist2 = NULL;
904 <                avlist1 = NULL;
905 <        }
906 <        if (avlist1 == NULL) {          /* no time tracking -- rebuild tree? */
907 <                if (avlist2 != NULL)
908 <                        free(avlist2);
909 <                if (always) {           /* rebuild without sorting */
910 <                        oldatrunk = atrunk;
911 <                        atrunk.alist = NULL;
912 <                        atrunk.kid = NULL;
913 <                        unloadatree(&oldatrunk, avinsert);
914 <                }
915 <        } else {                        /* sort memory by last access time */
916 <                /*
917 <                 * Sorting memory is tricky because it isn't contiguous.
918 <                 * We have to sort an array of pointers by MRA and also
919 <                 * by memory position.  We then copy values in "loops"
920 <                 * to minimize memory hits.  Nevertheless, we will visit
921 <                 * everyone at least twice, and this is an expensive process
922 <                 * when we're thrashing, which is when we need to do it.
923 <                 */
924 < #ifdef DEBUG
925 <                sprintf(errmsg, "sorting %u ambient values at ambclock=%lu...",
926 <                                nambvals, ambclock);
927 <                eputs(errmsg);
928 < #endif
929 <                i_avlist = 0;
930 <                unloadatree(&atrunk, av2list);  /* empty current tree */
931 < #ifdef DEBUG
932 <                if (i_avlist < nambvals)
933 <                        error(CONSISTENCY, "missing ambient values in sortambvals");
934 < #endif
935 <                qsort(avlist1, nambvals, sizeof(struct avl), alatcmp);
936 <                qsort(avlist2, nambvals, sizeof(AMBVAL *), aposcmp);
937 <                for (i = 0; i < nambvals; i++) {
938 <                        if (avlist1[i].p == NULL)
939 <                                continue;
940 <                        tap = avlist2[i];
941 <                        tav = *tap;
942 <                        for (j = i; (pnext = avlist1[j].p) != tap;
943 <                                        j = avlmemi(pnext)) {
944 <                                *(avlist2[j]) = *pnext;
945 <                                avinsert(avlist2[j]);
946 <                                avlist1[j].p = NULL;
947 <                        }
948 <                        *(avlist2[j]) = tav;
949 <                        avinsert(avlist2[j]);
950 <                        avlist1[j].p = NULL;
951 <                }
952 <                free(avlist1);
953 <                free(avlist2);
954 <                                                /* compute new sort interval */
955 <                sortintvl = ambclock - lastsort;
956 <                if (sortintvl >= MAX_SORT_INTVL/2)
957 <                        sortintvl = MAX_SORT_INTVL;
958 <                else
959 <                        sortintvl <<= 1;        /* wait twice as long next */
960 < #ifdef DEBUG
961 <                eputs("done\n");
962 < #endif
963 <        }
964 <        if (ambclock >= MAXACLOCK)
965 <                ambclock = MAXACLOCK/2;
966 <        lastsort = ambclock;
771 >        AMBTREE  oldatrunk = atrunk;
772 >
773 >        atrunk.alist = NULL;
774 >        atrunk.kid = NULL;
775 >        unloadatree(&oldatrunk, avinsert);
776   }
777  
778  

Diff Legend

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