ViewVC Help

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

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

Comparing ray/src/util/ranimove.c (file contents):
Revision 3.16 by schorsch, Sun Mar 6 01:13:18 2016 UTC vs.
Revision 3.20 by greg, Mon Feb 6 22:40:21 2023 UTC

#	Line 170 | Line 170 | userr:
170
171		void
172		eputs(                          /* put string to stderr */
173	<	register char  *s
173	>	const char  *s
174		)
175		{
176		static int  midline = 0;
#	Line 190 | Line 190 | eputs(                         /* put string to stderr */
190
191
192		void
193	<	quit(ec)                        /* make sure exit is called */
194	<	int     ec;
193	>	quit(int ec)                    /* make sure exit is called */
194		{
195		if (ray_pnprocs > 0)    /* close children if any */
196	<	ray_pclose(0);
196	>	ray_pclose(0);
197	>	else if (ray_pnprocs < 0)
198	>	_exit(ec);      /* avoid flush in child */
199		exit(ec);
200		}
201
#	Line 350 | Line 351 | setrendparams( /* set global rendering parameters */
351		av[ac=0] = NULL;
352		/* load options from file, first */
353		if (optf != NULL && *optf) {
354	<	ac = wordfile(av, optf);
354	>	ac = wordfile(av, 1024, optf);
355		if (ac < 0) {
356		sprintf(errmsg, "cannot load options file \"%s\"",
357		optf);
#	Line 359 | Line 360 | setrendparams( /* set global rendering parameters */
360		}
361		/* then from options string */
362		if (qval != NULL && qval[0] == '-')
363	<	ac += wordstring(av+ac, qval);
363	>	ac += wordstring(av+ac, 1024-ac, qval);
364
365		/* restore default parameters */
366		ray_restore(NULL);
#	Line 392 | Line 393 | getradfile(            /* run rad and get needed variables */
393		{
394		static short    mvar[] = {OCONV,OCTREEF,RESOLUTION,EXPOSURE,-1};
395		char    combuf[256];
396	<	register int    i;
397	<	register char   *cp;
396	>	int     i;
397	>	char    *cp;
398		char    *pippt = NULL;
399		/* create rad command */
400		strcpy(lorendoptf, "ranim0.opt");
#	Line 469 | Line 470 | animate(void)                  /* run through animation */
470		}
471
472
473	<	extern VIEW *
473	>	VIEW *
474		getview(                        /* get view number n */
475		int     n
476		)
#	Line 504 | Line 505 | getview(                       /* get view number n */
505		viewnum = 0;
506		}
507		if (n < 0) {                            /* get next view */
508	<	register int    c = getc(viewfp);
508	>	int     c = getc(viewfp);
509		if (c == EOF)
510		return(NULL);                   /* that's it */
511		ungetc(c, viewfp);
#	Line 533 | Line 534 | countviews(void)                       /* count views in view file */
534		}
535
536
537	<	extern char *
537	>	char *
538		getexp(                 /* get exposure for nth frame */
539		int     n
540		)
#	Line 542 | Line 543 | getexp(                        /* get exposure for nth frame */
543		static char     expval[32];
544		static FILE     *expfp = NULL;
545		static int      curfrm = 0;
546	<	register char   *cp;
546	>	char    *cp;
547
548		if (n == 0) {                           /* signal to close file */
549		if (expfp != NULL) {
#	Line 592 | Line 593 | formerr:
593		}
594
595
596	<	extern double
596	>	double
597		expspec_val(                    /* get exposure value from spec. */
598		char    *s
599		)
#	Line 609 | Line 610 | expspec_val(                   /* get exposure value from spec. */
610		}
611
612
613	<	extern char *
613	>	char *
614		getoctspec(                     /* get octree for the given frame */
615		int     n
616		)
#	Line 666 | Line 667 | getoctspec(                    /* get octree for the given frame */
667
668		static char *
669		getobjname(                     /* get fully qualified object name */
670	<	register struct ObjMove *om
670	>	struct ObjMove  *om
671		)
672		{
673		static char     objName[512];
674	<	register char   *cp = objName;
674	>	char    *cp = objName;
675
676		strcpy(cp, om->name);
677		while (om->parent >= 0) {
#	Line 685 | Line 686 | getobjname(                    /* get fully qualified object name */
686
687		static char *
688		getxf(                  /* get total transform for object */
689	<	register struct ObjMove *om,
689	>	struct ObjMove  *om,
690		int     n
691		)
692		{
#	Line 698 | Line 699 | getxf(                 /* get total transform for object */
699		char            *av[64];
700		int             ac;
701		int             i;
702	<	register char   *cp;
702	>	char    *cp;
703		/* get parent transform, first */
704		if (om->parent >= 0)
705		xfp = getxf(&obj_move[om->parent], n);
#	Line 806 | Line 807 | getxf(                 /* get total transform for object */
807		}
808
809
810	<	extern int
810	>	int
811		getmove(                                /* find matching move object */
812		OBJECT  obj
813		)
#	Line 815 | Line 816 | getmove(                               /* find matching move object */
816		static OBJECT   lasto = OVOID;
817		char    *onm, *objnm;
818		int     len, len2;
819	<	register int    i;
819	>	int     i;
820
821		if (obj == OVOID)
822		return(-1);
#	Line 840 | Line 841 | getmove(                               /* find matching move object */
841		}
842
843
844	<	extern double
844	>	double
845		obj_prio(                       /* return priority for object */
846		OBJECT  obj
847		)
#	Line 891 | Line 892 | gettimeofday(struct timeval *tp, void *dummy)
892
893		#endif
894
895	<	extern double
895	>	double
896		getTime(void)                   /* get current time (CPU or real) */
897		{
898		struct timeval  time_now;

Diff Legend

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