--- ray/src/common/random.h	1991/11/12 16:54:19	2.1
+++ ray/src/common/random.h	2003/02/22 02:07:22	2.8
@@ -1,30 +1,133 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: random.h,v 2.8 2003/02/22 02:07:22 greg Exp $ */
 /*
  *  random.h - header file for random(3) and urand() function.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *     10/1/85
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
  */
 
-#ifdef  BSD
+#ifdef  NORANDOM
 
+#undef  random
+#define  random()	1073741820
+#undef  srandom
+#define  srandom(s)	(s)
+#define  frandom()	0.5
+#define  urand(i)	0.5
+#define  initurand(n)	(n)
+
+#else
+
+#ifdef	MSDOS
+
+#define random()	((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
+#define srandom(s)	srand((unsigned)(s))
+
+#define frandom()	(rand()*(1./32768.))
+
+#else
+#ifdef	BSD
+
 extern long  random();
 
-#define  frandom()	(random()*(1./2147483648.))
+#define	 frandom()	(random()*(1./2147483648.))
 
 #else
 
 extern long  lrand48();
 extern double  drand48();
 
-#define  random()	lrand48()
-#define  frandom()	drand48()
+#define	 random()	lrand48()
+#define  srandom(s)	srand48((long)(s))
+#define	 frandom()	drand48()
 
 #endif
+#endif
 
-#define  urand(i)	((urperm[(i)&urmask]+frandom())/(urmask+1))
+#ifdef  MC
 
-extern short  *urperm;
-extern int  urmask;
+#define  urand(i)	frandom()
+#define  initurand(n)	(n)
+
+#else
+
+extern unsigned short	*urperm;
+extern int	urmask;
+
+#define	 urand(i)	((urperm[(i)&urmask]+frandom())/(urmask+1))
+
+#endif
+
+#endif
+
+#ifdef NOPROTO
+
+extern int	initurand();
+extern int	ilhash();
+extern int	urind();
+extern void	multisamp();
+
+#else
+				/* defined in urand.c */
+extern int	initurand(int size);
+extern int	ilhash(int *d, int n);
+				/* defined in urind.c */
+extern int	urind(int s, int i);
+				/* defined in multisamp.c */
+extern void	multisamp(double t[], int n, double r);
+
+#endif