ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/hd/rholo3.c

Comparing ray/src/hd/rholo3.c (file contents):
Revision 3.35 by greg, Wed Apr 23 00:52: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((char *)hdbray(b), (char *)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 118 | Line 120 | int    nents;
120		/* search for common members */
121		for (csm = clist+nents; csm-- > clist; )
122		csm->nc = -1;
123	<	qsort((char *)clist, nents, sizeof(PACKHEAD), beamidcmp);
123	>	qsort((void *)clist, nents, sizeof(PACKHEAD), beamidcmp);
124		for (i = 0; i < complen; i++) {
125	<	csm = (PACKHEAD *)bsearch((char *)(complist+i), (char *)clist,
125	>	csm = (PACKHEAD *)bsearch((void *)(complist+i), (void *)clist,
126		nents, sizeof(PACKHEAD), beamidcmp);
127		if (csm == NULL)
128		continue;
#	Line 166 | Line 168 | int    nents;
168		complist = (PACKHEAD *)malloc(nents*sizeof(PACKHEAD));
169		if (complist == NULL)
170		goto memerr;
171	<	bcopy((char *)clist, (char *)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 174 | Line 176 | int    nents;
176		if (nents <= 0)
177		return;
178		sortcomplist();         /* sort updated list & new entries */
179	<	qsort((char *)clist, nents, sizeof(PACKHEAD), beamcmp);
179	>	qsort((void *)clist, nents, sizeof(PACKHEAD), beamcmp);
180		/* what can't we satisfy? */
181		for (i = nents, csm = clist; i-- && csm->nr > csm->nc; csm++)
182		;
#	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 387 | Line 389 | sortcomplist()                 /* fix our list order */
389		#endif
390		}
391		if (lastin < 0 || listpos*4 >= complen*3)
392	<	qsort((char *)complist, complen, sizeof(PACKHEAD), beamcmp);
392	>	qsort((void *)complist, complen, sizeof(PACKHEAD), beamcmp);
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((char *)complist,(char *)list2,listpos*sizeof(PACKHEAD));
397	<	qsort((char *)list2, listpos, sizeof(PACKHEAD), beamcmp);
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);
400		free((void *)list2);

Diff Legend

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