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

Comparing ray/src/meta/rplot.c (file contents):
Revision 1.3 by schorsch, Sat Nov 15 02:13:37 2003 UTC vs.
Revision 1.4 by greg, Mon Nov 18 22:12:32 2019 UTC

# Line 53 | Line 53 | initplot(void)                 /* initialize this plot */
53                                          /* allocate block */
54      if (outblock.xright <= 0) {
55          for (i = 0; i < NUMSCANS; i++)
56 <            if ((outblock.cols[i] = (unsigned char *)malloc(dxsize)) == NULL)
56 >            if ((outblock.cols[i] = (unsigned char *)malloc(dxsiz)) == NULL)
57                  error(SYSTEM, "out of memory in initplot");
58      }
59      outblock.xleft = 0;
60 <    outblock.xright = dxsize-1;
60 >    outblock.xright = dxsiz-1;
61      if (ydown) {
62 <        outblock.ytop = dysize+NUMSCANS-1;
63 <        outblock.ybot = dysize;
62 >        outblock.ytop = dysiz+NUMSCANS-1;
63 >        outblock.ybot = dysiz;
64      } else {
65          outblock.ytop = -1;
66          outblock.ybot = -NUMSCANS;
# Line 146 | Line 146 | nextblock(void)                /* prepare next block */
146                                                  /* clear block */
147      for (i = 0; i < NUMSCANS; i++) {
148          colp = outblock.cols[i];
149 <        n = dxsize;
149 >        n = dxsiz;
150          while (n--)
151              *colp++ = IWHT<<3 | IWHT;
152      }
# Line 196 | Line 196 | doprim(                /* plot primitive */
196  
197          case PRFILL:
198              fill((p->arg0&0103) | (pati[(p->arg0>>2)&03]<<2),
199 <                        CONV(p->xy[XMN],dxsize),CONV(p->xy[YMN],dysize),
200 <                        CONV(p->xy[XMX],dxsize)+(p->arg0&0100?-1:0),
201 <                        CONV(p->xy[YMX],dysize)+(p->arg0&0100?-1:0));
199 >                        CONV(p->xy[XMN],dxsiz),CONV(p->xy[YMN],dysiz),
200 >                        CONV(p->xy[XMX],dxsiz)+(p->arg0&0100?-1:0),
201 >                        CONV(p->xy[YMX],dysiz)+(p->arg0&0100?-1:0));
202              break;
203  
204          case PTFILL:
# Line 238 | Line 238 | plotlseg(              /* plot a line segment */
238  
239      ti = (p->arg0 >> 2) & 03;                   /* compute line radius */
240      ti = WIDTH(ti) / 2;
241 <    hrad = CONV(ti, dxsize);
242 <    vrad = CONV(ti, dysize);
241 >    hrad = CONV(ti, dxsiz);
242 >    vrad = CONV(ti, dysiz);
243      if (hrad < minwidth)
244          hrad = minwidth;
245      if (vrad < minwidth)
246          vrad = minwidth;
247  
248 <    x = CONV(p->xy[XMX], dxsize);               /* start at top */
249 <    y = CONV(p->xy[YMX], dysize);
250 <    run = CONV(p->xy[XMN], dxsize) - x;
251 <    rise = CONV(p->xy[YMN], dysize) - y;
248 >    x = CONV(p->xy[XMX], dxsiz);                /* start at top */
249 >    y = CONV(p->xy[YMX], dysiz);
250 >    run = CONV(p->xy[XMN], dxsiz) - x;
251 >    rise = CONV(p->xy[YMN], dysiz) - y;
252  
253      if (p->arg0 & 0100)                         /* slope < 0; reverse x */
254          x -= (run = -run);
# Line 348 | Line 348 | tfill(                 /* fill a triangle */
348      int  xmn, ymn, tpat;
349      long  xsz, ysz;
350  
351 <    xmn = CONV(p->xy[XMN], dxsize);
352 <    xsz = CONV(p->xy[XMX], dxsize) - xmn;
353 <    ymn = CONV(p->xy[YMN], dysize);
354 <    ysz = CONV(p->xy[YMX], dysize) - ymn;
351 >    xmn = CONV(p->xy[XMN], dxsiz);
352 >    xsz = CONV(p->xy[XMX], dxsiz) - xmn;
353 >    ymn = CONV(p->xy[YMN], dysiz);
354 >    ysz = CONV(p->xy[YMX], dysiz) - ymn;
355      if (xsz <= 0 || ysz <= 0)
356          return;
357      txmin = (outblock.ybot - ymn)*xsz/ysz;

Diff Legend

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