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.14 by greg, Wed Apr 7 03:02:00 2021 UTC vs.
Revision 2.17 by greg, Wed Apr 7 16:46:58 2021 UTC

#	Line 604 | Line 604 | add2facelist(Scene *sc, Face *f, int i)
604		fp->v[j].fnext = f;                     /* append new face */
605		}
606
607	–	/* Allocate an empty scene */
608	–	Scene *
609	–	newScene(void)
610	–	{
611	–	Scene   *sc = (Scene *)ecalloc(1, sizeof(Scene));
612	–	/* default group & material */
613	–	sc->grpname = chunk_alloc(char *, sc->grpname, sc->ngrps);
614	–	sc->grpname[sc->ngrps++] = savqstr("DEFAULT_GROUP");
615	–	sc->matname = chunk_alloc(char *, sc->matname, sc->nmats);
616	–	sc->matname[sc->nmats++] = savqstr("DEFAULT_MATERIAL");
617	–
618	–	return(sc);
619	–	}
620	–
607		/* Add a vertex to a scene */
608		int
609		addVertex(Scene *sc, double x, double y, double z)
#	Line 714 | Line 700 | addFace(Scene *sc, VNDX vid[], int nv)
700		return(f);
701		}
702
703	+	/* Allocate an empty scene */
704	+	Scene *
705	+	newScene(void)
706	+	{
707	+	Scene   *sc = (Scene *)ecalloc(1, sizeof(Scene));
708	+	/* default group & material */
709	+	sc->grpname = chunk_alloc(char *, sc->grpname, sc->ngrps);
710	+	sc->grpname[sc->ngrps++] = savqstr("DEFAULT_GROUP");
711	+	sc->matname = chunk_alloc(char *, sc->matname, sc->nmats);
712	+	sc->matname[sc->nmats++] = savqstr("DEFAULT_MATERIAL");
713	+
714	+	return(sc);
715	+	}
716	+
717		/* Duplicate a scene, optionally selecting faces */
718		Scene *
719		dupScene(const Scene *osc, int flreq, int flexc)
#	Line 729 | Line 729 | dupScene(const Scene *osc, int flreq, int flexc)
729		sc = newScene();
730		for (i = 0; i < osc->ndescr; i++)
731		addComment(sc, osc->descr[i]);
732	<	if (osc->ngrps) {
733	<	sc->grpname = (char **)emalloc(sizeof(char *) *
734	<	(osc->ngrps+(CHUNKSIZ-1)));
735	<	for (i = 0; i < osc->ngrps; i++)
732	>	if (osc->ngrps > 1) {
733	>	sc->grpname = (char **)erealloc((char *)sc->grpname,
734	>	sizeof(char *) * (osc->ngrps+(CHUNKSIZ-1)));
735	>	for (i = 1; i < osc->ngrps; i++)
736		sc->grpname[i] = savqstr(osc->grpname[i]);
737		sc->ngrps = osc->ngrps;
738		}
739	<	if (osc->nmats) {
740	<	sc->matname = (char **)emalloc(sizeof(char *) *
741	<	(osc->nmats+(CHUNKSIZ-1)));
742	<	for (i = 0; i < osc->nmats; i++)
739	>	if (osc->nmats > 1) {
740	>	sc->matname = (char **)erealloc((char *)sc->matname,
741	>	sizeof(char *) * (osc->nmats+(CHUNKSIZ-1)));
742	>	for (i = 1; i < osc->nmats; i++)
743		sc->matname[i] = savqstr(osc->matname[i]);
744		sc->nmats = osc->nmats;
745		}
746		if (osc->nverts) {
747		sc->vert = (Vertex *)emalloc(sizeof(Vertex) *
748		(osc->nverts+(CHUNKSIZ-1)));
749	<	memcpy((void *)sc->vert, (const void *)osc->vert,
750	<	sizeof(Vertex)*osc->nverts);
749	>	memcpy(sc->vert, osc->vert, sizeof(Vertex)*osc->nverts);
750		sc->nverts = osc->nverts;
751		for (i = 0; i < sc->nverts; i++)
752		sc->vert[i].vflist = NULL;
#	Line 755 | Line 754 | dupScene(const Scene *osc, int flreq, int flexc)
754		if (osc->ntex) {
755		sc->tex = (TexCoord *)emalloc(sizeof(TexCoord) *
756		(osc->ntex+(CHUNKSIZ-1)));
757	<	memcpy((void *)sc->tex, (const void *)osc->tex,
759	<	sizeof(TexCoord)*osc->ntex);
757	>	memcpy(sc->tex, osc->tex, sizeof(TexCoord)*osc->ntex);
758		sc->ntex = osc->ntex;
759		}
760		if (osc->nnorms) {
761		sc->norm = (Normal *)emalloc(sizeof(Normal) *
762		(osc->nnorms+CHUNKSIZ));
763	<	memcpy((void *)sc->norm, (const void *)osc->norm,
766	<	sizeof(Normal)*osc->nnorms);
763	>	memcpy(sc->norm, osc->norm, sizeof(Normal)*osc->nnorms);
764		sc->nnorms = osc->nnorms;
765		}
766		for (fo = osc->flist; fo != NULL; fo = fo->next) {
767		if ((fo->flags & fltest) != flreq)
768		continue;
769	<	f = (Face *)emalloc(sizeof(Face) +
770	<	sizeof(VertEnt)*(fo->nv-3));
774	<	memcpy((void *)f, (const void *)fo, sizeof(Face) +
775	<	sizeof(VertEnt)*(fo->nv-3));
769	>	f = (Face *)emalloc(sizeof(Face) + sizeof(VertEnt)*(fo->nv-3));
770	>	memcpy(f, fo, sizeof(Face) + sizeof(VertEnt)*(fo->nv-3));
771		for (i = 0; i < f->nv; i++)
772		add2facelist(sc, f, i);
773		f->next = sc->flist;
#	Line 789 | 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 804 | 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 813 | 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 833 | 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
840	<	vlist = (VNDX *)erealloc((char *)vlist,
841	<	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);
856	–	if (norm_map != NULL) efree((char *)norm_map);
857	–	if (tex_map != NULL) efree((char *)tex_map);
851		efree((char *)vert_map);
852		return(fcnt);
853		}
#	Line 1012 | Line 1005 | skip_tex:
1005		if (!vmap[i])
1006		continue;
1007		if (nused != i)
1008	<	memcpy((void *)sc->norm[nused],
1016	<	(void *)sc->norm[i],
1017	<	sizeof(Normal));
1008	>	memcpy(sc->norm[nused], sc->norm[i], sizeof(Normal));
1009		vmap[i] = nused++;
1010		}
1011		if (nused == sc->nnorms)

Diff Legend

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