ViewVC Help

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

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

Comparing ray/src/hd/rhdobj.c (file contents):
Revision 3.6 by gwlarson, Fri Oct 9 17:34:00 1998 UTC vs.
Revision 3.10 by gwlarson, Fri Jan 29 15:33:36 1999 UTC

#	Line 55 | Line 55 | typedef struct dobject {
55		FVECT   center;                 /* orig. object center */
56		FLOAT   radius;                 /* orig. object radius */
57		int     listid;                 /* GL display list identifier */
58	+	int     nlists;                 /* number of lists allocated */
59		int     rtp[3];                 /* associated rtrace process */
60		DLIGHTS *ol;                    /* object lights */
61		FULLXF  xfb;                    /* coordinate transform */
#	Line 119 | Line 120 | register DOBJECT       *op;
120		}
121		dobjects = ohead.next;
122		if (!foundlink) {
123	<	glDeleteLists(op->listid, 1);
123	>	glDeleteLists(op->listid, op->nlists);
124		close_process(op->rtp);
125		}
126		while (op->xfac)
#	Line 416 | Line 417 | memerr:
417		}
418
419
420	<	static int
420	>	static
421		cmderror(cn, err)               /* report command error */
422		int     cn;
423		char    *err;
424		{
425		sprintf(errmsg, "%s: %s", rhdcmd[cn], err);
426		error(COMMAND, errmsg);
426	–	return(cn);
427		}
428
429
#	Line 432 | Line 432 | dobj_command(cmd, args)                /* run object display command
432		char    *cmd;
433		register char   *args;
434		{
435	+	int     somechange = 0;
436		int     cn, na, doxfm;
437		register int    nn;
438		char    *alist[MAXAC+1], *nm;
#	Line 459 | Line 460 | register char  *args;
460		dobj_load(alist[0], alist[0]);
461		else if (na == 2)
462		dobj_load(alist[0], alist[1]);
463	<	else
464	<	return(cmderror(cn, "need octree [name]"));
463	>	else {
464	>	cmderror(cn, "need octree [name]");
465	>	return(0);
466	>	}
467		break;
468		case DO_UNLOAD:                         /* clear an object */
469		if (na > 1) goto toomany;
470		if (na && alist[0][0] == '*')
471	<	dobj_cleanup();
471	>	somechange += dobj_cleanup();
472		else
473	<	dobj_unload(na ? alist[0] : curname);
473	>	somechange += dobj_unload(na ? alist[0] : curname);
474		break;
475		case DO_XFORM:                          /* transform object */
476		case DO_MOVE:
#	Line 476 | Line 479 | register char  *args;
479		} else {
480		nm = curname; nn = 0;
481		}
482	<	if (cn == DO_MOVE && nn >= na)
483	<	return(cmderror(cn, "missing transform"));
484	<	dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn);
482	>	if (cn == DO_MOVE && nn >= na) {
483	>	cmderror(cn, "missing transform");
484	>	return(0);
485	>	}
486	>	somechange += dobj_xform(nm, cn==DO_MOVE, na-nn, alist+nn);
487		break;
488		case DO_UNMOVE:                         /* undo last transform */
489	<	dobj_unmove();
489	>	somechange += dobj_unmove();
490		break;
491		case DO_OBJECT:                         /* print object statistics */
492		if (dobj_putstats(na ? alist[0] : curname, sstdout))
#	Line 495 | Line 500 | register char  *args;
500		break;
501		switch (nn) {
502		case 0:
503	<	return(cmderror(cn, "need new object name"));
503	>	cmderror(cn, "need new object name");
504	>	return(0);
505		case 1:
506		nm = curname;
507		break;
#	Line 508 | Line 514 | register char  *args;
514		if (!dobj_dup(nm, alist[nn-1]))
515		break;
516		if (na > nn)
517	<	dobj_xform(curname, 1, na-nn, alist+nn);
517	>	somechange += dobj_xform(curname, 1, na-nn, alist+nn);
518		else
519		curobj->drawcode = DO_HIDE;
520		savedxf(curobj);
#	Line 518 | Line 524 | register char  *args;
524		case DO_HIDE:
525		if (na > 1) goto toomany;
526		dobj_lighting(na ? alist[0] : curname, cn);
527	+	somechange++;
528		break;
529		default:
530		error(CONSISTENCY, "bad command id in dobj_command");
531		}
532	<	dev_view(&odev.v);                      /* redraw */
526	<	return(cn);
532	>	return(somechange);
533		toomany:
534		return(cmderror(cn, "too many arguments"));
535		}
#	Line 571 | Line 577 | char   *oct, *nam;
577		op->xfav[op->xfac=0] = NULL;
578		/* load octree into display list */
579		dolights = 0;
580	<	op->listid = rgl_octlist(fpath, op->center, &op->radius);
580	>	domats = 1;
581	>	op->listid = rgl_octlist(fpath, op->center, &op->radius, &op->nlists);
582		/* start rtrace */
583		rtargv[RTARGC-1] = fpath;
584		rtargv[RTARGC] = NULL;
#	Line 866 | Line 873 | FVECT   rorg, rdir;
873		}
874
875
876	+	int
877		dobj_render()                   /* render our objects in OpenGL */
878		{
879	+	int     nrendered = 0;
880		GLboolean       normalizing;
881		GLfloat vec[4];
882		FVECT   v1;
#	Line 878 | Line 887 | dobj_render()                  /* render our objects in OpenGL */
887		if (op->drawcode != DO_HIDE)
888		break;
889		if (op == NULL)
890	<	return(1);
890	>	return(0);
891		/* set up general rendering params */
892		glGetBooleanv(GL_NORMALIZE, &normalizing);
893		glPushAttrib(GL_LIGHTING_BIT|GL_TRANSFORM_BIT|GL_ENABLE_BIT|
#	Line 964 | Line 973 | dobj_render()                  /* render our objects in OpenGL */
973		}
974		/* render the display list */
975		glCallList(op->listid);
976	+	nrendered++;
977		/* restore matrix */
978		if (op->xfac) {
979		glMatrixMode(GL_MODELVIEW);
#	Line 981 | Line 991 | dobj_render()                  /* render our objects in OpenGL */
991		}
992		glPopAttrib();                  /* restore rendering params */
993		rgl_checkerr("rendering objects in dobj_render");
994	<	return(1);
994	>	return(nrendered);
995		}

Diff Legend

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