ViewVC Help

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

root/Development/ray/src/cv/obj2rad.c

Comparing ray/src/cv/obj2rad.c (file contents):
Revision 2.18 by greg, Tue Mar 4 01:42:29 2003 UTC vs.
Revision 2.21 by schorsch, Sun Jul 27 22:12:02 2003 UTC

#	Line 29 | Line 29 | FVECT  *vlist;                 /* our vertex list */
29		int     nvs;                    /* number of vertices in our list */
30		FVECT   *vnlist;                /* vertex normal list */
31		int     nvns;
32	<	FLOAT   (*vtlist)[2];           /* map vertex list */
32	>	RREAL   (*vtlist)[2];           /* map vertex list */
33		int     nvts;
34
35		typedef int     VNDX[3];        /* vertex index (point,map,normal) */
#	Line 100 | Line 100 | char   *argv[];
100		default:
101		goto userr;
102		}
103	<	if (i > argc | i < argc-1)
103	>	if ((i > argc) | (i < argc-1))
104		goto userr;
105		if (i == argc)
106		inpfile = "<stdin>";
#	Line 137 | Line 137 | FILE   *fp;
137		ID      tmpid;
138		register int    i;
139
140	<	while (argc = getstmt(argv, fp))
140	>	while ( (argc = getstmt(argv, fp)) )
141		switch (argv[0][0]) {
142		case 'f':                               /* face */
143		if (!argv[0][1])
#	Line 188 | Line 188 | FILE   *fp;
188
189		nstats = nunknown = 0;
190		/* scan until EOF */
191	<	while (argc = getstmt(argv, fp)) {
191	>	while ( (argc = getstmt(argv, fp)) ) {
192		switch (argv[0][0]) {
193		case 'v':               /* vertex */
194		switch (argv[0][1]) {
#	Line 357 | Line 357 | getonm()                               /* invent a good name for object */
357		cp2 = group[i];
358		if (cp1 > name)
359		*cp1++ = '.';
360	<	while (*cp1 = *cp2++)
360	>	while ( (*cp1 = *cp2++) )
361		if (++cp1 >= name+sizeof(name)-2) {
362		*cp1 = '\0';
363		return(name);
#	Line 470 | Line 470 | register int   ac;
470		register char   **av;
471		{
472		VNDX    vi;
473	<	FLOAT   *p0, *p1;
473	>	RREAL   *p0, *p1;
474		FVECT   v1, v2, nsum, newn;
475		double  d;
476		register int    i;
#	Line 555 | Line 555 | char   *v1, *v2, *v3;
555		char    *mod;
556		VNDX    v1i, v2i, v3i;
557		BARYCCM bvecs;
558	<	FLOAT   bcoor[3][3];
558	>	RREAL   bcoor[3][3];
559		int     texOK, patOK;
560		int     flatness;
561		register int    i;
#	Line 664 | Line 664 | double x, y, z;
664		if (nvs == 0)
665		vlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT));
666		else
667	<	vlist = (FVECT *)realloc((char *)vlist,
667	>	vlist = (FVECT *)realloc((void *)vlist,
668		(nvs+CHUNKSIZ)*sizeof(FVECT));
669		if (vlist == NULL) {
670		fprintf(stderr,
#	Line 688 | Line 688 | double x, y, z;
688		if (nvns == 0)
689		vnlist = (FVECT *)malloc(CHUNKSIZ*sizeof(FVECT));
690		else
691	<	vnlist = (FVECT *)realloc((char *)vnlist,
691	>	vnlist = (FVECT *)realloc((void *)vnlist,
692		(nvns+CHUNKSIZ)*sizeof(FVECT));
693		if (vnlist == NULL) {
694		fprintf(stderr,
#	Line 712 | Line 712 | double x, y;
712		{
713		if (!(nvts%CHUNKSIZ)) {         /* allocate next block */
714		if (nvts == 0)
715	<	vtlist = (FLOAT (*)[2])malloc(CHUNKSIZ*2*sizeof(FLOAT));
715	>	vtlist = (RREAL (*)[2])malloc(CHUNKSIZ*2*sizeof(RREAL));
716		else
717	<	vtlist = (FLOAT (*)[2])realloc((char *)vtlist,
718	<	(nvts+CHUNKSIZ)*2*sizeof(FLOAT));
717	>	vtlist = (RREAL (*)[2])realloc((void *)vtlist,
718	>	(nvts+CHUNKSIZ)*2*sizeof(RREAL));
719		if (vtlist == NULL) {
720		fprintf(stderr,
721		"Out of memory while allocating texture vertex %d\n",

Diff Legend

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