ViewVC Help

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

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

Comparing ray/src/rt/rv3.c (file contents):
Revision 2.10 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.20 by greg, Wed Apr 5 06:22:57 2006 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*  External symbols declared in rpaint.h
8		*/
9
10	<	/* ====================================================================
11	<	* The Radiance Software License, Version 1.0
12	<	*
13	<	* Copyright (c) 1990 - 2002 The Regents of the University of California,
14	<	* through Lawrence Berkeley National Laboratory.   All rights reserved.
15	<	*
16	<	* Redistribution and use in source and binary forms, with or without
17	<	* modification, are permitted provided that the following conditions
18	<	* are met:
19	<	*
20	<	* 1. Redistributions of source code must retain the above copyright
21	<	*         notice, this list of conditions and the following disclaimer.
22	<	*
23	<	* 2. Redistributions in binary form must reproduce the above copyright
24	<	*       notice, this list of conditions and the following disclaimer in
25	<	*       the documentation and/or other materials provided with the
26	<	*       distribution.
27	<	*
28	<	* 3. The end-user documentation included with the redistribution,
29	<	*           if any, must include the following acknowledgment:
30	<	*             "This product includes Radiance software
31	<	*                 (http://radsite.lbl.gov/)
32	<	*                 developed by the Lawrence Berkeley National Laboratory
33	<	*               (http://www.lbl.gov/)."
34	<	*       Alternately, this acknowledgment may appear in the software itself,
35	<	*       if and wherever such third-party acknowledgments normally appear.
36	<	*
37	<	* 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38	<	*       and "The Regents of the University of California" must
39	<	*       not be used to endorse or promote products derived from this
40	<	*       software without prior written permission. For written
41	<	*       permission, please contact [email protected].
42	<	*
43	<	* 5. Products derived from this software may not be called "Radiance",
44	<	*       nor may "Radiance" appear in their name, without prior written
45	<	*       permission of Lawrence Berkeley National Laboratory.
46	<	*
47	<	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48	<	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49	<	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50	<	* DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51	<	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52	<	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53	<	* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54	<	* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55	<	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56	<	* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57	<	* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58	<	* SUCH DAMAGE.
59	<	* ====================================================================
60	<	*
61	<	* This software consists of voluntary contributions made by many
62	<	* individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63	<	* information on Lawrence Berkeley National Laboratory, please see
64	<	* <http://www.lbl.gov/>.
65	<	*/
10	>	#include "copyright.h"
11
12	<	#include  "ray.h"
12	>	#include <string.h>
13
14	+	#include  "ray.h"
15		#include  "rpaint.h"
70	–
16		#include  "random.h"
17
18		#ifndef WFLUSH
19	<	#ifdef SPEED
75	<	#define WFLUSH          (5*SPEED)
76	<	#else
77	<	#define WFLUSH          100             /* flush after this many rays */
19	>	#define WFLUSH          2048            /* flush after this many rays */
20		#endif
79	–	#endif
21
22		#ifdef  SMLFLT
23		#define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
#	Line 163 | Line 104 | double  *mp;
104		return(-1);
105		}
106		if (!direc || ourview.type == VT_PAR) {
107	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
107	>	rayorigin(&thisray, PRIMARY, NULL, NULL);
108		if (!localhit(&thisray, &thescene)) {
109		error(COMMAND, "not a local object");
110		return(-1);
#	Line 177 | Line 118 | double  *mp;
118		VCOPY(vec, thisray.rdir);
119		else
120		VCOPY(vec, thisray.rop);
121	<	} else if (direc)
122	<	for (i = 0; i < 3; i++)
123	<	vec[i] -= ourview.vp[i];
121	>	} else if (direc) {
122	>	for (i = 0; i < 3; i++)
123	>	vec[i] -= ourview.vp[i];
124	>	if (normalize(vec) == 0.0) {
125	>	error(COMMAND, "point at view origin");
126	>	return(-1);
127	>	}
128	>	}
129		return(0);
130		}
131
#	Line 220 | Line 166 | int  xmin, ymin, xmax, ymax;
166		h/hresolu, v/vresolu)) < -FTINY) {
167		setcolor(thisray.rcol, 0.0, 0.0, 0.0);
168		} else {
169	<	rayorigin(&thisray, NULL, PRIMARY, 1.0);
169	>	rayorigin(&thisray, PRIMARY, NULL, NULL);
170		samplendx++;
171		rayvalue(&thisray);
172		}
#	Line 426 | Line 372 | register VIEW  *vp;
372		if ((err = setview(vp)) != NULL) {
373		sprintf(errmsg, "view not set - %s", err);
374		error(COMMAND, errmsg);
375	<	} else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
376	<	copystruct(&oldview, &ourview);
377	<	copystruct(&ourview, vp);
375	>	} else if (memcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
376	>	oldview = ourview;
377	>	ourview = *vp;
378		newimage();
379		}
380		}
#	Line 441 | Line 387 | FVECT  vc;
387		{
388		double  d;
389		FVECT  v1;
390	<	VIEW  nv;
390	>	VIEW  nv = ourview;
391		register int  i;
392
447	–	VCOPY(nv.vup, ourview.vup);
448	–	nv.hoff = ourview.hoff; nv.voff = ourview.voff;
393		spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
394		if (elev != 0.0) {
395		fcross(v1, ourview.vup, nv.vdir);
396		normalize(v1);
397		spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
398		}
399	<	if ((nv.type = ourview.type) == VT_PAR) {
400	<	nv.horiz = ourview.horiz / mag;
401	<	nv.vert = ourview.vert / mag;
399	>	if (nv.type == VT_PAR) {
400	>	nv.horiz /= mag;
401	>	nv.vert /= mag;
402		d = 0.0;                        /* don't move closer */
403		for (i = 0; i < 3; i++)
404		d += (vc[i] - ourview.vp[i])*ourview.vdir[i];
461	–	nv.vfore = ourview.vfore;
462	–	nv.vaft = ourview.vaft;
405		} else {
464	–	nv.horiz = ourview.horiz;
465	–	nv.vert = ourview.vert;
406		d = sqrt(dist2(ourview.vp, vc)) / mag;
407	<	if ((nv.vfore = ourview.vfore) > FTINY) {
407	>	if (nv.vfore > FTINY) {
408		nv.vfore += d - d*mag;
409		if (nv.vfore < 0.0) nv.vfore = 0.0;
410		}
411	<	if ((nv.vaft = ourview.vaft) > FTINY) {
411	>	if (nv.vaft > FTINY) {
412		nv.vaft += d - d*mag;
413		if (nv.vaft <= nv.vfore) nv.vaft = 0.0;
414		}
415	+	nv.vdist /= mag;
416		}
417		for (i = 0; i < 3; i++)
418		nv.vp[i] = vc[i] - d*nv.vdir[i];

Diff Legend

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