ViewVC Help

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

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

Comparing ray/src/common/image.c (file contents):
Revision 2.16 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.34 by greg, Tue Mar 11 02:21:46 2008 UTC

#	Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7		*  External symbols declared in view.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  "standard.h"
13	<
12	>	#include  <ctype.h>
13	>	#include  "rtio.h"
14	>	#include  "rtmath.h"
15	>	#include  "paths.h"
16		#include  "view.h"
17
71	–	#include  "paths.h"
18
19		#define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
20		#define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
#	Line 76 | Line 22 | static const char      RCSid[] = "$Id$";
22
23		VIEW  stdview = STDVIEW;                /* default view parameters */
24
25	+	static gethfunc gethview;
26
27	+
28		char *
29		setview(v)              /* set hvec and vvec, return message on error */
30		register VIEW  *v;
#	Line 87 | Line 35 | register VIEW  *v;
35		if (v->vaft < -FTINY || (v->vaft > FTINY && v->vaft <= v->vfore))
36		return("illegal fore/aft clipping plane");
37
38	<	if (normalize(v->vdir) == 0.0)          /* normalize direction */
38	>	if (v->vdist <= FTINY)
39	>	return("illegal view distance");
40	>	v->vdist *= normalize(v->vdir);         /* normalize direction */
41	>	if (v->vdist == 0.0)
42		return("zero view direction");
43
44		if (normalize(v->vup) == 0.0)           /* normalize view up */
#	Line 142 | Line 93 | register VIEW  *v;
93		v->hn2 = 2.0 * sin(v->horiz*(PI/180.0/2.0));
94		v->vn2 = 2.0 * sin(v->vert*(PI/180.0/2.0));
95		break;
96	+	case VT_PLS:                            /* planispheric fisheye */
97	+	if (v->horiz >= 360.0-FTINY)
98	+	return(ill_horiz);
99	+	if (v->vert >= 360.0-FTINY)
100	+	return(ill_vert);
101	+	v->hn2 = 2.*sin(v->horiz*(PI/180.0/2.0)) /
102	+	(1.0 + cos(v->horiz*(PI/180.0/2.0)));
103	+	v->vn2 = 2.*sin(v->vert*(PI/180.0/2.0)) /
104	+	(1.0 + cos(v->vert*(PI/180.0/2.0)));
105	+	break;
106		default:
107		return("unknown view type");
108		}
109	<	if (v->type != VT_ANG) {
109	>	if (v->type != VT_ANG && v->type != VT_PLS) {
110		if (v->type != VT_CYL) {
111		v->hvec[0] *= v->hn2;
112		v->hvec[1] *= v->hn2;
#	Line 232 | Line 193 | double  x, y;
193		d = normalize(direc);
194		return(v->vaft > FTINY ? (v->vaft - v->vfore)*d : 0.0);
195		case VT_ANG:                    /* angular fisheye */
196	<	x *= v->horiz/180.0;
197	<	y *= v->vert/180.0;
196	>	x *= (1.0/180.0)*v->horiz;
197	>	y *= (1.0/180.0)*v->vert;
198		d = x*x + y*y;
199		if (d > 1.0)
200		return(-1.0);
201		d = sqrt(d);
202		z = cos(PI*d);
203	<	d = d <= FTINY ? PI : sqrt(1 - z*z)/d;
203	>	d = d <= FTINY ? PI : sqrt(1.0 - z*z)/d;
204		x *= d;
205		y *= d;
206		direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
#	Line 249 | Line 210 | double  x, y;
210		orig[1] = v->vp[1] + v->vfore*direc[1];
211		orig[2] = v->vp[2] + v->vfore*direc[2];
212		return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
213	+	case VT_PLS:                    /* planispheric fisheye */
214	+	x *= sqrt(v->hn2);
215	+	y *= sqrt(v->vn2);
216	+	d = x*x + y*y;
217	+	z = (1. - d)/(1. + d);
218	+	d = d <= FTINY*FTINY ? PI : sqrt((1.0 - z*z)/d);
219	+	x *= d;
220	+	y *= d;
221	+	direc[0] = z*v->vdir[0] + x*v->hvec[0] + y*v->vvec[0];
222	+	direc[1] = z*v->vdir[1] + x*v->hvec[1] + y*v->vvec[1];
223	+	direc[2] = z*v->vdir[2] + x*v->hvec[2] + y*v->vvec[2];
224	+	orig[0] = v->vp[0] + v->vfore*direc[0];
225	+	orig[1] = v->vp[1] + v->vfore*direc[1];
226	+	orig[2] = v->vp[2] + v->vfore*direc[2];
227	+	return(v->vaft > FTINY ? v->vaft - v->vfore : 0.0);
228		}
229		return(-1.0);
230		}
#	Line 263 | Line 239 | FVECT  p;
239		double  d, d2;
240		FVECT  disp;
241
242	<	disp[0] = p[0] - v->vp[0];
267	<	disp[1] = p[1] - v->vp[1];
268	<	disp[2] = p[2] - v->vp[2];
242	>	VSUB(disp, p, v->vp);
243
244		switch (v->type) {
245		case VT_PAR:                    /* parallel view */
#	Line 314 | Line 288 | FVECT  p;
288		ip[0] += 180.0/v->horiz;
289		return;
290		}
291	<	d = acos(d)/PI / sqrt(1.0 - d*d);
292	<	ip[0] += DOT(disp,v->hvec)*d*180.0/v->horiz;
293	<	ip[1] += DOT(disp,v->vvec)*d*180.0/v->vert;
291	>	d = (180.0/PI)*acos(d) / sqrt(1.0 - d*d);
292	>	ip[0] += DOT(disp,v->hvec)*d/v->horiz;
293	>	ip[1] += DOT(disp,v->vvec)*d/v->vert;
294		return;
295	+	case VT_PLS:                    /* planispheric fisheye */
296	+	ip[0] = 0.5 - v->hoff;
297	+	ip[1] = 0.5 - v->voff;
298	+	ip[2] = normalize(disp) - v->vfore;
299	+	d = DOT(disp,v->vdir);
300	+	if (d >= 1.0-FTINY)
301	+	return;
302	+	if (d <= -(1.0-FTINY))
303	+	return;         /* really an error */
304	+	d = sqrt(1.0 - d*d) / (1.0 + d);
305	+	ip[0] += DOT(disp,v->hvec)*d/sqrt(v->hn2);
306	+	ip[1] += DOT(disp,v->vvec)*d/sqrt(v->vn2);
307	+	return;
308		}
309		ip[0] = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff;
310		ip[1] = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff;
#	Line 326 | Line 313 | FVECT  p;
313
314		void
315		pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
316	<	FLOAT  loc[2];
316	>	RREAL  loc[2];
317		register RESOLU  *rp;
318		int  px, py;
319		{
#	Line 401 | Line 388 | register char  *av[];
388		v->vdir[0] = atof(av[1]);
389		v->vdir[1] = atof(av[2]);
390		v->vdir[2] = atof(av[3]);
391	+	v->vdist = 1.;
392		return(3);
393		case 'u':                       /* up */
394		check(3,"fff");
#	Line 449 | Line 437 | register char  *s;
437		int  na;
438		int  nvopts = 0;
439
440	<	if (*s != '-')
441	<	s = sskip2(s,1);
440	>	while (isspace(*s))
441	>	if (!*s++)
442	>	return(0);
443		while (*s) {
444		ac = 0;
445		do {
446	<	av[ac++] = s;
447	<	while (*s && *s != ' ')
446	>	if (ac || *s == '-')
447	>	av[ac++] = s;
448	>	while (*s && !isspace(*s))
449		s++;
450	<	while (*s == ' ')
450	>	while (isspace(*s))
451		s++;
452		} while (*s && ac < 4);
453		if ((na = getviewopt(vp, ac, av)) >= 0) {
#	Line 478 | Line 468 | FILE  *fp;
468		{
469		fprintf(fp, " -vt%c", vp->type);
470		fprintf(fp, " -vp %.6g %.6g %.6g", vp->vp[0], vp->vp[1], vp->vp[2]);
471	<	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]);
471	>	fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0]*vp->vdist,
472	>	vp->vdir[1]*vp->vdist,
473	>	vp->vdir[2]*vp->vdist);
474		fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]);
475		fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert);
476		fprintf(fp, " -vo %.6g -va %.6g", vp->vfore, vp->vaft);
#	Line 493 | Line 485 | register VIEW  *vp;
485		static char  vwstr[128];
486		register char  *cp = vwstr;
487
488	+	*cp = '\0';
489		if (vp->type != stdview.type) {
490		sprintf(cp, " -vt%c", vp->type);
491		cp += strlen(cp);
#	Line 502 | Line 495 | register VIEW  *vp;
495		vp->vp[0], vp->vp[1], vp->vp[2]);
496		cp += strlen(cp);
497		}
498	<	if (!VEQ(vp->vdir,stdview.vdir)) {
498	>	if (!FEQ(vp->vdist,stdview.vdist) || !VEQ(vp->vdir,stdview.vdir)) {
499		sprintf(cp, " -vd %.6g %.6g %.6g",
500	<	vp->vdir[0], vp->vdir[1], vp->vdir[2]);
500	>	vp->vdir[0]*vp->vdist,
501	>	vp->vdir[1]*vp->vdist,
502	>	vp->vdir[2]*vp->vdist);
503		cp += strlen(cp);
504		}
505		if (!VEQ(vp->vup,stdview.vup)) {
#	Line 544 | Line 539 | int
539		isview(s)                               /* is this a view string? */
540		char  *s;
541		{
542	<	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
542	>	static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
543		extern char  *progname;
544		register char  *cp;
545		register char  **an;
#	Line 576 | Line 571 | struct myview {
571
572
573		static int
574	<	gethview(s, v)                          /* get view from header */
575	<	char  *s;
576	<	register struct myview  *v;
574	>	gethview(                               /* get view from header */
575	>	char  *s,
576	>	void  *v
577	>	)
578		{
579	<	if (isview(s) && sscanview(v->hv, s) > 0)
580	<	v->ok++;
579	>	if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
580	>	((struct myview*)v)->ok++;
581		return(0);
582		}
583
#	Line 603 | Line 599 | RESOLU  *rp;
599		mvs.hv = vp;
600		mvs.ok = 0;
601
602	<	getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
602	>	getheader(fp, gethview, &mvs);
603
604		if (rp != NULL && !fgetsresolu(rp, fp))
605		mvs.ok = 0;

Diff Legend

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