ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/random.h
(Generate patch)

Comparing ray/src/common/random.h (file contents):
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.12 by schorsch, Fri Jun 6 16:38:47 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  random.h - header file for random(3) and urand() function.
4   */
5 + #ifndef _RAD_RANDOM_H_
6 + #define _RAD_RANDOM_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 /* ====================================================================
7 * The Radiance Software License, Version 1.0
8 *
9 * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 *
16 * 1. Redistributions of source code must retain the above copyright
17 *         notice, this list of conditions and the following disclaimer.
18 *
19 * 2. Redistributions in binary form must reproduce the above copyright
20 *       notice, this list of conditions and the following disclaimer in
21 *       the documentation and/or other materials provided with the
22 *       distribution.
23 *
24 * 3. The end-user documentation included with the redistribution,
25 *           if any, must include the following acknowledgment:
26 *             "This product includes Radiance software
27 *                 (http://radsite.lbl.gov/)
28 *                 developed by the Lawrence Berkeley National Laboratory
29 *               (http://www.lbl.gov/)."
30 *       Alternately, this acknowledgment may appear in the software itself,
31 *       if and wherever such third-party acknowledgments normally appear.
32 *
33 * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 *       and "The Regents of the University of California" must
35 *       not be used to endorse or promote products derived from this
36 *       software without prior written permission. For written
37 *       permission, please contact [email protected].
38 *
39 * 5. Products derived from this software may not be called "Radiance",
40 *       nor may "Radiance" appear in their name, without prior written
41 *       permission of Lawrence Berkeley National Laboratory.
42 *
43 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 * SUCH DAMAGE.
55 * ====================================================================
56 *
57 * This software consists of voluntary contributions made by many
58 * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 * information on Lawrence Berkeley National Laboratory, please see
60 * <http://www.lbl.gov/>.
61 */
11  
12 + #include "copyright.h"
13 +
14   #ifdef  NORANDOM
15  
16   #undef  random
# Line 72 | Line 23
23  
24   #else
25  
26 < #ifdef  MSDOS
26 > #ifdef  _WIN32
27  
28 + #if (RAND_MAX <= 65536)
29   #define random()        ((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
30 + #else
31 + #define random()        rand()
32 + #endif
33   #define srandom(s)      srand((unsigned)(s))
34  
35 < #define frandom()       (rand()*(1./32768.))
35 > #define frandom()       (rand()*(1./RAND_MAX))
36  
37   #else
38   #ifdef  BSD
# Line 114 | Line 69 | extern int     urmask;
69  
70   #endif
71  
117 #ifdef NOPROTO
118
119 extern int      initurand();
120 extern int      ilhash();
121 extern int      urind();
122 extern void     multisamp();
123
124 #else
72                                  /* defined in urand.c */
73   extern int      initurand(int size);
74   extern int      ilhash(int *d, int n);
# Line 130 | Line 77 | extern int     urind(int s, int i);
77                                  /* defined in multisamp.c */
78   extern void     multisamp(double t[], int n, double r);
79  
80 +
81 + #ifdef __cplusplus
82 + }
83   #endif
84 + #endif /* _RAD_RANDOM_H_ */
85 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines