ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/ranimate.c

Comparing ray/src/util/ranimate.c (file contents):
Revision 2.55 by greg, Sat Jun 8 02:49:19 2013 UTC vs.
Revision 2.60 by greg, Sat Jun 7 05:09:46 2025 UTC

#	Line 23 | Line 23 | static const char RCSid[] = "$Id$";
23
24		#include "platform.h"
25		#include "rtprocess.h"
26	–	#include "paths.h"
26		#include "standard.h"
27		#include "view.h"
28		#include "vars.h"
#	Line 67 | Line 66 | int    NVARS = 24;             /* total number of variables */
66		VARIABLE        vv[] = {                /* variable-value pairs */
67		{"ANIMATE",     2,      0,      NULL,   onevalue},
68		{"ARCHIVE",     2,      0,      NULL,   onevalue},
69	<	{"BASENAME",    3,      0,      NULL,   onevalue},
69	>	{"BASENAME",    3,      0,      NULL,   strvalue},
70		{"DBLUR",       2,      0,      NULL,   onevalue},
71	<	{"DIRECTORY",   3,      0,      NULL,   onevalue},
71	>	{"DIRECTORY",   3,      0,      NULL,   strvalue},
72		{"DISKSPACE",   3,      0,      NULL,   fltvalue},
73		{"END",         2,      0,      NULL,   intvalue},
74		{"EXPOSURE",    3,      0,      NULL,   onevalue},
75		{"host",        4,      0,      NULL,   NULL},
76		{"INTERPOLATE", 3,      0,      NULL,   intvalue},
77		{"MBLUR",       2,      0,      NULL,   onevalue},
78	<	{"NEXTANIM",    3,      0,      NULL,   onevalue},
79	<	{"OCTREE",      3,      0,      NULL,   onevalue},
78	>	{"NEXTANIM",    3,      0,      NULL,   strvalue},
79	>	{"OCTREE",      3,      0,      NULL,   strvalue},
80		{"OVERSAMPLE",  2,      0,      NULL,   fltvalue},
81		{"pfilt",       2,      0,      NULL,   catvalues},
82		{"pinterp",     2,      0,      NULL,   catvalues},
83		{"render",      3,      0,      NULL,   catvalues},
84		{"RESOLUTION",  3,      0,      NULL,   onevalue},
85	<	{"RIF",         3,      0,      NULL,   onevalue},
85	>	{"RIF",         3,      0,      NULL,   strvalue},
86		{"RSH",         3,      0,      NULL,   onevalue},
87		{"RTRACE",      2,      0,      NULL,   boolvalue},
88		{"START",       2,      0,      NULL,   intvalue},
89		{"TRANSFER",    2,      0,      NULL,   onevalue},
90	<	{"VIEWFILE",    2,      0,      NULL,   onevalue},
90	>	{"VIEWFILE",    2,      0,      NULL,   strvalue},
91		};
92
93		#define SFNAME  "STATUS"                /* status file name */
#	Line 102 | Line 101 | struct {
101		int     tnext;                  /* next frame to transfer */
102		}       astat;                  /* animation status */
103
105	–	char    *progname;              /* our program name */
104		char    *cfname;                /* our control file name */
105
106		int     nowarn = 0;             /* turn warnings off? */
#	Line 169 | Line 167 | main(
167		{
168		int     explicate = 0;
169		int     i;
170	<
171	<	progname = argv[0];                     /* get arguments */
170	>	/* set global progname */
171	>	fixargv0(argv[0]);
172	>	/* get arguments */
173		for (i = 1; i < argc && argv[i][0] == '-'; i++)
174		switch (argv[i][1]) {
175		case 'e':                       /* print variables */
#	Line 1412 | Line 1411 | static int
1411		rmfile(char *fn)                        /* remove a file */
1412		{
1413		if (!silent)
1414	<	#ifdef _WIN32
1414	>	#if defined(_WIN32) || defined(_WIN64)
1415		printf("\tdel %s\n", fn);
1416		#else
1417		printf("\trm -f %s\n", fn);
#	Line 1465 | Line 1464 | getblur(double *mbf, double *dbf)      /* get # blur sample
1464		int     nmblur, ndblur;
1465		char    *s;
1466		/* get motion blur */
1467	<	if (!vdef(MBLUR) || (mblurf = atof(vval(MBLUR))) < 0.0)
1467	>	if (vdef(ANIMATE) || !vdef(MBLUR) || (mblurf = atof(vval(MBLUR))) < 0.0)
1468		mblurf = 0.0;
1469		if (mbf != NULL)
1470		*mbf = mblurf;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)