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

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.36 by greg, Tue May 13 17:58:33 2003 UTC vs.
Revision 3.40 by schorsch, Mon Jul 21 22:30:18 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Routines for tracking beam compuatations
6   */
7  
8 + #include <string.h>
9 +
10   #include "rholo.h"
11   #include "view.h"
12  
# Line 75 | Line 77 | register PACKHEAD      *b0, *b1;
77   }
78  
79  
80 < int
80 > void
81   dispbeam(b, hb)                         /* display a holodeck beam */
82   register BEAM   *b;
83   register HDBEAMI        *hb;
# Line 92 | Line 94 | register HDBEAMI       *hb;
94                  CHECK(p==NULL, SYSTEM, "out of memory in dispbeam");
95          }
96                                          /* assign packet fields */
97 <        bcopy((void *)hdbray(b), (void *)packra(p), b->nrm*sizeof(RAYVAL));
97 >        memcpy((void *)packra(p), (void *)hdbray(b), b->nrm*sizeof(RAYVAL));
98          p->nr = p->nc = b->nrm;
99          for (p->hd = 0; hdlist[p->hd] != hb->h; p->hd++)
100                  if (hdlist[p->hd] == NULL)
# Line 166 | Line 168 | int    nents;
168                  complist = (PACKHEAD *)malloc(nents*sizeof(PACKHEAD));
169                  if (complist == NULL)
170                          goto memerr;
171 <                bcopy((void *)clist, (void *)complist, nents*sizeof(PACKHEAD));
171 >                memcpy((void *)complist, (void *)clist, nents*sizeof(PACKHEAD));
172                  break;
173          case BS_ADD:                    /* add to computation set */
174          case BS_MAX:                    /* maximum of quantities */
# Line 260 | Line 262 | int    bi;
262  
263   ambient_list()                  /* compute ambient beam list */
264   {
265 <        int4    wtotal, minrt;
265 >        int32   wtotal, minrt;
266          double  frac;
267          int     i;
268          register int    j, k;
# Line 308 | Line 310 | FILE   *fp;
310          char    *err;
311          BEAMLIST        blist;
312  
313 <        copystruct(&curview, &stdview);
313 >        curview = stdview;
314          while (nextview(&curview, fp) != EOF) {
315                  if ((err = setview(&curview)) != NULL) {
316                          error(WARNING, err);
# Line 355 | Line 357 | int    n1, n2;
357                  else if (!n2) cmp = -1;
358                  else cmp = beamcmp(cl1, cl2);
359                  if (cmp > 0) {
360 <                        copystruct(cdest, cl2);
360 >                        *cdest = *cl2;
361                          cl2++; n2--;
362                  } else {
363 <                        copystruct(cdest, cl1);
363 >                        *cdest = *cl1;
364                          cl1++; n1--;
365                  }
366                  cdest++;
# Line 391 | Line 393 | sortcomplist()                 /* fix our list order */
393          else if (listpos) {     /* else sort and merge sublist */
394                  list2 = (PACKHEAD *)malloc(listpos*sizeof(PACKHEAD));
395                  CHECK(list2==NULL, SYSTEM, "out of memory in sortcomplist");
396 <                bcopy((void *)complist,(void *)list2,listpos*sizeof(PACKHEAD));
396 >                memcpy((void *)list2,(void *)complist,listpos*sizeof(PACKHEAD));
397                  qsort((void *)list2, listpos, sizeof(PACKHEAD), beamcmp);
398                  mergeclists(complist, list2, listpos,
399                                  complist+listpos, complen-listpos);

Diff Legend

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