[ViewVC] Diff of: radiance/ray/src/cv/bsdf2ttree.c

Comparing ray/src/cv/bsdf2ttree.c (file contents):
Revision 2.20 by greg, Thu Oct 3 17:27:41 2013 UTC vs.
Revision 2.23 by greg, Tue Nov 26 17:35:59 2013 UTC

#	Line 11 \| Line 11 \| static const char RCSid[] = "$Id$";
11		#include <stdio.h>
12		#include <stdlib.h>
13		#include <math.h>
14	+	#include "random.h"
15		#include "platform.h"
16	+	#include "rtprocess.h"
17		#include "calcomp.h"
18		#include "bsdfrep.h"
19		/* global argv[0] */
#	Line 44 \| Line 46 \| *xml_prologue(int ac, char av[])**
46		puts("<Optical>");
47		puts("<Layer>");
48		puts("\t<Material>");
49	<	puts("\t\t<Name>Name</Name>");
50	<	puts("\t\t<Manufacturer>Manufacturer</Manufacturer>");
49	>	printf("\t\t<Name>%s</Name>\n", bsdf_name[0] ? bsdf_name : "Unknown");
50	>	printf("\t\t<Manufacturer>%s</Manufacturer>\n",
51	>	bsdf_manuf[0] ? bsdf_manuf : "Unknown");
52		puts("\t\t<DeviceType>Other</DeviceType>");
53		puts("\t</Material>");
54		puts("\t<DataDefinition>");
#	Line 167 \| Line 170 \| *eval_isotropic(char funame)**
170		if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) {
171		sum = 0; /* super-sample voxel */
172		for (ssi = nssamp; ssi--; ) {
173	<	SDmultiSamp(ssa, 3, (ssi+drand48())/nssamp);
173	>	SDmultiSamp(ssa, 3, (ssi+frandom())/nssamp);
174		ssvec[0] = 2.*(ix+ssa[0])/sqres - 1.;
175		ssvec[1] = .0;
176		ssvec[2] = input_orient *
#	Line 272 \| Line 275 \| *eval_anisotropic(char funame)**
275		if (abs_diff(bsdf, last_bsdf) > ssamp_thresh) {
276		sum = 0; /* super-sample voxel */
277		for (ssi = nssamp; ssi--; ) {
278	<	SDmultiSamp(ssa, 4, (ssi+drand48())/nssamp);
278	>	SDmultiSamp(ssa, 4, (ssi+frandom())/nssamp);
279		SDsquare2disk(ssvec, 1.-(ix+ssa[0])/sqres,
280		1.-(iy+ssa[1])/sqres);
281		ssvec[2] = output_orient *

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