ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/ot/writeoct.c
(Generate patch)

Comparing ray/src/ot/writeoct.c (file contents):
Revision 2.2 by greg, Mon Jul 13 15:43:33 1992 UTC vs.
Revision 2.6 by greg, Thu Apr 29 14:36:49 2004 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  writeoct.c - routines for writing octree information to stdout.
6   *
# Line 13 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10   #include  "standard.h"
11  
12   #include  "octree.h"
16 –
13   #include  "object.h"
14 + #include  "oconv.h"
15  
16 < #include  "otypes.h"
16 > #ifdef putc_unlocked            /* avoid horrendous overhead of flockfile */
17 > #define putc    putc_unlocked
18 > #endif
19  
20 < static int  oputint(), oputstr(), puttree(), putobj();
20 > static void oputstr(char *s);
21 > static void putfullnode(OCTREE fn);
22 > static void oputint(long i, int siz);
23 > static void oputflt(double f);
24 > static void puttree(OCTREE ot);
25  
26  
27 < writeoct(store, scene, ofn)             /* write octree structures to stdout */
28 < int  store;
29 < CUBE  *scene;
30 < char  *ofn[];
27 > void
28 > writeoct(               /* write octree structures to stdout */
29 >        int  store,
30 >        CUBE  *scene,
31 >        char  *ofn[]
32 > )
33   {
34          char  sbuf[64];
35 <        register int  i;
35 >        int  i;
36                                          /* write format number */
37          oputint((long)(OCTMAGIC+sizeof(OBJECT)), 2);
38  
# Line 56 | Line 61 | char  *ofn[];
61          if (store & IO_FILES || !(store & IO_SCENE))
62                  return;
63                                          /* write the scene */
64 <        for (i = 0; i < NUMOTYPE; i++)
60 <                oputstr(ofun[i].funame);
61 <        oputstr("");
62 <        for (i = 0; i < nobjects; i++)
63 <                putobj(objptr(i));
64 <        putobj(NULL);
64 >        writescene(0, nobjects, stdout);
65   }
66  
67  
68 < static
69 < oputstr(s)                      /* write null-terminated string to stdout */
70 < register char  *s;
68 > static void
69 > oputstr(                        /* write null-terminated string to stdout */
70 >        register char  *s
71 > )
72   {
73          putstr(s, stdout);
74          if (ferror(stdout))
# Line 75 | Line 76 | register char  *s;
76   }
77  
78  
79 < static
80 < putfullnode(fn)                 /* write out a full node */
81 < OCTREE  fn;
79 > static void
80 > putfullnode(                    /* write out a full node */
81 >        OCTREE  fn
82 > )
83   {
84          OBJECT  oset[MAXSET+1];
85          register int  i;
# Line 88 | Line 90 | OCTREE  fn;
90   }
91  
92  
93 < static
94 < oputint(i, siz)                 /* write a siz-byte integer to stdout */
95 < register long  i;
96 < register int  siz;
93 > static void
94 > oputint(                        /* write a siz-byte integer to stdout */
95 >        register long  i,
96 >        register int  siz
97 > )
98   {
99          putint(i, siz, stdout);
100          if (ferror(stdout))
# Line 99 | Line 102 | register int  siz;
102   }
103  
104  
105 < static
106 < oputflt(f)                      /* put out floating point number */
107 < double  f;
105 > static void
106 > oputflt(                        /* put out floating point number */
107 >        double  f
108 > )
109   {
110          putflt(f, stdout);
111          if (ferror(stdout))
# Line 109 | Line 113 | double  f;
113   }
114  
115  
116 < static
117 < puttree(ot)                     /* write octree to stdout in pre-order form */
118 < register OCTREE  ot;
116 > static void
117 > puttree(                        /* write octree to stdout in pre-order form */
118 >        register OCTREE  ot
119 > )
120   {
121          register int  i;
122          
# Line 124 | Line 129 | register OCTREE  ot;
129                  putfullnode(ot);                /* write fullnode */
130          } else
131                  putc(OT_EMPTY, stdout);         /* indicate empty */
127 – }
128 –
129 –
130 – static
131 – putobj(o)                       /* write out object */
132 – register OBJREC  *o;
133 – {
134 –        register int  i;
135 –
136 –        if (o == NULL) {                /* terminator */
137 –                oputint(-1L, 1);
138 –                return;
139 –        }
140 –        oputint((long)o->otype, 1);
141 –        oputint((long)o->omod, sizeof(OBJECT));
142 –        oputstr(o->oname);
143 –        oputint((long)o->oargs.nsargs, 2);
144 –        for (i = 0; i < o->oargs.nsargs; i++)
145 –                oputstr(o->oargs.sarg[i]);
146 – #ifdef  IARGS
147 –        oputint((long)o->oargs.niargs, 2);
148 –        for (i = 0; i < o->oargs.niargs; i++)
149 –                oputint((long)o->oargs.iarg[i], 4);
150 – #endif
151 –        oputint((long)o->oargs.nfargs, 2);
152 –        for (i = 0; i < o->oargs.nfargs; i++)
153 –                oputflt(o->oargs.farg[i]);
132   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines