ViewVC Help

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

root/Development/ray/src/rt/glass.c

Comparing ray/src/rt/glass.c (file contents):
Revision 2.14 by schorsch, Sun Jul 27 22:12:03 2003 UTC vs.
Revision 2.23 by greg, Tue Feb 24 19:39:26 2015 UTC

#	Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8		#include "copyright.h"
9
10		#include  "ray.h"
11	–
11		#include  "otypes.h"
12	+	#include  "rtotypes.h"
13	+	#include  "pmapmat.h"
14
15		/*
16		*  This definition of glass provides for a quick calculation
#	Line 41 | Line 42 | static const char RCSid[] = "$Id$";
42		#define  RINDEX         1.52            /* refractive index of glass */
43
44
45	<	m_glass(m, r)           /* color a ray which hit a thin glass surface */
46	<	OBJREC  *m;
47	<	register RAY  *r;
45	>	int
46	>	m_glass(                /* color a ray which hit a thin glass surface */
47	>	OBJREC  *m,
48	>	RAY  *r
49	>	)
50		{
51		COLOR  mcolor;
52		double  pdot;
53		FVECT  pnorm;
54	<	double  rindex, cos2;
54	>	double  rindex=0, cos2;
55		COLOR  trans, refl;
56	<	int  hastexture;
56	>	int  hastexture, hastrans;
57		double  d, r1e, r1m;
58		double  transtest, transdist;
59		double  mirtest, mirdist;
60		RAY  p;
61	<	register int  i;
61	>	int  i;
62	>
63	>	/* PMAP: skip refracted shadow ray if accounted for in photon map */
64	>	if (shadowRayInPmap(r))
65	>	return(1);
66		/* check arguments */
67		if (m->oargs.nfargs == 3)
68		rindex = RINDEX;                /* default value of n */
#	Line 63 | Line 70 | register RAY  *r;
70		rindex = m->oargs.farg[3];      /* use their value */
71		else
72		objerror(m, USER, "bad arguments");
73	<
73	>	/* check back face visibility */
74	>	if (!backvis && r->rod <= 0.0) {
75	>	raytrans(r);
76	>	return(1);
77	>	}
78	>	/* check transmission */
79		setcolor(mcolor, m->oargs.farg[0], m->oargs.farg[1], m->oargs.farg[2]);
80	<
80	>	if ((hastrans = (intens(mcolor) > 1e-15))) {
81	>	for (i = 0; i < 3; i++)
82	>	if (colval(mcolor,i) < 1e-15)
83	>	colval(mcolor,i) = 1e-15;
84	>	} else if (r->crtype & SHADOW)
85	>	return(1);
86		/* get modifiers */
87		raytexture(r, m->omod);
88		if (r->rod < 0.0)                       /* reorient if necessary */
#	Line 82 | Line 99 | register RAY  *r;
99		/* angular transmission */
100		cos2 = sqrt( (1.0-1.0/(rindex*rindex)) +
101		pdot*pdot/(rindex*rindex) );
102	<	setcolor(mcolor, pow(colval(mcolor,RED), 1.0/cos2),
103	<	pow(colval(mcolor,GRN), 1.0/cos2),
104	<	pow(colval(mcolor,BLU), 1.0/cos2));
102	>	if (hastrans)
103	>	setcolor(mcolor, pow(colval(mcolor,RED), 1.0/cos2),
104	>	pow(colval(mcolor,GRN), 1.0/cos2),
105	>	pow(colval(mcolor,BLU), 1.0/cos2));
106
107		/* compute reflection */
108		r1e = (pdot - rindex*cos2) / (pdot + rindex*cos2);
109		r1e *= r1e;
110		r1m = (1.0/pdot - rindex/cos2) / (1.0/pdot + rindex/cos2);
111		r1m *= r1m;
112	<	/* compute transmittance */
113	<	for (i = 0; i < 3; i++) {
114	<	d = colval(mcolor, i);
115	<	colval(trans,i) = .5*(1.0-r1e)*(1.0-r1e)*d/(1.0-r1e*r1e*d*d);
116	<	colval(trans,i) += .5*(1.0-r1m)*(1.0-r1m)*d/(1.0-r1m*r1m*d*d);
117	<	}
112	>	/* compute transmission */
113	>	if (hastrans) {
114	>	for (i = 0; i < 3; i++) {
115	>	d = colval(mcolor, i);
116	>	colval(trans,i) = .5*(1.0-r1e)*(1.0-r1e)*d /
117	>	(1.0-r1e*r1e*d*d);
118	>	colval(trans,i) += .5*(1.0-r1m)*(1.0-r1m)*d /
119	>	(1.0-r1m*r1m*d*d);
120	>	}
121	>	multcolor(trans, r->pcol);      /* modify by pattern */
122		/* transmitted ray */
123	<	if (rayorigin(&p, r, TRANS, bright(trans)) == 0) {
124	<	if (!(r->crtype & SHADOW) && hastexture) {
125	<	for (i = 0; i < 3; i++)         /* perturb direction */
126	<	p.rdir[i] = r->rdir[i] +
127	<	2.*(1.-rindex)*r->pert[i];
128	<	if (normalize(p.rdir) == 0.0) {
129	<	objerror(m, WARNING, "bad perturbation");
123	>	if (rayorigin(&p, TRANS, r, trans) == 0) {
124	>	if (!(r->crtype & (SHADOW|AMBIENT)) && hastexture) {
125	>	VSUM(p.rdir, r->rdir, r->pert, 2.*(1.-rindex));
126	>	if (normalize(p.rdir) == 0.0) {
127	>	objerror(m, WARNING, "bad perturbation");
128	>	VCOPY(p.rdir, r->rdir);
129	>	}
130	>	} else {
131		VCOPY(p.rdir, r->rdir);
132	+	transtest = 2;
133		}
134	<	} else {
135	<	VCOPY(p.rdir, r->rdir);
136	<	transtest = 2;
134	>	rayvalue(&p);
135	>	multcolor(p.rcol, p.rcoef);
136	>	addcolor(r->rcol, p.rcol);
137	>	transtest *= bright(p.rcol);
138	>	transdist = r->rot + p.rt;
139		}
114	–	rayvalue(&p);
115	–	multcolor(p.rcol, r->pcol);     /* modify */
116	–	multcolor(p.rcol, trans);
117	–	addcolor(r->rcol, p.rcol);
118	–	transtest *= bright(p.rcol);
119	–	transdist = r->rot + p.rt;
140		}
121	–
141		if (r->crtype & SHADOW) {               /* skip reflected ray */
142		r->rt = transdist;
143		return(1);
#	Line 131 | Line 150 | register RAY  *r;
150		colval(refl,i) += .5*r1m*(1.0+(1.0-2.0*r1m)*d)/(1.0-r1m*r1m*d);
151		}
152		/* reflected ray */
153	<	if (rayorigin(&p, r, REFLECTED, bright(refl)) == 0) {
154	<	for (i = 0; i < 3; i++)
155	<	p.rdir[i] = r->rdir[i] + 2.0*pdot*pnorm[i];
153	>	if (rayorigin(&p, REFLECTED, r, refl) == 0) {
154	>	VSUM(p.rdir, r->rdir, pnorm, 2.*pdot);
155	>	checknorm(p.rdir);
156		rayvalue(&p);
157	<	multcolor(p.rcol, refl);
157	>	multcolor(p.rcol, p.rcoef);
158		addcolor(r->rcol, p.rcol);
159	<	if (!hastexture && r->ro != NULL && isflat(r->ro->otype)) {
159	>	if (r->ro != NULL && isflat(r->ro->otype) &&
160	>	!hastexture | (r->crtype & AMBIENT)) {
161		mirtest = 2.0*bright(p.rcol);
162		mirdist = r->rot + p.rt;
163		}

Diff Legend

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