--- ray/src/rt/source.h 2003/02/22 02:07:29 2.5
+++ ray/src/rt/source.h 2003/07/14 22:24:00 2.11
@@ -1,67 +1,18 @@
-/* RCSid: $Id: source.h,v 2.5 2003/02/22 02:07:29 greg Exp $ */
+/* RCSid $Id: source.h,v 2.11 2003/07/14 22:24:00 schorsch Exp $ */
/*
* source.h - header file for ray tracing sources.
*
* Include after ray.h
*/
+#ifndef _RAD_SOURCE_H_
+#define _RAD_SOURCE_H_
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes Radiance software
- * (http://radsite.lbl.gov/)
- * developed by the Lawrence Berkeley National Laboratory
- * (http://www.lbl.gov/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- * and "The Regents of the University of California" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- * nor may "Radiance" appear in their name, without prior written
- * permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory. For more
- * information on Lawrence Berkeley National Laboratory, please see
- * .
- */
+#include
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define AIMREQT 100 /* required aim success/failure */
#define SDISTANT 01 /* source distant flag */
@@ -96,7 +47,8 @@ typedef struct {
int sn; /* next source to aim for */
} sv; /* virtual source */
} sa; /* source aiming information */
- long ntests, nhits; /* shadow tests and hits */
+ unsigned long
+ ntests, nhits; /* shadow tests and hits */
OBJREC *so; /* source destination object */
} SRCREC; /* light source */
@@ -119,7 +71,7 @@ typedef struct {
#define initsrcindex(s) ((s)->sn = (s)->sp = -1, (s)->np = 0)
-#define clrpart(pt) bzero((char *)(pt), MAXSPART/2)
+#define clrpart(pt) memset((char *)(pt), '\0', MAXSPART/2)
#define setpart(pt,i,v) ((pt)[(i)>>2] |= (v)<<(((i)&3)<<1))
#define spart(pt,pi) ((pt)[(pi)>>2] >> (((pi)&3)<<1) & 3)
@@ -167,52 +119,6 @@ extern int nsources; /* the number of sources */
#define getmaxdisk(c,o) (*sfun[(o)->otype].of->getdisk)(c,o)
#define setsource(s,o) (*sfun[(o)->otype].of->setsrc)(s,o)
-#ifdef NOPROTO
-
-extern void marksources();
-extern void freesources();
-extern int srcray();
-extern void srcvalue();
-extern int sourcehit();
-extern void direct();
-extern void srcscatter();
-extern int m_light();
-extern double nextssamp();
-extern int skipparts();
-extern void nopart();
-extern void cylpart();
-extern void flatpart();
-extern double scylform();
-extern void initstypes();
-extern int newsource();
-extern void setflatss();
-extern void fsetsrc();
-extern void ssetsrc();
-extern void sphsetsrc();
-extern void rsetsrc();
-extern void cylsetsrc();
-extern SPOT *makespot();
-extern int spotout();
-extern double fgetmaxdisk();
-extern double rgetmaxdisk();
-extern double fgetplaneq();
-extern double rgetplaneq();
-extern int commonspot();
-extern int commonbeam();
-extern int checkspot();
-extern double spotdisk();
-extern double beamdisk();
-extern double intercircle();
-extern void markvirtuals();
-extern void addvirtuals();
-extern void vproject();
-extern OBJREC *vsmaterial();
-extern int makevsrc();
-extern double getdisk();
-extern int vstestvis();
-extern void virtverb();
-
-#else
/* defined in source.c */
extern void marksources(void);
extern void freesources(void);
@@ -261,4 +167,9 @@ extern double getdisk(FVECT oc, OBJREC *op, int sn);
extern int vstestvis(int f, OBJREC *o, FVECT oc, double or2, int sn);
extern void virtverb(int sn, FILE *fp);
+
+#ifdef __cplusplus
+}
#endif
+#endif /* _RAD_SOURCE_H_ */
+