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.11 by schorsch, Thu Jun 5 19:29:34 2003 UTC vs.
Revision 2.23 by schorsch, Sun Mar 6 01:13:17 2016 UTC

# Line 2 | Line 2
2   /*
3   *  random.h - header file for random(3) and urand() function.
4   */
5 + #ifndef _RAD_RANDOM_H_
6 + #define _RAD_RANDOM_H_
7  
8 < #include "copyright.h"
8 > #include <stdlib.h>
9  
10 < #ifdef  NORANDOM
10 > #ifdef __cplusplus
11 > extern "C" {
12 > #endif
13  
14 < #undef  random
11 < #define  random()       1073741820
12 < #undef  srandom
13 < #define  srandom(s)     (s)
14 < #define  frandom()      0.5
15 < #define  urand(i)       0.5
16 < #define  initurand(n)   (n)
17 <
18 < #else
19 <
20 < #ifdef  _WIN32
21 <
14 > #if defined(_WIN32) || defined(_WIN64)
15   #if (RAND_MAX <= 65536)
16   #define random()        ((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
17   #else
# Line 26 | Line 19
19   #endif
20   #define srandom(s)      srand((unsigned)(s))
21  
22 < #define frandom()       (rand()*(1./RAND_MAX))
22 > #define frandom()       (rand()*(1./(RAND_MAX+.5)))
23  
24   #else
32 #ifdef  BSD
25  
34 extern long  random();
35
36 #define  frandom()      (random()*(1./2147483648.))
37
38 #else
39
40 extern long  lrand48();
41 extern double  drand48();
42
26   #define  random()       lrand48()
27   #define  srandom(s)     srand48((long)(s))
28   #define  frandom()      drand48()
29  
30   #endif
48 #endif
31  
50 #ifdef  MC
51
52 #define  urand(i)       frandom()
53 #define  initurand(n)   (n)
54
55 #else
56
32   extern unsigned short   *urperm;
33   extern int      urmask;
34  
35 < #define  urand(i)       ((urperm[(i)&urmask]+frandom())/(urmask+1))
35 > #define  urand(i)       (urmask ? (urperm[(i)&urmask]+frandom())/(urmask+1.) \
36 >                                : frandom())
37  
38 < #endif
38 > extern int      initurand(int size);
39  
64 #endif
65
66 #ifdef NOPROTO
67
68 extern int      initurand();
69 extern int      ilhash();
70 extern int      urind();
71 extern void     multisamp();
72
73 #else
40                                  /* defined in urand.c */
75 extern int      initurand(int size);
41   extern int      ilhash(int *d, int n);
42                                  /* defined in urind.c */
43   extern int      urind(int s, int i);
44                                  /* defined in multisamp.c */
45   extern void     multisamp(double t[], int n, double r);
46  
47 +
48 + #ifdef __cplusplus
49 + }
50   #endif
51 + #endif /* _RAD_RANDOM_H_ */
52 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines