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 1.7 by greg, Mon Nov 11 14:01:49 1991 UTC vs.
Revision 2.7 by greg, Sat Feb 22 02:07:28 2003 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   *
# Line 16 | Line 13 | static char SCCSid[] = "$SunId$ LBL";
13  
14   #define MAXDEPTH        32              /* ridiculous ray tree depth */
15  
16 + #ifdef  SMLFLT
17 + #define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
18 + #else
19 + #define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
20 + #endif
21 +
22   char    rtcom[] = "rtrace -h- -otp -fa -x 1";
23 < char    xicom[] = "ximage";
23 > char    xicom[] = "ximage -c 256";
24  
25   VIEW    ourview = STDVIEW;              /* view for picture */
26 < int     xres, yres;
26 > RESOLU  ourres;                         /* picture resolution */
27  
28   char    *progname;                      /* program name */
29  
# Line 31 | Line 34 | FILE   *pin;                           /* input stream */
34   Display *theDisplay = NULL;             /* connection to server */
35  
36   struct node {                           /* ray tree node */
37 <        FVECT   ipt;
37 >        int     ipt[2];
38          struct node     *sister;
39          struct node     *daughter;
40   };
# Line 61 | Line 64 | char   *argv[];
64          }
65          picture = argv[argc-1];
66                                          /* get the viewing parameters */
67 <        if (viewfile(picture, &ourview, &xres, &yres) <= 0 ||
67 >        if (viewfile(picture, &ourview, &ourres) <= 0 ||
68                          setview(&ourview) != NULL) {
69                  fprintf(stderr, "%s: cannot get view from \"%s\"\n",
70                                  progname, picture);
# Line 85 | Line 88 | char   *argv[];
88                  exit(1);
89                                          /* loop on input */
90          mainloop();
91 <
91 >                                        /* close pipe and exit */
92 >        pclose(pin);
93          exit(0);
94   }
95  
# Line 136 | Line 140 | struct node    *tp;
140  
141          for (kid = tp->daughter; kid != NULL; kid = kid->sister)
142                  freetree(kid);
143 <        free((char *)tp);
143 >        free((void *)tp);
144   }
145  
146  
# Line 153 | Line 157 | struct node    *tp;
157  
158  
159   strtoipt(ipt, str)              /* convert string x y z to image point */
160 < FVECT   ipt;
160 > int     ipt[2];
161   char    *str;
162   {
163 <        FVECT   pt;
163 >        FVECT   im_pt, pt;
164  
165 <        if (sscanf(str, "%lf %lf %lf", &pt[0], &pt[1], &pt[2]) != 3)
165 >        if (!sscanvec(str, pt))
166                  return(-1);
167 <        viewloc(ipt, &ourview, pt);
167 >        if (DOT(pt,pt) <= FTINY)                /* origin is really infinity */
168 >                ipt[0] = ipt[1] = -1;                   /* null vector */
169 >        else {
170 >                viewloc(im_pt, &ourview, pt);
171 >                loc2pix(ipt, &ourres, im_pt[0], im_pt[1]);
172 >        }
173          return(0);
174   }
175  
# Line 174 | Line 183 | int    xoff, yoff;
183  
184  
185   setvec(ipt)                     /* set up vector drawing for pick */
186 < double  ipt[2];
186 > int     ipt[2];
187   {
188 +        extern Window   xfindwind();
189          XWindowAttributes       wa;
190          XColor  xc;
191          XGCValues       gcv;
# Line 183 | Line 193 | double ipt[2];
193          Window  rw, cw;
194          unsigned int    pm;
195                                          /* compute pointer location */
196 <        if (gwind == 0 &&
197 <                (gwind = xfindwind(theDisplay, rwind, picture, 2)) == 0) {
198 <                fprintf(stderr, "%s: cannot find display window!\n", progname);
199 <                exit(1);
196 >        if (gwind == 0) {
197 >                register char   *wn;
198 >                for (wn = picture; *wn; wn++);
199 >                while (wn > picture && wn[-1] != '/') wn--;
200 >                if ((gwind = xfindwind(theDisplay, rwind, wn, 4)) == 0) {
201 >                        fprintf(stderr, "%s: cannot find display window!\n",
202 >                                        progname);
203 >                        exit(1);
204 >                }
205          }
206          XQueryPointer(theDisplay, gwind, &rw, &cw, &rx, &ry, &wx, &wy, &pm);
207 <        xoff = wx - ipt[0]*xres;
208 <        yoff = wy - (1.-ipt[1])*yres;
207 >        xoff = wx - ipt[0];
208 >        yoff = wy - ipt[1];
209                                          /* set graphics context */
210          if (vecGC == 0) {
211                  XGetWindowAttributes(theDisplay, gwind, &wa);
# Line 208 | Line 223 | double ipt[2];
223  
224  
225   vector(ip1, ip2)                /* draw a vector */
226 < double  ip1[2], ip2[2];
226 > int     ip1[2], ip2[2];
227   {
228 +        if (ip2[0] == -1 && ip2[1] == -1)
229 +                return;                 /* null vector */
230          XDrawLine(theDisplay, gwind, vecGC,
231 <                        (int)(ip1[0]*xres)+xoff, (int)((1.-ip1[1])*yres)+yoff,
232 <                        (int)(ip2[0]*xres)+xoff, (int)((1.-ip2[1])*yres)+yoff);
231 >                        ip1[0]+xoff, ip1[1]+yoff,
232 >                        ip2[0]+xoff, ip2[1]+yoff);
233          if (slow) {
234                  XFlush(theDisplay);
235                  sleep(1);

Diff Legend

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