ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/ranimove.c
(Generate patch)

Comparing ray/src/util/ranimove.c (file contents):
Revision 3.2 by greg, Tue Feb 25 02:47:24 2003 UTC vs.
Revision 3.6 by schorsch, Mon Jul 21 22:30:19 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id";
3   #endif
4   /*
5   *  Radiance object animation program
# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11  
12   #include "copyright.h"
13  
14 < #include "ranimove.h"
15 < #include <sys/time.h>
14 > #include <time.h>
15 > #ifndef _WIN32
16 >  #include <sys/time.h>
17 > #endif
18   #include <ctype.h>
19 + #include <string.h>
20  
21 + #include "paths.h"
22 + #include "ranimove.h"
23 +
24   int             NVARS = NV_INIT; /* total number of variables */
25  
26   VARIABLE        vv[] = VV_INIT; /* variable-value pairs */
# Line 241 | Line 247 | setdefaults()                  /* set default values */
247          setrendparams(lorendoptf, vval(LOWQ));
248          ray_save(&lorendparams);
249          curparams = &lorendparams;
250 <        twolevels = bcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
250 >        twolevels = memcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
251   }
252  
253  
# Line 382 | Line 388 | char   *rfargs;
388                          pippt = NULL;
389                  }
390          if (pippt != NULL)
391 <                strcpy(pippt, "> /dev/null");   /* nothing to match */
391 >                strcpy(pippt, "> " NULL_DEVICE);        /* nothing to match */
392          else {
393                  strcpy(cp, ")[ \t]*=' > ranimove.var");
394                  cp += 11;               /* point to file name */
# Line 450 | Line 456 | int    n;
456                          fclose(viewfp);
457                          viewfp = NULL;
458                          viewnum = 0;
459 <                        copystruct(&curview, &stdview);
459 >                        curview = stdview;
460                  }
461                  return(NULL);
462          }
# Line 466 | Line 472 | int    n;
472                          perror(vval(VIEWFILE));
473                          quit(1);
474                  }
475 <                copystruct(&curview, &stdview);
475 >                curview = stdview;
476                  viewnum = 0;
477          }
478          if (n < 0) {                            /* get next view */
# Line 755 | Line 761 | int    n;
761                  om->cprio = om->prio;
762          }
763                                          /* XXX bxfm relies on call order */
764 <        if (framestep)
764 >        if (framestep) {
765                  if (invmat4(om->bxfm, om->cxfm))
766                          multmat4(om->bxfm, om->bxfm, oxf.xfm);
767                  else
768                          setident4(om->bxfm);
769 +        }
770                                          /* all done */
771          return(xfp);
772   }

Diff Legend

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