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.8 by greg, Fri Feb 19 17:45:37 2021 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 > #undef putc
18 > #define putc    putc_unlocked
19 > #endif
20  
21 < static int  oputint(), oputstr(), puttree(), putobj();
21 > static void oputstr(char *s);
22 > static void putfullnode(OCTREE fn);
23 > static void oputint(long i, int siz);
24 > static void oputflt(double f);
25 > static void puttree(OCTREE ot);
26  
27  
28 < writeoct(store, scene, ofn)             /* write octree structures to stdout */
29 < int  store;
30 < CUBE  *scene;
31 < char  *ofn[];
28 > void
29 > writeoct(               /* write octree structures to stdout */
30 >        int  store,
31 >        CUBE  *scene,
32 >        char  *ofn[]
33 > )
34   {
35          char  sbuf[64];
36 <        register int  i;
36 >        int  i;
37                                          /* write format number */
38          oputint((long)(OCTMAGIC+sizeof(OBJECT)), 2);
39  
# Line 53 | Line 59 | char  *ofn[];
59                                          /* write the octree */
60          puttree(scene->cutree);
61  
62 +        if (fflush(stdout) == EOF)
63 +                error(SYSTEM, "output error in writeoct");
64 +
65          if (store & IO_FILES || !(store & IO_SCENE))
66                  return;
67                                          /* write the scene */
68 <        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);
68 >        writescene(0, nobjects, stdout);
69   }
70  
71  
72 < static
73 < oputstr(s)                      /* write null-terminated string to stdout */
74 < register char  *s;
72 > static void
73 > oputstr(                        /* write null-terminated string to stdout */
74 >        char  *s
75 > )
76   {
77 <        putstr(s, stdout);
78 <        if (ferror(stdout))
74 <                error(SYSTEM, "write error in putstr");
77 >        if (putstr(s, stdout) == EOF)
78 >                error(SYSTEM, "write error in oputstr");
79   }
80  
81  
82 < static
83 < putfullnode(fn)                 /* write out a full node */
84 < OCTREE  fn;
82 > static void
83 > putfullnode(                    /* write out a full node */
84 >        OCTREE  fn
85 > )
86   {
87          OBJECT  oset[MAXSET+1];
88 <        register int  i;
88 >        int  i;
89  
90          objset(oset, fn);
91          for (i = 0; i <= oset[0]; i++)
# Line 88 | Line 93 | OCTREE  fn;
93   }
94  
95  
96 < static
97 < oputint(i, siz)                 /* write a siz-byte integer to stdout */
98 < register long  i;
99 < register int  siz;
96 > static void
97 > oputint(                        /* write a siz-byte integer to stdout */
98 >        long  i,
99 >        int  siz
100 > )
101   {
102 <        putint(i, siz, stdout);
103 <        if (ferror(stdout))
98 <                error(SYSTEM, "write error in putint");
102 >        if (putint(i, siz, stdout) == EOF)
103 >                error(SYSTEM, "write error in oputint");
104   }
105  
106  
107 < static
108 < oputflt(f)                      /* put out floating point number */
109 < double  f;
107 > static void
108 > oputflt(                        /* put out floating point number */
109 >        double  f
110 > )
111   {
112 <        putflt(f, stdout);
113 <        if (ferror(stdout))
108 <                error(SYSTEM, "write error in putflt");
112 >        if (putflt(f, stdout) == EOF)
113 >                error(SYSTEM, "write error in oputflt");
114   }
115  
116  
117 < static
118 < puttree(ot)                     /* write octree to stdout in pre-order form */
119 < register OCTREE  ot;
117 > static void
118 > puttree(                        /* write octree to stdout in pre-order form */
119 >        OCTREE  ot
120 > )
121   {
122 <        register int  i;
122 >        int  i;
123          
124          if (istree(ot)) {
125                  putc(OT_TREE, stdout);          /* indicate tree */
# Line 124 | Line 130 | register OCTREE  ot;
130                  putfullnode(ot);                /* write fullnode */
131          } else
132                  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]);
133   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines