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

Comparing ray/src/rt/rv3.c (file contents):
Revision 2.9 by greg, Fri Aug 18 10:27:11 1995 UTC vs.
Revision 2.13 by schorsch, Mon Jul 21 22:30:19 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1994 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   *  rv3.c - miscellaneous routines for rview.
6   *
7 < *     5/11/87
7 > *  External symbols declared in rpaint.h
8   */
9  
10 < #include  "ray.h"
10 > #include "copyright.h"
11  
12 < #include  "octree.h"
12 > #include <string.h>
13  
14 + #include  "ray.h"
15   #include  "rpaint.h"
18 –
16   #include  "random.h"
17  
18   #ifndef WFLUSH
# Line 33 | Line 30 | static char SCCSid[] = "$SunId$ LBL";
30   #endif
31  
32  
33 + int
34   getrect(s, r)                           /* get a box */
35   char  *s;
36   register RECT  *r;
# Line 79 | Line 77 | register RECT  *r;
77   }
78  
79  
80 + int
81   getinterest(s, direc, vec, mp)          /* get area of interest */
82   char  *s;
83   int  direc;
# Line 143 | Line 142 | register COLOR  col;
142   }
143  
144  
145 + void
146   paint(p, xmin, ymin, xmax, ymax)        /* compute and paint a rectangle */
147   register PNODE  *p;
148   int  xmin, ymin, xmax, ymax;
149   {
150 –        extern unsigned long  nrays;
150          static unsigned long  lastflush = 0;
151          static RAY  thisray;
152          double  h, v;
# Line 185 | Line 184 | int  xmin, ymin, xmax, ymax;
184   }
185  
186  
187 + void
188   newimage()                              /* start a new image */
189   {
190                                                  /* free old image */
# Line 205 | Line 205 | newimage()                             /* start a new image */
205   }
206  
207  
208 + void
209   redraw()                                /* redraw the image */
210   {
211          (*dev->clear)(hresolu, vresolu);
# Line 214 | Line 215 | redraw()                               /* redraw the image */
215   }
216  
217  
218 + void
219   repaint(xmin, ymin, xmax, ymax)                 /* repaint a region */
220   int  xmin, ymin, xmax, ymax;
221   {
# Line 226 | Line 228 | int  xmin, ymin, xmax, ymax;
228   }
229  
230  
231 + void
232   paintrect(p, xmin, ymin, xmax, ymax, r)         /* paint picture rectangle */
233   register PNODE  *p;
234   int  xmin, ymin, xmax, ymax;
# Line 296 | Line 299 | int  pd;
299   }
300  
301  
302 + void
303   scalepict(p, sf)                        /* scale picture values */
304   register PNODE  *p;
305   double  sf;
# Line 312 | Line 316 | double  sf;
316   }
317  
318  
319 + void
320   getpictcolrs(yoff, scan, p, xsiz, ysiz) /* get scanline from picture */
321   int  yoff;
322   register COLR  *scan;
# Line 342 | Line 347 | int  xsiz, ysiz;
347   }
348  
349  
350 < pcopy(p1, p2)                           /* copy paint node p1 into p2 */
346 < register PNODE  *p1, *p2;
347 < {
348 <        copycolor(p2->v, p1->v);
349 <        p2->x = p1->x;
350 <        p2->y = p1->y;
351 < }
352 <
353 <
350 > void
351   freepkids(p)                            /* free pnode's children */
352   register PNODE  *p;
353   {
# Line 360 | Line 357 | register PNODE  *p;
357          freepkids(p->kid+DR);
358          freepkids(p->kid+UL);
359          freepkids(p->kid+UR);
360 <        free((char *)p->kid);
360 >        free((void *)p->kid);
361          p->kid = NULL;
362   }
363  
364  
365 + void
366   newview(vp)                             /* change viewing parameters */
367   register VIEW  *vp;
368   {
# Line 373 | Line 371 | register VIEW  *vp;
371          if ((err = setview(vp)) != NULL) {
372                  sprintf(errmsg, "view not set - %s", err);
373                  error(COMMAND, errmsg);
374 <        } else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
375 <                copystruct(&oldview, &ourview);
376 <                copystruct(&ourview, vp);
374 >        } else if (memcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
375 >                oldview = ourview;
376 >                ourview = *vp;
377                  newimage();
378          }
379   }
380  
381  
382 + void
383   moveview(angle, elev, mag, vc)                  /* move viewpoint */
384   double  angle, elev, mag;
385   FVECT  vc;
# Line 425 | Line 424 | FVECT  vc;
424   }
425  
426  
427 + void
428 + pcopy(p1, p2)                           /* copy paint node p1 into p2 */
429 + register PNODE  *p1, *p2;
430 + {
431 +        copycolor(p2->v, p1->v);
432 +        p2->x = p1->x;
433 +        p2->y = p1->y;
434 + }
435 +
436 +
437 + void
438   zoomview(vp, zf)                        /* zoom in or out */
439   register VIEW  *vp;
440   double  zf;

Diff Legend

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