11 |
|
#include <stdlib.h> |
12 |
|
#include "rtio.h" |
13 |
|
#include "rtmath.h" |
14 |
+ |
#include "rtprocess.h" |
15 |
|
#include "bsdf.h" |
16 |
|
#include "bsdf_m.h" |
17 |
|
#include "random.h" |
145 |
|
static char * |
146 |
|
oconv_command(int ac, char *av[]) |
147 |
|
{ |
148 |
< |
static char oconvbuf[2048] = "!oconv -f"; |
149 |
< |
char *cp = oconvbuf + 9; |
150 |
< |
|
148 |
> |
static char oconvbuf[2048] = "!oconv -f "; |
149 |
> |
char *cp = oconvbuf + 10; |
150 |
> |
char *recv = *av++; |
151 |
> |
|
152 |
> |
if (ac-- <= 0) |
153 |
> |
return(NULL); |
154 |
|
while (ac-- > 0) { |
155 |
+ |
strcpy(cp, *av++); |
156 |
+ |
while (*cp) cp++; |
157 |
+ |
*cp++ = ' '; |
158 |
|
if (cp >= oconvbuf+(sizeof(oconvbuf)-32)) { |
159 |
|
fputs(progname, stderr); |
160 |
|
fputs(": too many file arguments!\n", stderr); |
161 |
|
exit(1); |
162 |
|
} |
156 |
– |
*cp++ = ' '; |
157 |
– |
strcpy(cp, *av++); |
158 |
– |
while (*cp) cp++; |
163 |
|
} |
164 |
< |
*cp = '\0'; |
164 |
> |
strcpy(cp, recv); /* receiver goes last */ |
165 |
|
return(oconvbuf); |
166 |
|
} |
167 |
|
|
1178 |
|
{ |
1179 |
|
char fmtopt[6] = "-faa"; /* default output is ASCII */ |
1180 |
|
char *xrs=NULL, *yrs=NULL, *ldopt=NULL; |
1181 |
< |
int wantIrradiance = 0; |
1181 |
> |
char *iropt = NULL; |
1182 |
|
char *sendfn; |
1183 |
|
char sampcntbuf[32], nsbinbuf[32]; |
1184 |
|
FILE *rcfp; |
1227 |
|
na = 0; /* we re-add this later */ |
1228 |
|
continue; |
1229 |
|
case 'I': /* only for pass-through mode */ |
1230 |
< |
wantIrradiance = 1; |
1230 |
> |
case 'i': |
1231 |
> |
iropt = argv[a]; |
1232 |
|
na = 0; |
1233 |
|
continue; |
1234 |
|
case 'V': /* options without arguments */ |
1235 |
|
case 'w': |
1236 |
|
case 'u': |
1232 |
– |
case 'i': |
1237 |
|
case 'h': |
1238 |
|
case 'r': |
1239 |
|
break; |
1281 |
|
if (sendfn[0] == '-') { /* user wants pass-through mode? */ |
1282 |
|
if (sendfn[1]) goto userr; |
1283 |
|
sendfn = NULL; |
1284 |
< |
if (wantIrradiance) { |
1284 |
> |
if (iropt) { |
1285 |
|
CHECKARGC(1); |
1286 |
< |
rcarg[nrcargs++] = "-I"; |
1286 |
> |
rcarg[nrcargs++] = iropt; |
1287 |
|
} |
1288 |
|
if (xrs) { |
1289 |
|
CHECKARGC(2); |
1301 |
|
} |
1302 |
|
if (sampcnt <= 0) sampcnt = 1; |
1303 |
|
} else { /* else in sampling mode */ |
1304 |
< |
if (wantIrradiance) { |
1304 |
> |
if (iropt) { |
1305 |
|
fputs(progname, stderr); |
1306 |
< |
fputs(": -I supported for pass-through only\n", stderr); |
1306 |
> |
fputs(": -i, -I supported for pass-through only\n", stderr); |
1307 |
|
return(1); |
1308 |
|
} |
1309 |
|
fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f'; |
1356 |
|
userr: |
1357 |
|
if (a < argc-2) |
1358 |
|
fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]); |
1359 |
< |
fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [system.rad ..]\n", |
1359 |
> |
fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n", |
1360 |
|
progname); |
1361 |
|
return(1); |
1362 |
|
} |