30 |
|
#include "pic.h" |
31 |
|
#include "x11raster.h" |
32 |
|
#include "random.h" |
33 |
+ |
#include "resolu.h" |
34 |
|
|
35 |
|
#define FONTNAME "8x13" /* text font we'll use */ |
36 |
|
|
71 |
|
|
72 |
|
COLR *scanline; /* scan line buffer */ |
73 |
|
|
74 |
< |
int xmax, ymax; /* picture resolution */ |
74 |
> |
RESOLU inpres; /* input resolution and ordering */ |
75 |
> |
int xmax, ymax; /* picture dimensions */ |
76 |
|
int width, height; /* window size */ |
77 |
|
char *fname = NULL; /* input file name */ |
78 |
|
FILE *fin = stdin; /* input file */ |
167 |
|
/* get header */ |
168 |
|
getheader(fin, headline, NULL); |
169 |
|
/* get picture dimensions */ |
170 |
< |
if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
170 |
> |
if (wrongformat || !fgetsresolu(&inpres, fin)) |
171 |
|
quiterr("bad picture format"); |
172 |
+ |
xmax = scanlen(&inpres); |
173 |
+ |
ymax = numscans(&inpres); |
174 |
|
/* set view parameters */ |
175 |
|
if (gotview && setview(&ourview) != NULL) |
176 |
|
gotview = 0; |
410 |
|
XColor cvx; |
411 |
|
int com, n; |
412 |
|
double comp; |
413 |
+ |
FLOAT hv[2]; |
414 |
|
FVECT rorg, rdir; |
415 |
|
|
416 |
|
n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL); |
459 |
|
XStoreColor(thedisplay, ourras->cmap, &cvx); |
460 |
|
return(0); |
461 |
|
case 'p': /* position */ |
462 |
< |
sprintf(buf, "(%d,%d)", ekey->x-xoff, ymax-1-ekey->y+yoff); |
462 |
> |
pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); |
463 |
> |
sprintf(buf, "(%d,%d)", (int)(hv[0]*inpres.xr), |
464 |
> |
(int)(hv[1]*inpres.yr)); |
465 |
|
XDrawImageString(thedisplay, wind, ourgc, ekey->x, ekey->y, |
466 |
|
buf, strlen(buf)); |
467 |
|
return(0); |
470 |
|
XBell(thedisplay, 0); |
471 |
|
return(-1); |
472 |
|
} |
473 |
< |
if (viewray(rorg, rdir, &ourview, |
474 |
< |
(ekey->x-xoff+.5)/xmax, |
468 |
< |
(ymax-1-ekey->y+yoff+.5)/ymax) < 0) |
473 |
> |
pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff); |
474 |
> |
if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) |
475 |
|
return(-1); |
476 |
|
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
477 |
|
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |