ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/wrapBSDF.c

Comparing ray/src/util/wrapBSDF.c (file contents):
Revision 2.14 by greg, Thu Apr 2 16:40:32 2015 UTC vs.
Revision 2.20 by schorsch, Sun Mar 6 01:13:18 2016 UTC

#	Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7		*      G. Ward         February 2015
8		*/
9
10	+	#include "platform.h"
11		#include <ctype.h>
12		#include "rtio.h"
13	<	#include "rtprocess.h"
13	>	#include "paths.h"
14		#include "ezxml.h"
15		#include "bsdf.h"
16		#include "bsdf_m.h"
#	Line 25 | Line 26 | const char     *attr_unit = "meter";
26		const char      legal_units[] = "meter|foot|inch|centimeter|millimeter";
27		/* system materials & geometry */
28		const char      *mgf_geometry = NULL;
29	<
29	>	/* comment list */
30	>	#define MAXCOMM         30
31	>	const char      *commlist[MAXCOMM];
32	>	int             ncomm = 0;
33		/* angle bases */
34		enum { ABdefault=-1, ABklemsFull=0, ABklemsHalf, ABklemsQuarter,
35		ABtensorTree3, ABtensorTree4, ABend };
#	Line 79 | Line 83 | struct s_dfile {
83
84		int             ndataf = 0;             /* number of data files */
85
86	+	int             unlink_datafiles = 0;   /* unlink data files when done */
87	+
88		const char      *spectr_file[MAXFILES]; /* custom spectral curve input */
89
90		const char      top_level_name[] = "WindowElement";
#	Line 160 | Line 166 | input2str(const char *inpspec)
166		fprintf(stderr, "%s: cannot open\n", inpspec);
167		return "";
168		}
169	<	#ifndef _WIN32                          /* XXX somehow broken on Windows */
169	>	#if !defined(_WIN32) && !defined(_WIN64)
170	>	/* XXX somehow broken on Windows */
171		len = lseek(fd, 0L, SEEK_END);
172		if (len > 0) {
173		lseek(fd, 0L, SEEK_SET);
#	Line 585 | Line 592 | writeBSDF(const char *caller, ezxml_t fl)
592		free(xml);
593		return 0;
594		}
595	+	puts("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
596	+	for (i = 0; i < ncomm; i++)
597	+	printf("<!-- %s -->\n", commlist[i]);
598		fflush(stdout);                         /* write previous XML info. */
599		if (write(fileno(stdout), xml, ei) != ei) {
600		free(xml);
#	Line 598 | Line 608 | writeBSDF(const char *caller, ezxml_t fl)
608		fputs(xml+ei, stdout);                  /* write trailer */
609		free(xml);                              /* free string */
610		fputc('\n', stdout);
611	<	return (fflush(stdout) == 0);
611	>	if (fflush(stdout) != 0)
612	>	return 0;
613	>	/* unlink data files if req. */
614	>	for (i = ndataf*(unlink_datafiles != 0); i--; )
615	>	if (data_file[i].fname != stdin_name &&
616	>	data_file[i].fname[0] != '!')
617	>	unlink(data_file[i].fname);
618	>	if (unlink_datafiles > 1 && mgf_geometry != NULL &&
619	>	mgf_geometry != stdin_name &&
620	>	mgf_geometry[0] != '!')
621	>	unlink(mgf_geometry);
622	>	return 1;
623		}
624
625		/* Insert BSDF data into XML wrapper */
#	Line 717 | Line 738 | UsageExit(const char *pname)
738		fputs("Usage: ", stderr);
739		fputs(pname, stderr);
740		fputs(" [-W][-c][-a {kf|kh|kq|t3|t4}][-u unit][-g geom][-f 'x=string;y=string']", stderr);
741	<	fputs(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp]", stderr);
741	>	fputs(" [-s spectr][-tb inp][-tf inp][-rb inp][-rf inp][-C comm]", stderr);
742		fputs(" [input.xml]\n", stderr);
743		exit(1);
744		}
#	Line 762 | Line 783 | main(int argc, char *argv[])
783		}
784		attr_unit = argv[i];
785		continue;
786	+	case 'U':               /* unlink data files when done */
787	+	unlink_datafiles = 1 + (argv[i][2] == 'U');
788	+	continue;
789		case 'a':               /* angle basis */
790		if (++i >= argc)
791		UsageExit(argv[0]);
#	Line 785 | Line 809 | main(int argc, char *argv[])
809		continue;
810		case 'c':               /* correct solid angle */
811		correct_solid_angle = 1;
812	+	continue;
813	+	case 'C':               /* comment */
814	+	if (ncomm >= MAXCOMM) {
815	+	fprintf(stderr, "%s: too many comments\n",
816	+	argv[0]);
817	+	return 1;
818	+	}
819	+	if (strchr(argv[++i], '>') != NULL) {
820	+	fprintf(stderr, "%s: illegal character in comment\n",
821	+	argv[0]);
822	+	return 1;
823	+	}
824	+	commlist[ncomm++] = argv[i];
825		continue;
826		case 't':               /* transmission */
827		if (i >= argc-1)

Diff Legend

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