--- ray/src/util/ranimove.c 2003/02/22 02:07:30 3.1
+++ ray/src/util/ranimove.c 2003/10/21 19:19:29 3.9
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: ranimove.c,v 3.1 2003/02/22 02:07:30 greg Exp $";
+static const char RCSid[] = "$Id";
#endif
/*
* Radiance object animation program
@@ -9,67 +9,20 @@ static const char RCSid[] = "$Id: ranimove.c,v 3.1 200
* See ranimove.h and the ranimove(1) man page for details.
*/
-/* ====================================================================
- * 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 "ranimove.h"
-#include
+#include
+#ifdef _WIN32
+ #include /* struct timeval. XXX find a replacement? */
+#else
+ #include
+#endif
#include
+#include
+#include "paths.h"
+#include "ranimove.h"
+
int NVARS = NV_INIT; /* total number of variables */
VARIABLE vv[] = VV_INIT; /* variable-value pairs */
@@ -146,7 +99,7 @@ char *argv[];
case 'f': /* frame range */
switch (sscanf(argv[++i], "%d,%d", &fbeg, &fend)) {
case 2:
- if ((fbeg <= 0 | fend < fbeg))
+ if ((fbeg <= 0) | (fend < fbeg))
goto userr;
break;
case 1:
@@ -190,7 +143,7 @@ char *argv[];
/* all done */
if (lorendoptf[0])
unlink(lorendoptf);
- if (hirendoptf[0])
+ if (hirendoptf[0] && strcmp(hirendoptf, lorendoptf))
unlink(hirendoptf);
if (objtmpf[0])
unlink(objtmpf);
@@ -296,7 +249,7 @@ setdefaults() /* set default values */
setrendparams(lorendoptf, vval(LOWQ));
ray_save(&lorendparams);
curparams = &lorendparams;
- twolevels = bcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
+ twolevels = memcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
}
@@ -348,7 +301,7 @@ char *ms;
if (isflt(om->prio_file)) {
om->prio = atof(om->prio_file);
om->prio_file[0] = '\0';
- haveprio |= (om->prio < 0.95 | om->prio > 1.05);
+ haveprio |= ((om->prio < 0.95) | (om->prio > 1.05));
} else
haveprio = 1;
} else
@@ -383,8 +336,8 @@ char *qval;
if (qval != NULL && qval[0] == '-')
ac += wordstring(av+ac, qval);
- /* start with default parameters */
- ray_defaults(NULL);
+ /* restore default parameters */
+ ray_restore(NULL);
/* set what we have */
for (i = 0; i < ac; i++) {
while ((rval = expandarg(&ac, &av, i)) > 0)
@@ -398,12 +351,11 @@ char *qval;
continue;
}
rval = getrenderopt(ac-i, av+i);
- if (rval >= 0) {
- i += rval;
- continue;
+ if (rval < 0) {
+ sprintf(errmsg, "bad render option at '%s'", av[i]);
+ error(USER, errmsg);
}
- sprintf(errmsg, "bad render option at '%s'", av[i]);
- error(USER, errmsg);
+ i += rval;
}
}
@@ -437,7 +389,7 @@ char *rfargs;
pippt = NULL;
}
if (pippt != NULL)
- strcpy(pippt, "> /dev/null"); /* nothing to match */
+ strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */
else {
strcpy(cp, ")[ \t]*=' > ranimove.var");
cp += 11; /* point to file name */
@@ -505,7 +457,7 @@ int n;
fclose(viewfp);
viewfp = NULL;
viewnum = 0;
- copystruct(&curview, &stdview);
+ curview = stdview;
}
return(NULL);
}
@@ -521,7 +473,7 @@ int n;
perror(vval(VIEWFILE));
quit(1);
}
- copystruct(&curview, &stdview);
+ curview = stdview;
viewnum = 0;
}
if (n < 0) { /* get next view */
@@ -621,7 +573,7 @@ char *s;
return(1.0);
expval = atof(s);
- if ((s[0] == '+' | s[0] == '-'))
+ if ((s[0] == '+') | (s[0] == '-'))
return(pow(2.0, expval));
return(expval);
}
@@ -810,11 +762,12 @@ int n;
om->cprio = om->prio;
}
/* XXX bxfm relies on call order */
- if (framestep)
+ if (framestep) {
if (invmat4(om->bxfm, om->cxfm))
multmat4(om->bxfm, om->bxfm, oxf.xfm);
else
setident4(om->bxfm);
+ }
/* all done */
return(xfp);
}
@@ -840,7 +793,7 @@ OBJECT obj;
objnm = obj_move[i].name;
len = strlen(objnm);
if (!strncmp(onm, objnm, len)) {
- if ((obj_move[i].parent < 0 & onm[len] == '.'))
+ if ((obj_move[i].parent < 0) & (onm[len] == '.'))
break;
objnm = getobjname(&obj_move[i]) + len;
len2 = strlen(objnm);