--- ray/src/rt/source.h	1989/06/07 08:35:12	1.2
+++ ray/src/rt/source.h	1991/06/20 09:03:21	1.7
@@ -8,27 +8,56 @@
  *     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 */
 
 typedef struct {
-	short  sflags;		/* source flags */
+	FVECT  aim;		/* aim direction or center */
+	float  siz;		/* output solid angle or area */
+	float  flen;		/* focal length */
+} SPOT;			/* spotlight */
+
+typedef struct {
+	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 */
+	struct {
+		float  prox;		/* proximity */
+		SPOT  *s;		/* spot */
+	} sl;			/* localized source information */
+	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 */
 
 typedef struct {
-	int  sno;		/* source number */
 	FVECT  dir;		/* source direction */
-	float  dom;		/* domega for source */
-	float  brt;		/* brightness (for comparison) */
+	COLOR  coef;		/* material coefficient */
 	COLOR  val;		/* contribution */
 }  CONTRIB;		/* direct contribution */
 
+typedef struct {
+	int  sno;		/* source number */
+	float  brt;		/* brightness (for comparison) */
+}  CNTPTR;		/* contribution pointer */
+
 extern SRCREC  *source;			/* our source list */
 extern int  nsources;			/* the number of sources */
 
 extern double  srcray();                /* ray to source */
+
+extern SPOT  *makespot();		/* make spotlight */
+
+extern SRCREC  *newsource();		/* allocate new source */