--- ray/src/rt/ambient.c 2003/02/22 02:07:28 2.47
+++ ray/src/rt/ambient.c 2003/07/21 22:30:19 2.53
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: ambient.c,v 2.47 2003/02/22 02:07:28 greg Exp $";
+static const char RCSid[] = "$Id: ambient.c,v 2.53 2003/07/21 22:30:19 schorsch Exp $";
#endif
/*
* ambient.c - routines dealing with ambient (inter-reflected) component.
@@ -7,69 +7,14 @@ static const char RCSid[] = "$Id: ambient.c,v 2.47 200
* Declarations of external symbols in ambient.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 "copyright.h"
-#include "ray.h"
+#include
+#include "platform.h"
+#include "ray.h"
#include "otypes.h"
-
#include "ambient.h"
-
#include "random.h"
#ifndef OCTSCALE
@@ -90,10 +35,10 @@ static FILE *ambfp = NULL; /* ambient file pointer */
static int nunflshed = 0; /* number of unflushed ambient values */
#ifndef SORT_THRESH
-#ifdef BIGMEM
-#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL))
-#else
+#ifdef SMLMEM
#define SORT_THRESH ((3L<<20)/sizeof(AMBVAL))
+#else
+#define SORT_THRESH ((9L<<20)/sizeof(AMBVAL))
#endif
#endif
#ifndef SORT_INTVL
@@ -220,7 +165,9 @@ setambient() /* initialize calculation */
(flen - pos)/AMBVALSIZ);
error(WARNING, errmsg);
fseek(ambfp, pos, 0);
+#ifndef _WIN32 /* XXX we need a replacement for that one */
ftruncate(fileno(ambfp), (off_t)pos);
+#endif
}
} else if ((ambfp = fopen(ambfile, "w+")) != NULL) {
initambfile(1); /* else create new file */
@@ -529,9 +476,7 @@ int creat;
#ifdef F_SETLKW
aflock(creat ? F_WRLCK : F_RDLCK);
#endif
-#ifdef MSDOS
- setmode(fileno(ambfp), O_BINARY);
-#endif
+ SET_FILE_BINARY(ambfp);
if (mybuf == NULL)
mybuf = (char *)bmalloc(BUFSIZ+8);
setbuf(ambfp, mybuf);
@@ -584,7 +529,7 @@ register AMBVAL *aval;
if ((av = newambval()) == NULL)
error(SYSTEM, "out of memory in avstore");
- copystruct(av, aval);
+ *av = *aval;
av->latick = ambclock;
av->next = NULL;
nambvals++;
@@ -619,7 +564,7 @@ newambtree() /* allocate 8 ambient tree structs */
}
atp = atfreelist;
atfreelist = atp->kid;
- bzero((char *)atp, 8*sizeof(AMBTREE));
+ memset((char *)atp, '\0', 8*sizeof(AMBTREE));
return(atp);
}
@@ -796,7 +741,7 @@ int always;
if (avlist2 != NULL)
free((void *)avlist2);
if (always) { /* rebuild without sorting */
- copystruct(&oldatrunk, &atrunk);
+ oldatrunk = atrunk;
atrunk.alist = NULL;
atrunk.kid = NULL;
unloadatree(&oldatrunk, avinsert);
@@ -827,14 +772,14 @@ int always;
if (avlist1[i].p == NULL)
continue;
tap = avlist2[i];
- copystruct(&tav, tap);
+ tav = *tap;
for (j = i; (pnext = avlist1[j].p) != tap;
j = avlmemi(pnext)) {
- copystruct(avlist2[j], pnext);
+ *(avlist2[j]) = *pnext;
avinsert(avlist2[j]);
avlist1[j].p = NULL;
}
- copystruct(avlist2[j], &tav);
+ *(avlist2[j]) = tav;
avinsert(avlist2[j]);
avlist1[j].p = NULL;
}