| 10 |
|
#include "standard.h" |
| 11 |
|
|
| 12 |
|
#include "octree.h" |
| 13 |
– |
|
| 13 |
|
#include "object.h" |
| 14 |
+ |
#include "oconv.h" |
| 15 |
|
|
| 16 |
< |
static int oputint(), oputstr(), puttree(); |
| 16 |
> |
#ifdef putc_unlocked /* avoid horrendous overhead of flockfile */ |
| 17 |
> |
#undef putc |
| 18 |
> |
#define putc putc_unlocked |
| 19 |
> |
#endif |
| 20 |
|
|
| 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 |
< |
writeoct(store, scene, ofn) /* write octree structures to stdout */ |
| 28 |
< |
int store; |
| 29 |
< |
CUBE *scene; |
| 30 |
< |
char *ofn[]; |
| 27 |
> |
|
| 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 |
|
int i; |
| 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 */ |
| 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)) |
| 64 |
< |
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++) |
| 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)) |
| 88 |
< |
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)) |
| 98 |
< |
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 */ |
