--- ray/src/rt/rview.c	1995/12/08 18:49:24	2.15
+++ ray/src/rt/rview.c	2003/07/02 01:15:20	2.21
@@ -1,30 +1,39 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: rview.c,v 2.21 2003/07/02 01:15:20 greg Exp $";
 #endif
-
 /*
  *  rview.c - routines and variables for interactive view generation.
  *
- *     3/24/87
+ *  External symbols declared in rpaint.h
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
-#include  "rpaint.h"
-
 #include  <signal.h>
-
 #include  <ctype.h>
 
-VIEW  ourview = STDVIEW;		/* viewing parameters */
-int  hresolu, vresolu;			/* image resolution */
+#include  "platform.h"
+#include  "ray.h"
+#include  "rpaint.h"
 
+
+CUBE  thescene;				/* our scene */
+OBJECT	nsceneobjs;			/* number of objects in our scene */
+
 int  dimlist[MAXDIM];			/* sampling dimensions */
 int  ndims = 0;				/* number of sampling dimensions */
 int  samplendx = 0;			/* index for this sample */
 
+extern void  ambnotify();
+void  (*addobjnotify[])() = {ambnotify, NULL};
+
+VIEW  ourview = STDVIEW;		/* viewing parameters */
+int  hresolu, vresolu;			/* image resolution */
+
+void  (*trace)() = NULL;		/* trace call */
+
+int  do_irrad = 0;			/* compute irradiance? */
+
 int  psample = 8;			/* pixel sample size */
 double	maxdiff = .15;			/* max. sample difference */
 
@@ -39,7 +48,7 @@ int  directvis = 1;			/* sources visible? */
 double	srcsizerat = 0.;		/* maximum ratio source size/dist. */
 
 COLOR  cextinction = BLKCOLOR;		/* global extinction coefficient */
-double  salbedo = 0.;			/* global scattering albedo */
+COLOR  salbedo = BLKCOLOR;		/* global scattering albedo */
 double  seccg = 0.;			/* global scattering eccentricity */
 double  ssampdist = 0.;			/* scatter sampling distance */
 
@@ -51,7 +60,9 @@ int  backvis = 1;			/* back face visibility */
 int  maxdepth = 4;			/* maximum recursion depth */
 double	minweight = 1e-2;		/* minimum ray weight */
 
+char  *ambfile = NULL;			/* ambient file name */
 COLOR  ambval = BLKCOLOR;		/* ambient value */
+int  ambvwt = 0;			/* initial weight for ambient value */
 double	ambacc = 0.2;			/* ambient accuracy */
 int  ambres = 8;			/* ambient resolution */
 int  ambdiv = 32;			/* ambient divisions */
@@ -61,7 +72,7 @@ char  *amblist[128];			/* ambient include/exclude list
 int  ambincl = -1;			/* include == 1, exclude == 0 */
 
 int  greyscale = 0;			/* map colors to brightness? */
-char  *devname = dev_default;		/* output device name */
+char  *dvcname = dev_default;		/* output device name */
 
 struct driver  *dev = NULL;		/* driver functions */
 
@@ -80,6 +91,7 @@ static char  *reserve_mem = NULL;	/* pre-allocated res
 #define	 CTRL(c)	((c)-'@')
 
 
+void
 quit(code)			/* quit program */
 int  code;
 {
@@ -92,6 +104,7 @@ int  code;
 }
 
 
+void
 devopen(dname)				/* open device driver */
 char  *dname;
 {
@@ -108,16 +121,15 @@ char  *dname;
 				error(USER, errmsg);
 			} else
 				return;
-#ifndef NIX						   
 						/* not there, try exec */
 	if ((dev = comm_init(dname, id)) == NULL) {
 		sprintf(errmsg, "cannot start device \"%s\"", dname);
 		error(USER, errmsg);
 	}
-#endif
 }
 
 
+void
 devclose()				/* close our device */
 {
 	if (dev != NULL)
@@ -126,6 +138,7 @@ devclose()				/* close our device */
 }
 
 
+void
 printdevices()				/* print list of output devices */
 {
 	register int  i;
@@ -135,11 +148,12 @@ printdevices()				/* print list of output devices */
 }
 
 
+void
 rview()				/* do a view */
 {
 	char  buf[32];
 
-	devopen(devname);		/* open device */
+	devopen(dvcname);		/* open device */
 	newimage();			/* start image (calls fillreserves) */
 
 	for ( ; ; ) {			/* quit in command() */
@@ -167,14 +181,16 @@ rview()				/* do a view */
 }
 
 
+void
 fillreserves()			/* fill memory reserves */
 {
 	if (reserve_mem != NULL)
 		return;
-	reserve_mem = malloc(RESERVE_AMT);
+	reserve_mem = (char *)malloc(RESERVE_AMT);
 }
 
 
+void
 freereserves()			/* free memory reserves */
 {
 	if (reserve_mem == NULL)
@@ -184,6 +200,7 @@ freereserves()			/* free memory reserves */
 }
 
 
+void
 command(prompt)			/* get/execute command */
 char  *prompt;
 {
@@ -312,7 +329,7 @@ dostop:
 		devclose();
 		kill(0, SIGTSTP);
 		/* pc stops here */
-		devopen(devname);
+		devopen(dvcname);
 		redraw();
 		break;
 #endif
@@ -332,6 +349,7 @@ commerr:
 }
 
 
+void
 rsample()			/* sample the image */
 {
 	int  xsiz, ysiz, y;
@@ -354,7 +372,7 @@ rsample()			/* sample the image */
 		return;
 	pl = (PNODE **)malloc(xsiz*sizeof(PNODE *));
 	if (pl == NULL) {
-		free((char *)rl);
+		free((void *)rl);
 		return;
 	}
 	/*
@@ -415,8 +433,8 @@ rsample()			/* sample the image */
 		}
 	}
 escape:
-	free((char *)rl);
-	free((char *)pl);
+	free((void *)rl);
+	free((void *)pl);
 }