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

Comparing ray/src/meta/mplot.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 58 | Line 58 | initplot(void)                 /* initialize this plot */
58   {
59      thispage();
60      outspan.xleft = 0;
61 <    outspan.xright = dxsize - 1;
62 <    outspan.ytop = dysize + linhite - 1;
63 <    outspan.ybot = dysize;
61 >    outspan.xright = dxsiz - 1;
62 >    outspan.ytop = dysiz + linhite - 1;
63 >    outspan.ybot = dysiz;
64  
65   }
66  
# Line 148 | Line 148 | plotspan(                      /* plot next span */
148          pfree(p);
149      }
150                                          /* plot from file */
151 <    while (isprim(nextp.com) && CONV(nextp.xy[YMX],dysize) >= outspan.ybot) {
151 >    while (isprim(nextp.com) && CONV(nextp.xy[YMX],dysiz) >= outspan.ybot) {
152          doprim(&nextp);
153          fargs(&nextp);
154          readp(&nextp, infp);
# Line 167 | Line 167 | nextspan(void)         /* prepare next span */
167          
168      if (spanmin <= spanmax) {                   /* clear span */
169  
170 <        i = nrows*dxsize;
170 >        i = nrows*dxsiz;
171          colp = outspan.cols;
172          tcolp = outspan.tcols;
173          while (i--)
# Line 176 | Line 176 | nextspan(void)         /* prepare next span */
176              
177      outspan.ytop -= linhite;                    /* advance to next */
178      outspan.ybot -= linhite;
179 <    spanmin = dxsize;
179 >    spanmin = dxsiz;
180      spanmax = 0;
181  
182   }
# Line 190 | Line 190 | outputspan(void)               /* output span to printer */
190  
191      if (spanmin <= spanmax) {                   /* overlay spans */
192  
193 <        i = nrows*dxsize;
193 >        i = nrows*dxsiz;
194          colp = outspan.cols;
195          tcolp = outspan.tcols;
196          while (i--)
# Line 215 | Line 215 | register PRIMITIVE  *p
215  
216          case PRFILL:
217              fill((p->arg0&0103) | (pati[(p->arg0>>2)&03]<<2),
218 <                        CONV(p->xy[XMN],dxsize),CONV(p->xy[YMN],dysize),
219 <                        CONV(p->xy[XMX],dxsize)+(p->arg0&0100?-1:0),
220 <                        CONV(p->xy[YMX],dysize)+(p->arg0&0100?-1:0));
218 >                        CONV(p->xy[XMN],dxsiz),CONV(p->xy[YMN],dysiz),
219 >                        CONV(p->xy[XMX],dxsiz)+(p->arg0&0100?-1:0),
220 >                        CONV(p->xy[YMX],dysiz)+(p->arg0&0100?-1:0));
221              break;
222  
223          case PTFILL:
# Line 234 | Line 234 | register PRIMITIVE  *p
234              return;
235      }
236  
237 <    if (CONV(p->xy[YMN],dysize) < outspan.ybot) {       /* save for next time */
237 >    if (CONV(p->xy[YMN],dysiz) < outspan.ybot) {        /* save for next time */
238          if ((newp = palloc()) == NULL)
239              error(SYSTEM, "memory limit exceeded in doprim");
240          mcopy((char *)newp, (char *)p, sizeof(PRIMITIVE));
# Line 263 | Line 263 | plotlseg(              /* plot a line segment */
263  
264      ti = (p->arg0 >> 2) & 03;                   /* compute line radius */
265      ti = WIDTH(ti) / 2;
266 <    hrad = CONV(ti, dxsize);
267 <    vrad = CONV(ti, dysize);
266 >    hrad = CONV(ti, dxsiz);
267 >    vrad = CONV(ti, dysiz);
268      if (hrad < minwidth)
269          hrad = minwidth;
270      if (vrad < minwidth)
271          vrad = minwidth;
272  
273 <    x = CONV(p->xy[XMX], dxsize);               /* start at top */
274 <    y = CONV(p->xy[YMX], dysize);
275 <    run = CONV(p->xy[XMN], dxsize) - x;
276 <    rise = CONV(p->xy[YMN], dysize) - y;
273 >    x = CONV(p->xy[XMX], dxsiz);                /* start at top */
274 >    y = CONV(p->xy[YMX], dysiz);
275 >    run = CONV(p->xy[XMN], dxsiz) - x;
276 >    rise = CONV(p->xy[YMN], dysiz) - y;
277  
278      if (p->arg0 & 0100)                         /* slope < 0; reverse x */
279          x -= (run = -run);
# Line 373 | Line 373 | tfill(                 /* fill a triangle */
373      int  xmn, ymn, tpat;
374      long  xsz, ysz;
375  
376 <    xmn = CONV(p->xy[XMN], dxsize);
377 <    xsz = CONV(p->xy[XMX], dxsize) - xmn;
378 <    ymn = CONV(p->xy[YMN], dysize);
379 <    ysz = CONV(p->xy[YMX], dysize) - ymn;
376 >    xmn = CONV(p->xy[XMN], dxsiz);
377 >    xsz = CONV(p->xy[XMX], dxsiz) - xmn;
378 >    ymn = CONV(p->xy[YMN], dysiz);
379 >    ysz = CONV(p->xy[YMX], dysiz) - ymn;
380      if (xsz <= 0 || ysz <= 0)
381          return;
382      txmin = (outspan.ybot - ymn)*xsz/ysz;
# Line 449 | Line 449 | fill(  /* fill rectangle with attribute */
449                                  [((outspan.ybot>>3)+rpos)%(PATSIZE>>3)];
450  
451              if (attrib & 0100) {
452 <                colp = &outspan.tcols[rpos*dxsize + xmin];
452 >                colp = &outspan.tcols[rpos*dxsiz + xmin];
453                  for (i = xmin; i <= xmax; i++)
454                      *colp++ ^= filpat & pattr[i%PATSIZE];
455              } else {
456 <                colp = &outspan.cols[rpos*dxsize + xmin];
456 >                colp = &outspan.cols[rpos*dxsiz + xmin];
457                  for (i = xmin; i <= xmax; i++)
458                      *colp++ |= filpat & pattr[i%PATSIZE];
459              }

Diff Legend

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