--- ray/src/rt/raycalls.c	2003/10/04 14:39:53	2.8
+++ ray/src/rt/raycalls.c	2011/02/25 06:51:50	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: raycalls.c,v 2.8 2003/10/04 14:39:53 greg Exp $";
+static const char	RCSid[] = "$Id: raycalls.c,v 2.20 2011/02/25 06:51:50 greg Exp $";
 #endif
 /*
  *  raycalls.c - interface for running Radiance rendering as a library
@@ -23,10 +23,9 @@ static const char	RCSid[] = "$Id: raycalls.c,v 2.8 200
  *  sort of context, so it is impossible to simultaneously run
  *  this library on multiple scenes or in multiple threads.
  *  You get one scene and one thread, and if you want more, you
- *  will have to go with the process model used by the programs
- *  gen/mkillum, hd/rholo, and px/pinterp.  Finally, unrecoverable
- *  errors result in a call to the application-defined function
- *  quit().  The usual thing to do is to call exit().
+ *  will have to go with the process model defined in raypcalls.c.
+ *  Finally, unrecoverable errors result in a call to the application-
+ *  defined function quit().  The usual thing to do is to call exit().
  *  You might want to do something else instead, like
  *  call setjmp()/longjmp() to bring you back to the calling
  *  function for recovery.  You may also wish to define your own
@@ -91,9 +90,11 @@ static const char	RCSid[] = "$Id: raycalls.c,v 2.8 200
  */
 
 #include <string.h>
+#include <time.h>
 
 #include  "ray.h"
 #include  "source.h"
+#include  "bsdf.h"
 #include  "ambient.h"
 #include  "otypes.h"
 #include  "random.h"
@@ -115,11 +116,12 @@ int	samplendx = 0;			/* index for this sample */
 
 void	(*trace)() = NULL;		/* trace call */
 
-extern void	ambnotify();
 void	(*addobjnotify[8])() = {ambnotify, NULL};
 
 int	do_irrad = 0;			/* compute irradiance? */
 
+int	rand_samp = 0;			/* pure Monte Carlo sampling? */
+
 double	dstrsrc = 0.0;			/* square source distribution */
 double	shadthresh = .03;		/* shadow threshold */
 double	shadcert = .75;			/* shadow certainty */
@@ -139,7 +141,7 @@ double	specjitter = 1.;		/* specular sampling jitter *
 int	backvis = 1;			/* back face visibility */
 
 int	maxdepth = 8;			/* maximum recursion depth */
-double	minweight = 2e-3;		/* minimum ray weight */
+double	minweight = 5e-4;		/* minimum ray weight */
 
 char	*ambfile = NULL;		/* ambient file name */
 COLOR	ambval = BLKCOLOR;		/* ambient value */
@@ -154,8 +156,9 @@ int	ambincl = -1;			/* include == 1, exclude == 0 */
 
 
 void
-ray_init(otnm)			/* initialize ray-tracing calculation */
-char	*otnm;
+ray_init(			/* initialize ray-tracing calculation */
+	char	*otnm
+)
 {
 	if (nobjects > 0)		/* free old scene data */
 		ray_done(0);
@@ -163,7 +166,13 @@ char	*otnm;
 	if (ofun[OBJ_SPHERE].funp == o_default)
 		initotypes();
 					/* initialize urand */
-	initurand(2048);
+	if (rand_samp) {
+		srandom((long)time(0));
+		initurand(0);
+	} else {
+		srandom(0L);
+		initurand(2048);
+	}
 					/* read scene octree */
 	readoct(octname = otnm, ~(IO_FILES|IO_INFO), &thescene, NULL);
 	nsceneobjs = nobjects;
@@ -175,18 +184,20 @@ char	*otnm;
 }
 
 void
-ray_trace(r)			/* trace a primary ray */
-RAY	*r;
+ray_trace(			/* trace a primary ray */
+	RAY	*r
+)
 {
-	rayorigin(r, NULL, PRIMARY, 1.0);
+	rayorigin(r, PRIMARY, NULL, NULL);
 	samplendx++;
 	rayvalue(r);		/* assumes origin and direction are set */
 }
 
 
 void
-ray_done(freall)		/* free ray-tracing data */
-int	freall;
+ray_done(		/* free ray-tracing data */
+	int	freall
+)
 {
 	retainfonts = 1;
 	ambdone();
@@ -197,23 +208,25 @@ int	freall;
 	octdone();
 	thescene.cutree = EMPTY;
 	octname = NULL;
+	retainfonts = 0;
 	if (freall) {
-		retainfonts = 0;
 		freefont(NULL);
 		freedata(NULL);
+		SDfreeCache(NULL);
 		initurand(0);
 	}
 	if (nobjects > 0) {
-		sprintf(errmsg, "%d objects left after call to ray_done()",
-				nobjects);
+		sprintf(errmsg, "%ld objects left after call to ray_done()",
+				(long)nobjects);
 		error(WARNING, errmsg);
 	}
 }
 
 
 void
-ray_save(rp)			/* save current parameter settings */
-RAYPARAMS	*rp;
+ray_save(			/* save current parameter settings */
+	RAYPARAMS	*rp
+)
 {
 	int	i, ndx;
 
@@ -262,8 +275,9 @@ RAYPARAMS	*rp;
 
 
 void
-ray_restore(rp)			/* restore parameter settings */
-RAYPARAMS	*rp;
+ray_restore(			/* restore parameter settings */
+	RAYPARAMS	*rp
+)
 {
 	register int	i;
 
@@ -329,8 +343,9 @@ RAYPARAMS	*rp;
 
 
 void
-ray_defaults(rp)		/* get default parameter values */
-RAYPARAMS	*rp;
+ray_defaults(		/* get default parameter values */
+	RAYPARAMS	*rp
+)
 {
 	int	i;
 
@@ -358,7 +373,7 @@ RAYPARAMS	*rp;
 	memset(rp->ambfile, '\0', sizeof(rp->ambfile));
 	rp->ambvwt = 0;
 	rp->ambres = 256;
-	rp->ambacc = 0.1;
+	rp->ambacc = 0.15;
 	rp->ambdiv = 1024;
 	rp->ambssamp = 512;
 	rp->ambounce = 0;