ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rv3.c
(Generate patch)

Comparing ray/src/rt/rv3.c (file contents):
Revision 2.10 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.15 by greg, Fri Jan 21 00:52:59 2005 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
# Line 177 | Line 122 | double  *mp;
122                                  VCOPY(vec, thisray.rdir);
123                  else
124                          VCOPY(vec, thisray.rop);
125 <        } else if (direc)
126 <                        for (i = 0; i < 3; i++)
127 <                                vec[i] -= ourview.vp[i];
125 >        } else if (direc) {
126 >                for (i = 0; i < 3; i++)
127 >                        vec[i] -= ourview.vp[i];
128 >                if (normalize(vec) == 0.0) {
129 >                        error(COMMAND, "point at view origin");
130 >                        return(-1);
131 >                }
132 >        }
133          return(0);
134   }
135  
# Line 426 | Line 376 | register VIEW  *vp;
376          if ((err = setview(vp)) != NULL) {
377                  sprintf(errmsg, "view not set - %s", err);
378                  error(COMMAND, errmsg);
379 <        } else if (bcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
380 <                copystruct(&oldview, &ourview);
381 <                copystruct(&ourview, vp);
379 >        } else if (memcmp((char *)vp, (char *)&ourview, sizeof(VIEW))) {
380 >                oldview = ourview;
381 >                ourview = *vp;
382                  newimage();
383          }
384   }
# Line 441 | Line 391 | FVECT  vc;
391   {
392          double  d;
393          FVECT  v1;
394 <        VIEW  nv;
394 >        VIEW  nv = ourview;
395          register int  i;
396  
447        VCOPY(nv.vup, ourview.vup);
448        nv.hoff = ourview.hoff; nv.voff = ourview.voff;
397          spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.));
398          if (elev != 0.0) {
399                  fcross(v1, ourview.vup, nv.vdir);
400                  normalize(v1);
401                  spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.));
402          }
403 <        if ((nv.type = ourview.type) == VT_PAR) {
404 <                nv.horiz = ourview.horiz / mag;
405 <                nv.vert = ourview.vert / mag;
403 >        if (nv.type == VT_PAR) {
404 >                nv.horiz /= mag;
405 >                nv.vert /= mag;
406                  d = 0.0;                        /* don't move closer */
407                  for (i = 0; i < 3; i++)
408                          d += (vc[i] - ourview.vp[i])*ourview.vdir[i];
461                nv.vfore = ourview.vfore;
462                nv.vaft = ourview.vaft;
409          } else {
464                nv.horiz = ourview.horiz;
465                nv.vert = ourview.vert;
410                  d = sqrt(dist2(ourview.vp, vc)) / mag;
411 <                if ((nv.vfore = ourview.vfore) > FTINY) {
411 >                if (nv.vfore > FTINY) {
412                          nv.vfore += d - d*mag;
413                          if (nv.vfore < 0.0) nv.vfore = 0.0;
414                  }
415 <                if ((nv.vaft = ourview.vaft) > FTINY) {
415 >                if (nv.vaft > FTINY) {
416                          nv.vaft += d - d*mag;
417                          if (nv.vaft <= nv.vfore) nv.vaft = 0.0;
418                  }
419 +                nv.vdist += d - d*mag;
420          }
421          for (i = 0; i < 3; i++)
422                  nv.vp[i] = vc[i] - d*nv.vdir[i];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines