--- ray/src/rt/source.h	2005/09/23 19:04:53	2.16
+++ ray/src/rt/source.h	2014/09/15 00:54:39	2.19
@@ -1,4 +1,4 @@
-/* RCSid $Id: source.h,v 2.16 2005/09/23 19:04:53 greg Exp $ */
+/* RCSid $Id: source.h,v 2.19 2014/09/15 00:54:39 greg Exp $ */
 /*
  *  source.h - header file for ray tracing sources.
  *
@@ -19,6 +19,9 @@ extern "C" {
 #ifndef  SHADCACHE
 #define  SHADCACHE	20		/* shadow cache resolution */
 #endif
+#ifndef  MINSHADCNT
+#define  MINSHADCNT	4		/* test all sources if this few */
+#endif
 
 #define  SDISTANT	01		/* source distant flag */
 #define  SSKIP		02		/* source skip flag */
@@ -26,8 +29,9 @@ extern "C" {
 #define  SSPOT		010		/* source spotlight flag */
 #define  SVIRTUAL	020		/* source virtual flag */
 #define  SFLAT		040		/* source flat flag */
-#define  SCYL		0100		/* source cylindrical flag */
-#define  SFOLLOW	0200		/* source follow path flag */
+#define  SCIR		0100		/* source circular flag */
+#define  SCYL		0200		/* source cylindrical flag */
+#define  SFOLLOW	0400		/* source follow path flag */
 
 typedef struct {
 	FVECT  aim;		/* aim direction or center */
@@ -152,10 +156,12 @@ typedef void srcdirf_t(COLOR cv, void *np, FVECT ldir,
 extern void	direct(RAY *r, srcdirf_t *f, void *p);
 extern void	srcscatter(RAY *r);
 extern int	m_light(OBJREC *m, RAY *r);
+					/* defined in srcobstr.c */
 extern void	initobscache(int sn);
 extern int	srcblocker(RAY *r);
 extern int      srcblocked(RAY *r);
 extern void     freeobscache(SRCREC *s);
+extern void	markclip(OBJREC *m);
 					/* defined in srcsamp.c */
 extern double	nextssamp(RAY *r, SRCINDEX *si);
 extern int	skipparts(int ct[3], int sz[3], int pp[2], unsigned char *pt);