ViewVC Help

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

root/Development/ray/src/common/objutil.c

Comparing ray/src/common/objutil.c (file contents):
Revision 2.15 by greg, Wed Apr 7 14:37:57 2021 UTC vs.
Revision 2.17 by greg, Wed Apr 7 16:46:58 2021 UTC

#	Line 784 | Line 784 | addScene(Scene *scdst, const Scene *scsrc)
784		{
785		VNDX            my_vlist[4];
786		int             *vert_map = NULL;
787	<	int             *norm_map = NULL;
788	<	int             *tex_map = NULL;
787	>	int             tex_off = 0;
788	>	int             norm_off = 0;
789		VNDX            *vlist = my_vlist;
790		int             vllen = sizeof(my_vlist)/sizeof(VNDX);
791		int             cur_mat = 0;
#	Line 799 | Line 799 | addScene(Scene *scdst, const Scene *scsrc)
799		if (scsrc->nfaces <= 0)
800		return(0);
801		/* map vertices */
802	<	vert_map = (int *)emalloc(sizeof(int *)*scsrc->nverts);
802	>	vert_map = (int *)emalloc(sizeof(int)*scsrc->nverts);
803		for (i = 0; i < scsrc->nverts; i++) {
804		const Vertex    *v = scsrc->vert + i;
805		if (v->vflist == NULL) {
#	Line 808 | Line 808 | addScene(Scene *scdst, const Scene *scsrc)
808		}
809		vert_map[i] = addVertex(scdst, v->p[0], v->p[1], v->p[2]);
810		}
811	<	if (scsrc->ntex > 0)            /* map texture coords */
812	<	tex_map = (int *)emalloc(sizeof(int *)*scsrc->ntex);
813	<	for (i = 0; i < scsrc->ntex; i++) {
814	<	const TexCoord  *t = scsrc->tex + i;
815	<	tex_map[i] = addTexture(scdst, t->u, t->v);
811	>	tex_off = scdst->ntex;          /* append texture coords */
812	>	if (scsrc->ntex > 0) {
813	>	scdst->tex = (TexCoord *)erealloc((char *)scdst->tex,
814	>	sizeof(TexCoord)*(tex_off+scsrc->ntex+(CHUNKSIZ-1)));
815	>	memcpy(scdst->tex+tex_off, scsrc->tex,
816	>	sizeof(TexCoord)*scsrc->ntex);
817		}
818	<	if (scsrc->nnorms > 0)          /* map normals */
819	<	norm_map = (int *)emalloc(sizeof(int *)*scsrc->nnorms);
820	<	for (i = 0; i < scsrc->nnorms; i++) {
821	<	const float     *n = scsrc->norm[i];
822	<	norm_map[i] = addNormal(scdst, n[0], n[1], n[2]);
818	>	norm_off = scdst->nnorms;       /* append normals */
819	>	if (scsrc->nnorms > 0) {
820	>	scdst->norm = (Normal *)erealloc((char *)scdst->norm,
821	>	sizeof(Normal)*(norm_off+scsrc->nnorms+(CHUNKSIZ-1)));
822	>	memcpy(scdst->norm+norm_off, scsrc->norm,
823	>	sizeof(Normal)*scsrc->nnorms);
824		}
825		/* add faces */
826		scdst->lastgrp = scdst->lastmat = 0;
#	Line 828 | Line 830 | addScene(Scene *scdst, const Scene *scsrc)
830		if (f->mat != cur_mat)
831		setMaterial(scdst, scsrc->matname[cur_mat = f->mat]);
832		if (f->nv > vllen) {
833	<	if (vlist == my_vlist)
834	<	vlist = (VNDX *)emalloc(
835	<	sizeof(VNDX)*(vllen = f->nv));
836	<	else
835	<	vlist = (VNDX *)erealloc((char *)vlist,
836	<	sizeof(VNDX)*(vllen = f->nv));
833	>	vlist = (VNDX *)( vlist == my_vlist ?
834	>	emalloc(sizeof(VNDX)*f->nv) :
835	>	erealloc((char *)vlist, sizeof(VNDX)*f->nv) );
836	>	vllen = f->nv;
837		}
838		memset(vlist, 0xff, sizeof(VNDX)*f->nv);
839		for (i = f->nv; i-- > 0; ) {
840		if (f->v[i].vid >= 0)
841		vlist[i][0] = vert_map[f->v[i].vid];
842		if (f->v[i].tid >= 0)
843	<	vlist[i][1] = tex_map[f->v[i].tid];
843	>	vlist[i][1] = f->v[i].tid + tex_off;
844		if (f->v[i].nid >= 0)
845	<	vlist[i][2] = norm_map[f->v[i].nid];
845	>	vlist[i][2] = f->v[i].nid + norm_off;
846		}
847		fcnt += (addFace(scdst, vlist, f->nv) != NULL);
848		}
849		/* clean up */
850		if (vlist != my_vlist) efree((char *)vlist);
851	–	if (norm_map != NULL) efree((char *)norm_map);
852	–	if (tex_map != NULL) efree((char *)tex_map);
851		efree((char *)vert_map);
852		return(fcnt);
853		}

Diff Legend

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