ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/xshowtrace.c
(Generate patch)

Comparing ray/src/px/xshowtrace.c (file contents):
Revision 2.4 by greg, Fri Dec 11 18:24:29 1992 UTC vs.
Revision 2.10 by schorsch, Sun Mar 28 20:33:14 2004 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  Display an image and watch the rays get traced.
6   *
7   *      9/21/90 Greg Ward
8   */
9  
10 + #include <X11/Xlib.h>
11 +
12   #include "standard.h"
13 + #include "paths.h"
14   #include "view.h"
15 – #include "resolu.h"
16 – #include <X11/Xlib.h>
15  
16   #define MAXDEPTH        32              /* ridiculous ray tree depth */
17  
# Line 24 | Line 22 | static char SCCSid[] = "$SunId$ LBL";
22   #endif
23  
24   char    rtcom[] = "rtrace -h- -otp -fa -x 1";
25 < char    xicom[] = "ximage";
25 > char    xicom[] = "ximage -c 256";
26  
27   VIEW    ourview = STDVIEW;              /* view for picture */
28   RESOLU  ourres;                         /* picture resolution */
# Line 47 | Line 45 | struct node {                          /* ray tree node */
45  
46   int     slow = 0;               /* slow trace? */
47  
48 + void mainloop(void);
49 + static void freetree(struct node        *tp);
50 + static void tracerays(struct node       *tp);
51 + static int strtoipt(int ipt[2], char    *str);
52 + static void setvec(int  ipt[2]);
53 + static void vector(int  ip1[2], int     ip2[2]);
54  
55 < main(argc, argv)                /* takes both the octree and the image */
56 < int     argc;
57 < char    *argv[];
55 >
56 > int
57 > main(           /* takes both the octree and the image */
58 >        int     argc,
59 >        char    *argv[]
60 > )
61   {
62          int     i;
63 <        char    combuf[256];
63 >        char    combuf[PATH_MAX];
64  
65          progname = argv[0];
66          for (i = 1; i < argc-2; i++)
# Line 82 | Line 89 | char   *argv[];
89                  exit(1);
90          }
91                                          /* build input command */
92 <        sprintf(combuf, "%s %s | %s", xicom, picture, rtcom);
92 >        sprintf(combuf, "%s \"%s\" | %s", xicom, picture, rtcom);
93          for ( ; i < argc-1; i++) {
94                  strcat(combuf, " ");
95                  strcat(combuf, argv[i]);
# Line 98 | Line 105 | char   *argv[];
105   }
106  
107  
108 < mainloop()                              /* get and process input */
108 > void
109 > mainloop(void)                          /* get and process input */
110   {
111          static struct node      *sis[MAXDEPTH];
112          register struct node    *newp;
# Line 137 | Line 145 | mainloop()                             /* get and process input */
145   }
146  
147  
148 < freetree(tp)                            /* free a trace tree */
149 < struct node     *tp;
148 > static void
149 > freetree(                               /* free a trace tree */
150 >        struct node     *tp
151 > )
152   {
153 <        register struct node    *kid;
153 >        register struct node    *kid, *k2;
154  
155 <        for (kid = tp->daughter; kid != NULL; kid = kid->sister)
155 >        for (kid = tp->daughter; kid != NULL; kid = k2) {
156 >                k2 = kid->sister;
157                  freetree(kid);
158 <        free((char *)tp);
158 >        }
159 >        free((void *)tp);
160   }
161  
162  
163 < tracerays(tp)                           /* trace a ray tree */
164 < struct node     *tp;
163 > static void
164 > tracerays(                              /* trace a ray tree */
165 >        struct node     *tp
166 > )
167   {
168          register struct node    *kid;
169  
# Line 160 | Line 174 | struct node    *tp;
174   }
175  
176  
177 < strtoipt(ipt, str)              /* convert string x y z to image point */
178 < int     ipt[2];
179 < char    *str;
177 > static int
178 > strtoipt(               /* convert string x y z to image point */
179 >        int     ipt[2],
180 >        char    *str
181 > )
182   {
183          FVECT   im_pt, pt;
184  
# Line 186 | Line 202 | Window gwind = 0;
202   int     xoff, yoff;
203  
204  
205 < setvec(ipt)                     /* set up vector drawing for pick */
206 < int     ipt[2];
205 > static void
206 > setvec(                 /* set up vector drawing for pick */
207 >        int     ipt[2]
208 > )
209   {
210          extern Window   xfindwind();
211          XWindowAttributes       wa;
# Line 197 | Line 215 | int    ipt[2];
215          Window  rw, cw;
216          unsigned int    pm;
217                                          /* compute pointer location */
218 <        if (gwind == 0 &&
219 <                (gwind = xfindwind(theDisplay, rwind, picture, 4)) == 0) {
220 <                fprintf(stderr, "%s: cannot find display window!\n", progname);
221 <                exit(1);
218 >        if (gwind == 0) {
219 >                register char   *wn;
220 >                for (wn = picture; *wn; wn++);
221 >                while (wn > picture && wn[-1] != '/') wn--;
222 >                if ((gwind = xfindwind(theDisplay, rwind, wn, 4)) == 0) {
223 >                        fprintf(stderr, "%s: cannot find display window!\n",
224 >                                        progname);
225 >                        exit(1);
226 >                }
227          }
228          XQueryPointer(theDisplay, gwind, &rw, &cw, &rx, &ry, &wx, &wy, &pm);
229          xoff = wx - ipt[0];
# Line 221 | Line 244 | int    ipt[2];
244   }
245  
246  
247 < vector(ip1, ip2)                /* draw a vector */
248 < int     ip1[2], ip2[2];
247 > static void
248 > vector(         /* draw a vector */
249 >        int     ip1[2],
250 >        int     ip2[2]
251 > )
252   {
253          if (ip2[0] == -1 && ip2[1] == -1)
254                  return;                 /* null vector */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)