--- ray/src/rt/source.h	1991/02/11 08:43:46	1.5
+++ ray/src/rt/source.h	1991/06/25 12:32:49	1.11
@@ -8,47 +8,92 @@
  *     8/20/85
  */
 
+#define  AIMREQT	100		/* required aim success/failure */
+
 #define  SDISTANT	01		/* source distant flag */
 #define  SSKIP		02		/* source skip flag */
 #define  SPROX		04		/* source proximity flag */
 #define  SSPOT		010		/* source spotlight flag */
+#define  SVIRTUAL	020		/* source virtual flag */
+#define  SFLAT		040		/* source flat flag */
+#define  SFOLLOW	0100		/* source follow path flag */
 
-#define  AIMREQT	100		/* required aim success/failure */
-
 typedef struct {
-	float  siz;		/* output solid angle */
+	FVECT  aim;		/* aim direction or center */
+	float  siz;		/* output solid angle or area */
 	float  flen;		/* focal length */
-	FVECT  aim;		/* aim direction */
 } SPOT;			/* spotlight */
 
 typedef struct {
-	short  sflags;		/* source flags */
+	int  sflags;		/* source flags */
 	FVECT  sloc;		/* direction or position of source */
+	FVECT  snorm;		/* surface normal of flat source */
 	float  ss;		/* tangent or disk radius */
 	float  ss2;		/* domega or projected area */
-	union {
+	struct {
 		float  prox;		/* proximity */
 		SPOT  *s;		/* spot */
 	} sl;			/* localized source information */
-	int  aimsuccess;	/* aim successes - AIMREQT*failures */
+	union {
+		int  success;		/* successes - AIMREQT*failures */
+		int  svnext;		/* next source to aim for */
+	} sa;			/* source aiming information */
 	long  ntests, nhits;	/* shadow tests and hits */
-	OBJREC  *so;		/* source object */
+	OBJREC  *so;		/* source destination object */
 }  SRCREC;		/* light source */
 
+/*
+ * Special support functions for sources
+ */
+
+/*
+ * Virtual source materials must define the following.
+ *
+ *	vproj(pm, op, sp, i)	Compute i'th virtual projection
+ *				of source sp in object op and assign
+ *				the 4x4 transformation matrix pm.
+ *				Return 1 on success, 0 if no i'th projection.
+ *
+ *	nproj			The number of projections.  The value of
+ *				i passed to vproj runs from 0 to nproj-1.
+ */
+
 typedef struct {
-	FVECT  dir;		/* source direction */
-	float  dom;		/* domega for source */
-	COLOR  val;		/* contribution */
-}  CONTRIB;		/* direct contribution */
+	int  (*vproj)();	/* project virtual sources */
+	int  nproj;		/* number of possible projections */
+} VSMATERIAL;		/* virtual source material functions */
 
 typedef struct {
-	int  sno;		/* source number */
-	float  brt;		/* brightness (for comparison) */
-}  CNTPTR;		/* contribution pointer */
+	int	(*setsrc)();	/* set light source for object */
+	double  (*getpleq)();	/* plane equation for surface */
+	double  (*getdisk)();	/* maximum disk for surface */
+} SOBJECT;		/* source object functions */
 
+typedef union {
+	VSMATERIAL  *mf;	/* material functions */
+	SOBJECT  *of;		/* object functions */
+} SRCFUNC;		/* source functions */
+
+extern SRCFUNC  sfun[];			/* source dispatch table */
+
 extern SRCREC  *source;			/* our source list */
 extern int  nsources;			/* the number of sources */
 
 extern double  srcray();                /* ray to source */
+extern int  srcvalue();			/* compute source value w/o shadows */
 
+extern double  intercircle();		/* intersect two circles */
+extern double  spotdisk();		/* intersecting disk for spot */
+extern double  beamdisk();		/* intersecting disk for beam */
+
 extern SPOT  *makespot();		/* make spotlight */
+
+extern double  dstrsrc;			/* source distribution amount */
+extern double  shadthresh;		/* relative shadow threshold */
+extern double  shadcert;		/* shadow testing certainty */
+extern int  directrelay;		/* maximum number of source relays */
+extern int  vspretest;			/* virtual source pretest density */
+
+#define  getplaneq(c,o)		(*sfun[(o)->otype].of->getpleq)(c,o)
+#define  getmaxdisk(c,o)	(*sfun[(o)->otype].of->getdisk)(c,o)
+#define  setsource(s,o)		(*sfun[(o)->otype].of->setsrc)(s,o)