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

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.27 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.29 by greg, Fri Apr 18 17:29:22 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rtrace.c - program and variables for individual ray tracing.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10   /*
11   *  Input is in the form:
# Line 145 | Line 90 | int  ambincl = -1;                     /* include == 1, exclude == 0 */
90  
91   static RAY  thisray;                    /* for our convenience */
92  
93 < static void  oputo(), oputd(), oputv(), oputl(), oputL(),
93 > static void  oputo(), oputd(), oputv(), oputl(), oputL(), oputc(),
94                  oputp(), oputn(), oputN(), oputs(), oputw(), oputm();
95  
96   static void  ourtrace(), tabin();
# Line 289 | Line 234 | register char  *vs;
234                          *table++ = oputl;
235                          castonly = 0;
236                          break;
237 +                case 'c':                               /* local coordinates */
238 +                        *table++ = oputc;
239 +                        break;
240                  case 'L':                               /* single ray length */
241                          *table++ = oputL;
242                          break;
# Line 484 | Line 432 | RAY  *r;
432  
433   static void
434   oputo(r)                                /* print origin */
435 < register RAY  *r;
435 > RAY  *r;
436   {
437          (*putreal)(r->rorg[0]);
438          (*putreal)(r->rorg[1]);
# Line 494 | Line 442 | register RAY  *r;
442  
443   static void
444   oputd(r)                                /* print direction */
445 < register RAY  *r;
445 > RAY  *r;
446   {
447          (*putreal)(r->rdir[0]);
448          (*putreal)(r->rdir[1]);
# Line 504 | Line 452 | register RAY  *r;
452  
453   static void
454   oputv(r)                                /* print value */
455 < register RAY  *r;
455 > RAY  *r;
456   {
457          COLR  cout;
458          
# Line 523 | Line 471 | register RAY  *r;
471  
472   static void
473   oputl(r)                                /* print effective distance */
474 < register RAY  *r;
474 > RAY  *r;
475   {
476          (*putreal)(r->rt);
477   }
# Line 531 | Line 479 | register RAY  *r;
479  
480   static void
481   oputL(r)                                /* print single ray length */
482 < register RAY  *r;
482 > RAY  *r;
483   {
484          (*putreal)(r->rot);
485   }
486  
487  
488   static void
489 + oputc(r)                                /* print local coordinates */
490 + RAY  *r;
491 + {
492 +        (*putreal)(r->uv[0]);
493 +        (*putreal)(r->uv[1]);
494 + }
495 +
496 +
497 + static void
498   oputp(r)                                /* print point */
499 < register RAY  *r;
499 > RAY  *r;
500   {
501          if (r->rot < FHUGE) {
502                  (*putreal)(r->rop[0]);
# Line 555 | Line 512 | register RAY  *r;
512  
513   static void
514   oputN(r)                                /* print unperturbed normal */
515 < register RAY  *r;
515 > RAY  *r;
516   {
517          if (r->rot < FHUGE) {
518                  (*putreal)(r->ron[0]);
# Line 590 | Line 547 | RAY  *r;
547  
548   static void
549   oputs(r)                                /* print name */
550 < register RAY  *r;
550 > RAY  *r;
551   {
552          if (r->ro != NULL)
553                  fputs(r->ro->oname, stdout);
# Line 602 | Line 559 | register RAY  *r;
559  
560   static void
561   oputw(r)                                /* print weight */
562 < register RAY  *r;
562 > RAY  *r;
563   {
564          (*putreal)(r->rweight);
565   }
# Line 610 | Line 567 | register RAY  *r;
567  
568   static void
569   oputm(r)                                /* print modifier */
570 < register RAY  *r;
570 > RAY  *r;
571   {
572          if (r->ro != NULL)
573                  if (r->ro->omod != OVOID)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines