ViewVC Help

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

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

Comparing ray/src/common/cone.c (file contents):
Revision 2.2 by greg, Sun Sep 6 11:53:47 1992 UTC vs.
Revision 2.11 by greg, Fri Sep 16 15:09:21 2016 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1992 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  cone.c - routines for making cones
9	–	*
10	–	*     2/12/86
6		*/
7
8	+	#include "copyright.h"
9	+
10		#include  "standard.h"
11
12		#include  "object.h"
#	Line 44 | Line 41 | static char SCCSid[] = "$SunId$ LBL";
41
42
43		CONE *
44	<	getcone(o, getxf)                       /* get cone structure */
45	<	register OBJREC  *o;
46	<	int  getxf;
44	>	getcone(                                /* get cone structure */
45	>	OBJREC  *o,
46	>	int  getxf
47	>	)
48		{
51	–	extern double  sqrt();
49		int  sgn0, sgn1;
50	<	register CONE  *co;
50	>	CONE  *co;
51
52		if ((co = (CONE *)o->os) == NULL) {
53
#	Line 60 | Line 57 | int  getxf;
57
58		co->ca = o->oargs.farg;
59		/* get radii */
60	<	if (o->otype == OBJ_CYLINDER | o->otype == OBJ_TUBE) {
60	>	if ((o->otype == OBJ_CYLINDER) | (o->otype == OBJ_TUBE)) {
61		if (o->oargs.nfargs != 7)
62		goto argcerr;
63		if (co->ca[6] < -FTINY) {
#	Line 83 | Line 80 | int  getxf;
80		else sgn1 = 0;
81		if (sgn0+sgn1 == 0)
82		goto raderr;
83	<	if (sgn0 < 0 | sgn1 < 0) {
84	<	objerror(o, o->otype==OBJ_RING?USER:WARNING,
85	<	"negative radii");
83	>	if ((sgn0 < 0) | (sgn1 < 0)) {
84	>	if (o->otype == OBJ_RING)
85	>	goto raderr;
86	>	objerror(o, WARNING, "negative radii");
87		o->otype = o->otype == OBJ_CONE ?
88		OBJ_CUP : OBJ_CONE;
89		}
#	Line 124 | Line 122 | int  getxf;
122		co->ad[2] = CO_P1(co)[2] - CO_P0(co)[2];
123		}
124		co->al = normalize(co->ad);
125	<	if (co->al == 0.0)
126	<	objerror(o, USER, "zero orientation");
125	>	if (co->al == 0.0) {
126	>	objerror(o, WARNING, "unknown orientation");
127	>	free(co);
128	>	return(NULL);
129	>	}
130		/* compute axis and side lengths */
131		if (o->otype == OBJ_RING) {
132		co->al = 0.0;
133		co->sl = CO_R1(co) - CO_R0(co);
134	<	} else if (o->otype == OBJ_CONE | o->otype == OBJ_CUP) {
134	>	} else if ((o->otype == OBJ_CONE) | (o->otype == OBJ_CUP)) {
135		co->sl = co->ca[7] - co->ca[6];
136		co->sl = sqrt(co->sl*co->sl + co->al*co->al);
137		} else { /* OBJ_CYLINDER or OBJ_TUBE */
#	Line 146 | Line 147 | int  getxf;
147		argcerr:
148		objerror(o, USER, "bad # arguments");
149		raderr:
150	<	objerror(o, USER, "illegal radii");
150	>	objerror(o, WARNING, "illegal radii");
151	>	free(co);
152	>	return(NULL);
153		}
154
155
156	<	freecone(o)                     /* free memory associated with cone */
157	<	OBJREC  *o;
156	>	void
157	>	freecone(OBJREC *o)             /* free memory associated with cone */
158		{
159	<	register CONE  *co = (CONE *)o->os;
159	>	CONE  *co = (CONE *)o->os;
160
161	<	if (o->os == NULL)
161	>	if (co == NULL)
162		return;
163		if (co->tm != NULL)
164	<	free((char *)co->tm);
165	<	free(o->os);
164	>	free((void *)co->tm);
165	>	free((void *)co);
166		o->os = NULL;
167		}
168
169
170	<	conexform(co)                   /* get cone transformation matrix */
171	<	register CONE  *co;
170	>	void
171	>	conexform(CONE *co)                     /* get cone transformation matrix */
172		{
170	–	extern double  sqrt();
173		MAT4  m4;
174	<	register double  d;
175	<	register int  i;
174	>	double  d;
175	>	int  i;
176
177	<	co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4));
177	>	co->tm = (RREAL (*)[4])malloc(sizeof(MAT4));
178		if (co->tm == NULL)
179		error(SYSTEM, "out of memory in conexform");
180
#	Line 208 | Line 210 | register CONE  *co;
210		multmat4(co->tm, co->tm, m4);
211
212		/* scale z-axis */
213	<	if (co->p0 != co->p1 & co->r0 != co->r1) {
213	>	if ((co->p0 != co->p1) & (co->r0 != co->r1)) {
214		setident4(m4);
215		m4[2][2] = (CO_R1(co) - CO_R0(co)) / co->al;
216		multmat4(co->tm, co->tm, m4);

Diff Legend

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