ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/gen/genbeads.c
(Generate patch)

Comparing ray/src/gen/genbeads.c (file contents):
Revision 2.5 by greg, Sat Feb 22 02:07:23 2003 UTC vs.
Revision 2.6 by schorsch, Sun Jun 8 12:03:09 2003 UTC

# Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
12   #include <stdlib.h>
13   #include  <math.h>
14  
15 < char  *mtype;           /* material type */
15 > void hermite3(double hp[3], double p0[3], double p1[3],
16 >                double r0[3], double r1[3], double t);
17 > htan3(double ht[3], double p0[3], double p1[3],
18 >                double r0[3], double r1[3], double t);
19  
20 < char  *name;            /* name */
20 > static void genstring(
21 >                char  *mtype,
22 >                char  *name,
23 >                double  p0[3],
24 >                double  p1[3],
25 >                double  r0[3],
26 >                double  r1[3],
27 >                double  rad,
28 >                double  inc
29 >                )
30 > {
31 >        register int  i;
32 >        double  v[3];
33 >        double  t;
34 >        
35 >        t = 0.0;
36 >        for (i = 0; t <= 1.0; i++) {
37  
38 +                printf("\n%s sphere %s.%d\n", mtype, name, i);
39 +                
40 +                hermite3(v, p0, p1, r0, r1, t);
41 +                
42 +                printf("0\n0\n4 %18.12g %18.12g %18.12g %18.12g\n",
43 +                                        v[0], v[1], v[2], rad);
44  
45 < main(argc, argv)
46 < int  argc;
47 < char  **argv;
45 >                htan3(v, p0, p1, r0, r1, t);
46 >                t += inc / sqrt(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]);
47 >        }
48 > }
49 >
50 > int main(int  argc, char  **argv)
51   {
52          double  p0[3], p1[3], r0[3], r1[3];
53          double  rad, inc;
54 +        char  *mtype;           /* material type */
55 +        char  *name;            /* name */
56          
57          if (argc != 17) {
58                  fprintf(stderr, "Usage: %s material name p0 p1 r0 r1 rad inc\n",
# Line 51 | Line 81 | char  **argv;
81          return(0);
82   }
83  
54 –
55 – genstring(mtype, name, p0, p1, r0, r1, rad, inc)
56 – char  *mtype;
57 – char  *name;
58 – double  p0[3];
59 – double  p1[3];
60 – double  r0[3];
61 – double  r1[3];
62 – double  rad;
63 – double  inc;
64 – {
65 –        register int  i;
66 –        double  v[3];
67 –        double  t;
68 –        
69 –        t = 0.0;
70 –        for (i = 0; t <= 1.0; i++) {
71 –
72 –                printf("\n%s sphere %s.%d\n", mtype, name, i);
73 –                
74 –                hermite3(v, p0, p1, r0, r1, t);
75 –                
76 –                printf("0\n0\n4 %18.12g %18.12g %18.12g %18.12g\n",
77 –                                        v[0], v[1], v[2], rad);
78 –
79 –                htan3(v, p0, p1, r0, r1, t);
80 –                t += inc / sqrt(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]);
81 –        }
82 – }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines