[ViewVC] Diff of: radiance/ray/test/renders/ref/combined.rad

Comparing ray/test/renders/ref/combined.rad (file contents):
Revision 1.1 by greg, Sun Nov 18 16:37:32 2018 UTC vs.
Revision 1.2 by greg, Sun Nov 18 17:11:54 2018 UTC

#	Line 1 \| Line 1
1	–	# xform -n i0
2	–	# RCSid $Id$
3	–	# Basic materials used for walls, etc.
1
2		void plastic wall_mat
3		0
#	Line 21 \| Line 18 \| void plastic black_outside
18		0
19		0
20		5 0.05 0.05 0.05 0 0
24	–	# RCSid $Id$
21
22		void metal chrome
23		0
24		0
25		5 0.6 0.6 0.75 1 0
30	–	# RCSid $Id$
26
27		void metal gold
28		0
29		0
30		5 0.99717 0.781957 0.334172 1 0
36	–	# RCSid $Id$
37	–	# A photographed sunset taken on Nov. 6 2018, Berkeley CA
38	–	# Artificial sun source scaled to cover circumsolar
31
32		void colorpict sunset_pat
33		9 red green blue sunset.hdr fisheye.cal fish_u fish_v -rz 90
#	Line 61 \| Line 53 \| sol_light source i0.bigsun
53		0
54		0
55		4 -0.9338 -0.35 0.001 1
64	–	# xform -n dielectric.1 -t 0 0 0
65	–	# RCSid $Id$
66	–	# Walls of our diorama
67	–	# xform -ry -90
68	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
56
57		black_outside polygon dielectric.1.wall.b
58		0
#	Line 132 \| Line 119 \| black_outside polygon dielectric.1.wall.4
119		-8 -0.1 3.1
120		-8 -0.1 -0.1
121		-6.12323399574e-18 -0.1 -0.1
135	–	# black_outside polygon wall.5
136	–	# 0
137	–	# 0
138	–	# 12
139	–	# -6.12323399574e-18 -0.1 -0.1
140	–	# -8 -0.1 -0.1
141	–	# -8 0 4.89858719659e-16
142	–	# 0 0 0
122
123		wall_mat polygon dielectric.1.wall.6
124		0
#	Line 176 \| Line 155 \| floor_mat polygon dielectric.1.wall.9
155		-8 5 4.89858719659e-16
156		-8 0 4.89858719659e-16
157		0 0 0
179	–	# RCSid $Id$
180	–	# Rectangular opening cut in end wall
181	–	# xform -ry -90 -t -8 0 0
182	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
158
159		wall_mat polygon dielectric.1.end_wall.b
160		0
#	Line 291 \| Line 266 \| wall_mat polygon dielectric.1.end_wall.9
266		-8.2 4 1
267		-8.2 1 1
268		-8 1 1
294	–	# RCSid $Id$
295	–	#
296	–	# Vase model courtesy Tom Mertens from web page:
297	–	# http://people.csail.mit.edu/tmertens/textransfer/data
298	–	# Include acknowledgment in any published work:
299	–	# "textured 3D model from the MIT CSAIL database"
300	–	#
301	–	# Origin is at center of base; Z-axis is up.
302	–	# Vase is approx. 23cm tall
303	–	# Moved into middle of room for testing
304	–	#
269
270		void colorpict vase_pat
271		13 lim_r lim_g lim_b vase.hdr climit.cal Lu Lv -i 1 -t 0 0 0
#	Line 317 \| Line 281 \| vase_clay mesh dielectric.1.vase
281		17 vase.rtm -t 25 5 130 -s .005 -t -4 2.5 1 -i 1 -t 0 0 0
282		0
283		0
320	–	# RCSid $Id$
321	–	# xform -s 0.0253999863 -rz 90 -t -4 2.5 2.999
322	–	#
323	–	# Wellmade 2 lamp fixture, model 395-12A-248RS
324	–	#
325	–	# Dimensions in inches, fixture parallel to y axis, center at origin
326	–	#
284
285		void brightdata lum_dist
286		21 flatcorr source/wellmade/395-12A-248RS.dat source.cal src_phi4 src_theta -i 1 -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 0 0
287		0
288		0
332	–	# this is scaled by 1/area (SI)
289
290		lum_dist light lum_bright
291		0
292		0
293		3 20 20 20
338	–	# 3 1.55 1.55 1.55
294
295		lum_bright polygon dielectric.1.luminaire
296		0
#	Line 345 \| Line 300 \| lum_bright polygon dielectric.1.luminaire
300		-4.57784968833 2.22695014728 2.999
301		-4.57784968833 2.77304985273 2.999
302		-3.42215031167 2.77304985272 2.999
348	–	# RCSid $Id$
349	–	# Pink glass pane made of two dieletric faces to fit any opening in end wall
303
304		void dielectric dielectric_pink
305		0
#	Line 370 \| Line 323 \| dielectric_pink polygon dielectric.1.blue_glazing
323		-8.15 5 3
324		-8.15 5 0
325		-8.15 0 0
373	–	# xform -n glass.2 -t 0 5.1 0
374	–	# RCSid $Id$
375	–	# Walls of our diorama
376	–	# xform -ry -90
377	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
326
327		black_outside polygon glass.2.wall.b
328		0
#	Line 441 \| Line 389 \| black_outside polygon glass.2.wall.4
389		-8 5 3.1
390		-8 5 -0.1
391		-6.12323399574e-18 5 -0.1
444	–	# black_outside polygon wall.5
445	–	# 0
446	–	# 0
447	–	# 12
448	–	# -6.12323399574e-18 -0.1 -0.1
449	–	# -8 -0.1 -0.1
450	–	# -8 0 4.89858719659e-16
451	–	# 0 0 0
392
393		wall_mat polygon glass.2.wall.6
394		0
#	Line 485 \| Line 425 \| floor_mat polygon glass.2.wall.9
425		-8 10.1 4.89858719659e-16
426		-8 5.1 4.89858719659e-16
427		0 5.1 0
488	–	# RCSid $Id$
489	–	# Rectangular opening cut in end wall
490	–	# xform -ry -90 -t -8 0 0
491	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
428
429		wall_mat polygon glass.2.end_wall.b
430		0
#	Line 600 \| Line 536 \| wall_mat polygon glass.2.end_wall.9
536		-8.2 9.1 1
537		-8.2 6.1 1
538		-8 6.1 1
603	–	# RCSid $Id$
604	–	# A green metal torus with glowing red stripes
539
540		void metal green_metal
541		0
#	Line 617 \| Line 551 \| void mixfunc striped
551		10 green_metal red_glow "if(mod(atan2(Py-A2,Px-A1),PI/10) - PI/20, 1, 0)" . -i 1 -t 0 5.1 0
552		0
553		3 -4 2.5 1.5
620	–	# xform -ry 52 -s .2 -t -4 2.5 1.5
621	–	# genrev striped torus sin(2PIt) 2+cos(2PIt) 32 -s
554
555		striped texfunc Phong
556		20 rev_dx rev_dy rev_dz rev.cal -i 1 -ry 52 -s .2 -t -4 2.5 1.5 -i 1 -t 0 5.1 0
#	Line 1035 \| Line 967 \| Phong cone glass.2.torus.32
967		-4.03074665433 7.6 1.47597808091
968		-4 7.6 1.5
969		0.59615705608 0.6
1038	–	# RCSid $Id$
1039	–	# A clear glazing used to create rectangular illum at window
1040	–	#@mkillum f=glass_ill c=d d=50 s=64
970
971		void glass glass_clear
972		0
#	Line 1052 \| Line 981 \| glass_clear polygon glass.2.clear_glazing
981		-8.1 9.1 1
982		-8.1 9.1 2
983		-8.1 6.1 2
1055	–	# xform -n inst.3 -t 0 10.2 0
1056	–	# RCSid $Id$
1057	–	# Walls of our diorama
1058	–	# xform -ry -90
1059	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
984
985		black_outside polygon inst.3.wall.b
986		0
#	Line 1123 \| Line 1047 \| black_outside polygon inst.3.wall.4
1047		-8 10.1 3.1
1048		-8 10.1 -0.1
1049		-6.12323399574e-18 10.1 -0.1
1126	–	# black_outside polygon wall.5
1127	–	# 0
1128	–	# 0
1129	–	# 12
1130	–	# -6.12323399574e-18 -0.1 -0.1
1131	–	# -8 -0.1 -0.1
1132	–	# -8 0 4.89858719659e-16
1133	–	# 0 0 0
1050
1051		wall_mat polygon inst.3.wall.6
1052		0
#	Line 1167 \| Line 1083 \| floor_mat polygon inst.3.wall.9
1083		-8 15.2 4.89858719659e-16
1084		-8 10.2 4.89858719659e-16
1085		0 10.2 0
1170	–	# RCSid $Id$
1171	–	# A closed wall for the end cap of our diorama
1172	–	# xform -t -8.2 -.1 -.1
1173	–	# genbox wall_mat end_wall .2 5.2 3.2
1086
1087		wall_mat polygon inst.3.end_wall.1540
1088		0
#	Line 1225 \| Line 1137 \| wall_mat polygon inst.3.end_wall.6457
1137		-8.2 10.1 3.1
1138		-8 10.1 3.1
1139		-8 15.3 3.1
1228	–	# RCSid $Id$
1229	–	#
1230	–	# Test of instance primitive and spaces in names and modifiers
1231	–	#
1140
1141		void instance "inst.3.porsche #1"
1142		15 porsche.octf -rx 90 -s .15 -t -4 2 1 -i 1 -t 0 10.2 0
#	Line 1244 \| Line 1152 \| void ashik2 "ashik mat"
1152		15 porsche.octf -rx 90 -s .15 -t -4 3 1 -i 1 -t 0 10.2 0
1153		0
1154		0
1247	–	# RCSid $Id$
1248	–	# A pair of spotlights, one pink and one bluish
1155
1156		void spotlight pink_spotlight
1157		0
#	Line 1274 \| Line 1180 \| blue_spotlight ring inst.3.bspot
1180		-2 14.2 2.5
1181		-2.5 -1.5 -2
1182		0 0.2
1277	–	# RCSid $Id$
1278	–	# xform -s 0.0253999863 -rz 90 -t -4 2.5 2.999
1279	–	#
1280	–	# Wellmade 2 lamp fixture, model 395-12A-248RS
1281	–	#
1282	–	# Dimensions in inches, fixture parallel to y axis, center at origin
1283	–	#
1183
1184		void brightdata lum_dist
1185		21 flatcorr source/wellmade/395-12A-248RS.dat source.cal src_phi4 src_theta -i 1 -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 10.2 0
1186		0
1187		0
1289	–	# this is scaled by 1/area (SI)
1188
1189		lum_dist light lum_bright
1190		0
1191		0
1192		3 20 20 20
1295	–	# 3 1.55 1.55 1.55
1193
1194		lum_bright polygon inst.3.luminaire
1195		0
#	Line 1302 \| Line 1199 \| lum_bright polygon inst.3.luminaire
1199		-4.57784968833 12.4269501473 2.999
1200		-4.57784968833 12.9730498527 2.999
1201		-3.42215031167 12.9730498527 2.999
1305	–	# xform -n mesh.4 -t 0 15.3 0
1306	–	# RCSid $Id$
1307	–	# Walls of our diorama
1308	–	# xform -ry -90
1309	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
1202
1203		black_outside polygon mesh.4.wall.b
1204		0
#	Line 1373 \| Line 1265 \| black_outside polygon mesh.4.wall.4
1265		-8 15.2 3.1
1266		-8 15.2 -0.1
1267		-6.12323399574e-18 15.2 -0.1
1376	–	# black_outside polygon wall.5
1377	–	# 0
1378	–	# 0
1379	–	# 12
1380	–	# -6.12323399574e-18 -0.1 -0.1
1381	–	# -8 -0.1 -0.1
1382	–	# -8 0 4.89858719659e-16
1383	–	# 0 0 0
1268
1269		wall_mat polygon mesh.4.wall.6
1270		0
#	Line 1417 \| Line 1301 \| floor_mat polygon mesh.4.wall.9
1301		-8 20.3 4.89858719659e-16
1302		-8 15.3 4.89858719659e-16
1303		0 15.3 0
1420	–	# RCSid $Id$
1421	–	# A closed wall for the end cap of our diorama
1422	–	# xform -t -8.2 -.1 -.1
1423	–	# genbox wall_mat end_wall .2 5.2 3.2
1304
1305		wall_mat polygon mesh.4.end_wall.1540
1306		0
#	Line 1475 \| Line 1355 \| wall_mat polygon mesh.4.end_wall.6457
1355		-8.2 15.2 3.1
1356		-8 15.2 3.1
1357		-8 20.4 3.1
1478	–	# xform -n mesh.plainclothes.5.0 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 0 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1479	–	# RCSid $Id$
1480	–	#
1481	–	# Mesh test with a woman model
1482	–	#
1358
1359		void mesh mesh.plainclothes.5.0.woman
1360		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 0 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1361		0
1362		0
1488	–	# xform -n mesh.plainclothes.5.1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 1 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1489	–	# RCSid $Id$
1490	–	#
1491	–	# Mesh test with a woman model
1492	–	#
1363
1364		void mesh mesh.plainclothes.5.1.woman
1365		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 1 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1366		0
1367		0
1498	–	# xform -n mesh.plainclothes.5.2 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 2 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1499	–	# RCSid $Id$
1500	–	#
1501	–	# Mesh test with a woman model
1502	–	#
1368
1369		void mesh mesh.plainclothes.5.2.woman
1370		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 2 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1371		0
1372		0
1508	–	# xform -n mesh.plainclothes.5.3 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 3 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1509	–	# RCSid $Id$
1510	–	#
1511	–	# Mesh test with a woman model
1512	–	#
1373
1374		void mesh mesh.plainclothes.5.3.woman
1375		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 3 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1376		0
1377		0
1518	–	# xform -n mesh.plainclothes.5.4 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 4 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1519	–	# RCSid $Id$
1520	–	#
1521	–	# Mesh test with a woman model
1522	–	#
1378
1379		void mesh mesh.plainclothes.5.4.woman
1380		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 4 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1381		0
1382		0
1528	–	# xform -n mesh.plainclothes.5.5 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 5 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1529	–	# RCSid $Id$
1530	–	#
1531	–	# Mesh test with a woman model
1532	–	#
1383
1384		void mesh mesh.plainclothes.5.5.woman
1385		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 5 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1386		0
1387		0
1538	–	# xform -n mesh.plainclothes.5.6 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 6 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1539	–	# RCSid $Id$
1540	–	#
1541	–	# Mesh test with a woman model
1542	–	#
1388
1389		void mesh mesh.plainclothes.5.6.woman
1390		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 6 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1391		0
1392		0
1548	–	# xform -n mesh.plainclothes.5.7 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 7 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1549	–	# RCSid $Id$
1550	–	#
1551	–	# Mesh test with a woman model
1552	–	#
1393
1394		void mesh mesh.plainclothes.5.7.woman
1395		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 7 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1396		0
1397		0
1558	–	# xform -n mesh.plainclothes.5.8 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 8 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1559	–	# RCSid $Id$
1560	–	#
1561	–	# Mesh test with a woman model
1562	–	#
1398
1399		void mesh mesh.plainclothes.5.8.woman
1400		27 woman.rtm -i 1 -s 1.5 -rx 90 -rz -80 -t 1 0 0 -i 8 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1401		0
1402		0
1568	–	# xform -m chrome -n mesh.shiny.6.0 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 0 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1569	–	# RCSid $Id$
1570	–	#
1571	–	# Mesh test with a woman model
1572	–	#
1403
1404		chrome mesh mesh.shiny.6.0.woman
1405		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 0 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1406		0
1407		0
1578	–	# xform -m chrome -n mesh.shiny.6.1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 1 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1579	–	# RCSid $Id$
1580	–	#
1581	–	# Mesh test with a woman model
1582	–	#
1408
1409		chrome mesh mesh.shiny.6.1.woman
1410		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 1 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1411		0
1412		0
1588	–	# xform -m chrome -n mesh.shiny.6.2 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 2 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1589	–	# RCSid $Id$
1590	–	#
1591	–	# Mesh test with a woman model
1592	–	#
1413
1414		chrome mesh mesh.shiny.6.2.woman
1415		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 2 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1416		0
1417		0
1598	–	# xform -m chrome -n mesh.shiny.6.3 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 3 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1599	–	# RCSid $Id$
1600	–	#
1601	–	# Mesh test with a woman model
1602	–	#
1418
1419		chrome mesh mesh.shiny.6.3.woman
1420		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 3 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1421		0
1422		0
1608	–	# xform -m chrome -n mesh.shiny.6.4 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 4 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1609	–	# RCSid $Id$
1610	–	#
1611	–	# Mesh test with a woman model
1612	–	#
1423
1424		chrome mesh mesh.shiny.6.4.woman
1425		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 4 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1426		0
1427		0
1618	–	# xform -m chrome -n mesh.shiny.6.5 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 5 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1619	–	# RCSid $Id$
1620	–	#
1621	–	# Mesh test with a woman model
1622	–	#
1428
1429		chrome mesh mesh.shiny.6.5.woman
1430		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 5 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1431		0
1432		0
1628	–	# xform -m chrome -n mesh.shiny.6.6 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 6 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1629	–	# RCSid $Id$
1630	–	#
1631	–	# Mesh test with a woman model
1632	–	#
1433
1434		chrome mesh mesh.shiny.6.6.woman
1435		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 6 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1436		0
1437		0
1638	–	# xform -m chrome -n mesh.shiny.6.7 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 7 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1639	–	# RCSid $Id$
1640	–	#
1641	–	# Mesh test with a woman model
1642	–	#
1438
1439		chrome mesh mesh.shiny.6.7.woman
1440		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 7 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1441		0
1442		0
1648	–	# xform -m chrome -n mesh.shiny.6.8 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 8 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1649	–	# RCSid $Id$
1650	–	#
1651	–	# Mesh test with a woman model
1652	–	#
1443
1444		chrome mesh mesh.shiny.6.8.woman
1445		29 woman.rtm -i 1 -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -i 8 -rz 40 -i 1 -t -5 2.5 0 -t 0 15 0
1446		0
1447		0
1658	–	# xform -n mirror.7 -t 0 0 3.1
1659	–	# RCSid $Id$
1660	–	# Walls of our diorama
1661	–	# xform -ry -90
1662	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
1448
1449		black_outside polygon mirror.7.wall.b
1450		0
#	Line 1726 \| Line 1511 \| black_outside polygon mirror.7.wall.4
1511		-8 -0.1 6.2
1512		-8 -0.1 3
1513		-6.12323399574e-18 -0.1 3
1729	–	# black_outside polygon wall.5
1730	–	# 0
1731	–	# 0
1732	–	# 12
1733	–	# -6.12323399574e-18 -0.1 -0.1
1734	–	# -8 -0.1 -0.1
1735	–	# -8 0 4.89858719659e-16
1736	–	# 0 0 0
1514
1515		wall_mat polygon mirror.7.wall.6
1516		0
#	Line 1770 \| Line 1547 \| floor_mat polygon mirror.7.wall.9
1547		-8 5 3.1
1548		-8 0 3.1
1549		0 0 3.1
1773	–	# RCSid $Id$
1774	–	# A closed wall for the end cap of our diorama
1775	–	# xform -t -8.2 -.1 -.1
1776	–	# genbox wall_mat end_wall .2 5.2 3.2
1550
1551		wall_mat polygon mirror.7.end_wall.1540
1552		0
#	Line 1828 \| Line 1601 \| wall_mat polygon mirror.7.end_wall.6457
1601		-8.2 -0.1 6.2
1602		-8 -0.1 6.2
1603		-8 5.1 6.2
1831	–	# RCSid $Id$
1832	–	# A bluish glass pane to fit any opening in end wall
1604
1605		void glass glass_blue
1606		0
#	Line 1844 \| Line 1615 \| glass_blue polygon mirror.7.blue_glazing
1615		-8.1 5 3.1
1616		-8.1 5 6.1
1617		-8.1 0 6.1
1847	–	# RCSid $Id$
1848	–	# Antimatter to cut through window wall with round, bevelled portal
1849	–	# Couple with closed_end.rad
1618
1619		void antimatter wall_eraser
1620		1 wall_mat
#	Line 1876 \| Line 1644 \| wall_eraser ring mirror.7.inner_portal
1644		-7.999 2.5 4.6
1645		1 0 0
1646		0 1.1
1879	–	# RCSid $Id$
1880	–	# Red ball inside water cube, test for interface
1881	–	# Should match ball_in_cube.rad, but using bubble to invert normal
1647
1648		void dielectric clear_water
1649		0
#	Line 1891 \| Line 1656 \| void interface red_interface
1656		8
1657		0.98 0.98 0.98 1.33
1658		0.98 0.05 0.02 1.6
1894	–	# xform -t -.5 -.5 -.5 -rz 17 -t -4 2.5 1.5
1895	–	# genbox clear_water watery 1 1 1
1659
1660		clear_water polygon mirror.7.watery.1540
1661		0
#	Line 1952 \| Line 1715 \| red_interface bubble mirror.7.red_ruby
1715		0
1716		0
1717		4 -4 2.5 4.6 0.25
1955	–	# RCSid $Id$
1956	–	#
1957	–	# A mirror on the Y=5 wall with an alternate material having some pink diffuse
1958	–	#
1718
1719		void plastic pink_mirror_mat
1720		0
#	Line 1975 \| Line 1734 \| wall_mirror polygon mirror.7.mirror
1734		-2 4.99 4.1
1735		-2 4.99 5.1
1736		-5 4.99 5.1
1978	–	# xform -n mist.8 -t 0 5.1 3.1
1979	–	# RCSid $Id$
1980	–	# Walls of our diorama
1981	–	# xform -ry -90
1982	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
1737
1738		black_outside polygon mist.8.wall.b
1739		0
#	Line 2046 \| Line 1800 \| black_outside polygon mist.8.wall.4
1800		-8 5 6.2
1801		-8 5 3
1802		-6.12323399574e-18 5 3
2049	–	# black_outside polygon wall.5
2050	–	# 0
2051	–	# 0
2052	–	# 12
2053	–	# -6.12323399574e-18 -0.1 -0.1
2054	–	# -8 -0.1 -0.1
2055	–	# -8 0 4.89858719659e-16
2056	–	# 0 0 0
1803
1804		wall_mat polygon mist.8.wall.6
1805		0
#	Line 2090 \| Line 1836 \| floor_mat polygon mist.8.wall.9
1836		-8 10.1 3.1
1837		-8 5.1 3.1
1838		0 5.1 3.1
2093	–	# RCSid $Id$
2094	–	# A closed wall for the end cap of our diorama
2095	–	# xform -t -8.2 -.1 -.1
2096	–	# genbox wall_mat end_wall .2 5.2 3.2
1839
1840		wall_mat polygon mist.8.end_wall.1540
1841		0
#	Line 2148 \| Line 1890 \| wall_mat polygon mist.8.end_wall.6457
1890		-8.2 5 6.2
1891		-8 5 6.2
1892		-8 10.2 6.2
2151	–	# RCSid $Id$
2152	–	# Red ball inside water cube, test for interface
1893
1894		void dielectric clear_water
1895		0
#	Line 2162 \| Line 1902 \| void interface red_interface
1902		8
1903		0.98 0.05 0.02 1.6
1904		0.98 0.98 0.98 1.33
2165	–	# xform -t -.5 -.5 -.5 -rz 17 -t -4 2.5 1.5
2166	–	# genbox clear_water watery 1 1 1
1905
1906		clear_water polygon mist.8.watery.1540
1907		0
#	Line 2223 \| Line 1961 \| red_interface sphere mist.8.red_ruby
1961		0
1962		0
1963		4 -4 7.6 4.6 0.25
2226	–	# RCSid $Id$
2227	–	# Bluish mist suffusing space
1964
1965		void mist blue_mist
1966		0
1967		0
1968		7 0.1 0.1 0.4 0.9 0.9 0.9 0.3
2233	–	# xform -t -7.99 .01 .01
2234	–	# genbox blue_mist smoke 7.98 4.98 2.98
1969
1970		blue_mist polygon mist.8.smoke.1540
1971		0
#	Line 2286 \| Line 2020 \| blue_mist polygon mist.8.smoke.6457
2020		-7.99 5.11 6.09
2021		-0.01 5.11 6.09
2022		-0.01 10.09 6.09
2289	–	# RCSid $Id$
2290	–	# A pair of spotlights, one pink and one bluish
2023
2024		void spotlight pink_spotlight
2025		0
#	Line 2316 \| Line 2048 \| blue_spotlight ring mist.8.bspot
2048		-2 9.1 5.6
2049		-2.5 -1.5 -2
2050		0 0.2
2319	–	# RCSid $Id$
2320	–	# Mist cones to accompany spotlights
2051
2052		void mist blue_spot_mist
2053		1 mist.8.bspot
#	Line 2376 \| Line 2106 \| pink_spot_mist ring mist.8.pink_spot_end
2106		-6.95 9.07 1.64
2107		-2.5 1.5 -2
2108		0 2.13
2379	–	# xform -n prism1.9 -t 0 10.2 3.1
2380	–	# RCSid $Id$
2381	–	# Walls of our diorama
2382	–	# xform -ry -90
2383	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
2109
2110		black_outside polygon prism1.9.wall.b
2111		0
#	Line 2447 \| Line 2172 \| black_outside polygon prism1.9.wall.4
2172		-8 10.1 6.2
2173		-8 10.1 3
2174		-6.12323399574e-18 10.1 3
2450	–	# black_outside polygon wall.5
2451	–	# 0
2452	–	# 0
2453	–	# 12
2454	–	# -6.12323399574e-18 -0.1 -0.1
2455	–	# -8 -0.1 -0.1
2456	–	# -8 0 4.89858719659e-16
2457	–	# 0 0 0
2175
2176		wall_mat polygon prism1.9.wall.6
2177		0
#	Line 2491 \| Line 2208 \| floor_mat polygon prism1.9.wall.9
2208		-8 15.2 3.1
2209		-8 10.2 3.1
2210		0 10.2 3.1
2494	–	# RCSid $Id$
2495	–	# Rectangular opening cut in end wall
2496	–	# xform -ry -90 -t -8 0 0
2497	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
2211
2212		wall_mat polygon prism1.9.end_wall.b
2213		0
#	Line 2606 \| Line 2319 \| wall_mat polygon prism1.9.end_wall.9
2319		-8.2 14.2 4.1
2320		-8.2 11.2 4.1
2321		-8 11.2 4.1
2609	–	# RCSid $Id$
2610	–	# A singe-direction prism
2322
2323		void prism1 prism1mat
2324		13 coef1 dx1 dy1 dz1 prism.cal -rz 90 -i 1 -t 0 10.2 3.1
#	Line 2622 \| Line 2333 \| prism1mat polygon prism1.9.prism1_window
2333		-8.1 14.2 4.1
2334		-8.1 14.2 5.1
2335		-8.1 11.2 5.1
2625	–	# xform -m gold -n prism1.10 -t 0 10.2 3.1
2626	–	# RCSid $Id$
2627	–	#
2628	–	# Vase model courtesy Tom Mertens from web page:
2629	–	# http://people.csail.mit.edu/tmertens/textransfer/data
2630	–	# Include acknowledgment in any published work:
2631	–	# "textured 3D model from the MIT CSAIL database"
2632	–	#
2633	–	# Origin is at center of base; Z-axis is up.
2634	–	# Vase is approx. 23cm tall
2635	–	# Moved into middle of room for testing
2636	–	#
2336
2337		void colorpict vase_pat
2338		13 lim_r lim_g lim_b vase.hdr climit.cal Lu Lv -i 1 -t 0 10.2 3.1
#	Line 2649 \| Line 2348 \| gold mesh prism1.10.vase
2348		17 vase.rtm -t 25 5 130 -s .005 -t -4 2.5 1 -i 1 -t 0 10.2 3.1
2349		0
2350		0
2652	–	# xform -n prism2.11 -t 0 15.3 3.1
2653	–	# RCSid $Id$
2654	–	# Walls of our diorama
2655	–	# xform -ry -90
2656	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
2351
2352		black_outside polygon prism2.11.wall.b
2353		0
#	Line 2720 \| Line 2414 \| black_outside polygon prism2.11.wall.4
2414		-8 15.2 6.2
2415		-8 15.2 3
2416		-6.12323399574e-18 15.2 3
2723	–	# black_outside polygon wall.5
2724	–	# 0
2725	–	# 0
2726	–	# 12
2727	–	# -6.12323399574e-18 -0.1 -0.1
2728	–	# -8 -0.1 -0.1
2729	–	# -8 0 4.89858719659e-16
2730	–	# 0 0 0
2417
2418		wall_mat polygon prism2.11.wall.6
2419		0
#	Line 2764 \| Line 2450 \| floor_mat polygon prism2.11.wall.9
2450		-8 20.3 3.1
2451		-8 15.3 3.1
2452		0 15.3 3.1
2767	–	# RCSid $Id$
2768	–	# Rectangular opening cut in end wall
2769	–	# xform -ry -90 -t -8 0 0
2770	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
2453
2454		wall_mat polygon prism2.11.end_wall.b
2455		0
#	Line 2879 \| Line 2561 \| wall_mat polygon prism2.11.end_wall.9
2561		-8.2 19.3 4.1
2562		-8.2 16.3 4.1
2563		-8 16.3 4.1
2882	–	# RCSid $Id$
2883	–	# A dual-direction prism
2564
2565		void prism2 prism2mat
2566		17 coef1 dx1 dy1 dz1 coef2 dx2 dy2 dz2 prism.cal -rz 90 -i 1 -t 0 15.3 3.1
#	Line 2895 \| Line 2575 \| prism2mat polygon prism2.11.prism2_window
2575		-8.1 19.3 4.1
2576		-8.1 19.3 5.1
2577		-8.1 16.3 5.1
2898	–	# xform -m gold -n prism2.12 -t 0 15.3 3.1
2899	–	# RCSid $Id$
2900	–	#
2901	–	# Vase model courtesy Tom Mertens from web page:
2902	–	# http://people.csail.mit.edu/tmertens/textransfer/data
2903	–	# Include acknowledgment in any published work:
2904	–	# "textured 3D model from the MIT CSAIL database"
2905	–	#
2906	–	# Origin is at center of base; Z-axis is up.
2907	–	# Vase is approx. 23cm tall
2908	–	# Moved into middle of room for testing
2909	–	#
2578
2579		void colorpict vase_pat
2580		13 lim_r lim_g lim_b vase.hdr climit.cal Lu Lv -i 1 -t 0 15.3 3.1
#	Line 2922 \| Line 2590 \| gold mesh prism2.12.vase
2590		17 vase.rtm -t 25 5 130 -s .005 -t -4 2.5 1 -i 1 -t 0 15.3 3.1
2591		0
2592		0
2925	–	# xform -n tfunc.13 -t 0 0 6.2
2926	–	# RCSid $Id$
2927	–	# Basic materials used for walls, etc.
2593
2594		void plastic wall_mat
2595		0
#	Line 2945 \| Line 2610 \| void plastic black_outside
2610		0
2611		0
2612		5 0.05 0.05 0.05 0 0
2948	–	# RCSid $Id$
2949	–	# Walls of our diorama
2950	–	# xform -ry -90
2951	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
2613
2614		black_outside polygon tfunc.13.wall.b
2615		0
#	Line 3015 \| Line 2676 \| black_outside polygon tfunc.13.wall.4
2676		-8 -0.1 9.3
2677		-8 -0.1 6.1
2678		-6.12323399574e-18 -0.1 6.1
3018	–	# black_outside polygon wall.5
3019	–	# 0
3020	–	# 0
3021	–	# 12
3022	–	# -6.12323399574e-18 -0.1 -0.1
3023	–	# -8 -0.1 -0.1
3024	–	# -8 0 4.89858719659e-16
3025	–	# 0 0 0
2679
2680		wall_mat polygon tfunc.13.wall.6
2681		0
#	Line 3059 \| Line 2712 \| floor_mat polygon tfunc.13.wall.9
2712		-8 5 6.2
2713		-8 0 6.2
2714		0 0 6.2
3062	–	# RCSid $Id$
3063	–	# Rectangular opening cut in end wall
3064	–	# xform -ry -90 -t -8 0 0
3065	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
2715
2716		wall_mat polygon tfunc.13.end_wall.b
2717		0
#	Line 3174 \| Line 2823 \| wall_mat polygon tfunc.13.end_wall.9
2823		-8.2 4 7.2
2824		-8.2 1 7.2
2825		-8 1 7.2
3177	–	# RCSid $Id$
3178	–	# Test of cylinders, tubes, and BRTDfunc material
2826
2827		void BRTDfunc brtd_mat
2828		16 .1 .1 .1+if(Rdot-.8,0,.7) .1+if(RdotP-.8,.7,0) .1 .1 0 0 0 . -i 1 -t 0 0 6.2
#	Line 3205 \| Line 2852 \| brtd_mat cylinder tfunc.13.cyl3
2852		-4 2.5 7.5
2853		-4 2.5 7.9
2854		0.4
3208	–	# RCSid $Id$
3209	–	# A transfunc window to turn into a light source with mkillum
3210	–	#@mkillum l+ f=tfunc_ill c=a d=100 s=128
2855
2856		void transfunc tfunc_mat
2857		8 absdf aniso.cal -i 1 -t 0 0 6.2
#	Line 3222 \| Line 2866 \| tfunc_mat polygon tfunc.13.tfunc_window
2866		-8.1 4 7.2
2867		-8.1 4 8.2
2868		-8.1 1 8.2
3225	–	# xform -n trans.14 -t 0 5.1 6.2
3226	–	# RCSid $Id$
3227	–	# Walls of our diorama
3228	–	# xform -ry -90
3229	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
2869
2870		black_outside polygon trans.14.wall.b
2871		0
#	Line 3293 \| Line 2932 \| black_outside polygon trans.14.wall.4
2932		-8 5 9.3
2933		-8 5 6.1
2934		-6.12323399574e-18 5 6.1
3296	–	# black_outside polygon wall.5
3297	–	# 0
3298	–	# 0
3299	–	# 12
3300	–	# -6.12323399574e-18 -0.1 -0.1
3301	–	# -8 -0.1 -0.1
3302	–	# -8 0 4.89858719659e-16
3303	–	# 0 0 0
2935
2936		wall_mat polygon trans.14.wall.6
2937		0
#	Line 3337 \| Line 2968 \| floor_mat polygon trans.14.wall.9
2968		-8 10.1 6.2
2969		-8 5.1 6.2
2970		0 5.1 6.2
3340	–	# RCSid $Id$
3341	–	# Rectangular opening cut in end wall
3342	–	# xform -ry -90 -t -8 0 0
3343	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
2971
2972		wall_mat polygon trans.14.end_wall.b
2973		0
#	Line 3452 \| Line 3079 \| wall_mat polygon trans.14.end_wall.9
3079		-8.2 9.1 7.2
3080		-8.2 6.1 7.2
3081		-8 6.1 7.2
3455	–	# RCSid $Id$
3456	–	#
3457	–	# Four balls made of plastic2, metal2, plasfunc, and metfunc
3458	–	# Mixtext used to label each
3459	–	#
3082
3083		void plastic white_mat
3084		0
#	Line 3579 \| Line 3201 \| metf_text polygon trans.14.metf_label
3201		-4 9.1 7.1
3202		-4 8.6 7.1
3203		-4 8.6 7.3
3582	–	# RCSid $Id$
3583	–	# A pair of spotlights, one pink and one bluish
3204
3205		void spotlight pink_spotlight
3206		0
#	Line 3609 \| Line 3229 \| blue_spotlight ring trans.14.bspot
3229		-2 9.1 8.7
3230		-2.5 -1.5 -2
3231		0 0.2
3612	–	# RCSid $Id$
3613	–	# xform -s 0.0253999863 -rz 90 -t -4 2.5 2.999
3614	–	#
3615	–	# Wellmade 2 lamp fixture, model 395-12A-248RS
3616	–	#
3617	–	# Dimensions in inches, fixture parallel to y axis, center at origin
3618	–	#
3232
3233		void brightdata lum_dist
3234		21 flatcorr source/wellmade/395-12A-248RS.dat source.cal src_phi4 src_theta -i 1 -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 5.1 6.2
3235		0
3236		0
3624	–	# this is scaled by 1/area (SI)
3237
3238		lum_dist light lum_bright
3239		0
3240		0
3241		3 20 20 20
3630	–	# 3 1.55 1.55 1.55
3242
3243		lum_bright polygon trans.14.luminaire
3244		0
#	Line 3637 \| Line 3248 \| lum_bright polygon trans.14.luminaire
3248		-4.57784968833 7.32695014728 9.199
3249		-4.57784968833 7.87304985273 9.199
3250		-3.42215031167 7.87304985272 9.199
3640	–	# RCSid $Id$
3641	–	# A yellowish trans material in our window
3251
3252		void trans yellow_trans
3253		0
#	Line 3653 \| Line 3262 \| yellow_trans polygon trans.14.yellow_diffuser
3262		-8.1 10.1 6.2
3263		-8.1 10.1 9.2
3264		-8.1 5.1 9.2
3656	–	# xform -n trans2.15 -t 0 10.2 6.2
3657	–	# RCSid $Id$
3658	–	# Walls of our diorama
3659	–	# xform -ry -90
3660	–	# genprism black_outside wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 0 0 3 0 3 5 0 5 0 0 -l 0 0 8 -c
3265
3266		black_outside polygon trans2.15.wall.b
3267		0
#	Line 3724 \| Line 3328 \| black_outside polygon trans2.15.wall.4
3328		-8 10.1 9.3
3329		-8 10.1 6.1
3330		-6.12323399574e-18 10.1 6.1
3727	–	# black_outside polygon wall.5
3728	–	# 0
3729	–	# 0
3730	–	# 12
3731	–	# -6.12323399574e-18 -0.1 -0.1
3732	–	# -8 -0.1 -0.1
3733	–	# -8 0 4.89858719659e-16
3734	–	# 0 0 0
3331
3332		wall_mat polygon trans2.15.wall.6
3333		0
#	Line 3768 \| Line 3364 \| floor_mat polygon trans2.15.wall.9
3364		-8 15.2 6.2
3365		-8 10.2 6.2
3366		0 10.2 6.2
3771	–	# RCSid $Id$
3772	–	# Rectangular opening cut in end wall
3773	–	# xform -ry -90 -t -8 0 0
3774	–	# genprism wall_mat end_wall 10 -.1 -.1 -.1 5.1 3.1 5.1 3.1 -.1 -.1 -.1 1 1 2 1 2 4 1 4 1 1 -l 0 0 .2 -c
3367
3368		wall_mat polygon trans2.15.end_wall.b
3369		0
#	Line 3883 \| Line 3475 \| wall_mat polygon trans2.15.end_wall.9
3475		-8.2 14.2 7.2
3476		-8.2 11.2 7.2
3477		-8 11.2 7.2
3886	–	# RCSid $Id$
3887	–	# Test of cylinders, tubes, and BRTDfunc material
3478
3479		void BRTDfunc brtd_mat
3480		16 .1 .1 .1+if(Rdot-.8,0,.7) .1+if(RdotP-.8,.7,0) .1 .1 0 0 0 . -i 1 -t 0 10.2 6.2
#	Line 3914 \| Line 3504 \| brtd_mat cylinder trans2.15.cyl3
3504		-4 12.7 7.5
3505		-4 12.7 7.9
3506		0.4
3917	–	# RCSid $Id$
3918	–	# A trans2 window to turn into an llum with mkillum
3919	–	#@mkillum l- f=trans2_ill c=a d=100 s=128
3507
3508		void trans2 trans2_mat
3509		10 0 0 1 . -i 1 -t 0 10.2 6.2

Diff Legend

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

Comparing ray/test/renders/ref/combined.rad (file contents): Revision 1.1 by greg, Sun Nov 18 16:37:32 2018 UTC vs. Revision 1.2 by greg, Sun Nov 18 17:11:54 2018 UTC

Diff Legend

Comparing ray/test/renders/ref/combined.rad (file contents):
Revision 1.1 by greg, Sun Nov 18 16:37:32 2018 UTC vs.
Revision 1.2 by greg, Sun Nov 18 17:11:54 2018 UTC