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

Comparing ray/src/hd/rhdobj.c (file contents):
Revision 3.13 by schorsch, Thu Jun 26 00:58:10 2003 UTC vs.
Revision 3.15 by schorsch, Mon Jul 21 22:30:18 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   * Routines for loading and displaying Radiance objects in rholo with GLX.
6   */
7  
8 + #include <string.h>
9 +
10   #include "radogl.h"
11   #include "tonemap.h"
12   #include "rhdisp.h"
# Line 338 | Line 340 | ssph_compute()                 /* compute source set from sphere sam
340          d = 1.0/ncells;
341          scalecolor(dlightsets->lamb, d);
342   done:                                   /* clear sphere sample array */
343 <        bzero((void *)ssamp, sizeof(ssamp));
343 >        memset((void *)ssamp, '\0', sizeof(ssamp));
344          return(ncells);
345   }
346  
# Line 371 | Line 373 | int    force;
373          if (!force)
374                  return(0);
375                                          /* need to compute new light set */
376 <        copystruct(&cvw, &stdview);
376 >        cvw = stdview;
377          cvw.type = VT_PER;
378          VCOPY(cvw.vp, ocent);
379          cvw.vup[0] = 1.; cvw.vup[1] = cvw.vup[2] = 0.;
# Line 731 | Line 733 | dobj_unmove()                          /* undo last transform change */
733                  return(0);
734          }
735                                          /* hold last transform */
736 <        bcopy((void *)lastxfav, (void *)txfav,
736 >        memcpy((void *)txfav, (void *)lastxfav,
737                          (txfac=lastxfac)*sizeof(char *));
738                                          /* save this transform */
739 <        bcopy((void *)curobj->xfav, (void *)lastxfav,
739 >        memcpy((void *)lastxfav, (void *)curobj->xfav,
740                          (lastxfac=curobj->xfac)*sizeof(char *));
741                                          /* copy back last transform */
742 <        bcopy((void *)txfav, (void *)curobj->xfav,
742 >        memcpy((void *)curobj->xfav, (void *)txfav,
743                          (curobj->xfac=txfac)*sizeof(char *));
744                                          /* set matrices */
745          fullxf(&curobj->xfb, curobj->xfac, curobj->xfav);
# Line 772 | Line 774 | char   *oldnm, *nam;
774          opdup = (DOBJECT *)malloc(sizeof(DOBJECT));
775          if (opdup == NULL)
776                  error(SYSTEM, "out of memory in dobj_dup");
777 <        copystruct(opdup, op);
777 >        *opdup = *op;
778                                          /* rename */
779          strcpy(opdup->name, nam);
780                                          /* get our own copy of transform */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)