ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/test/renders/ref/combined.rad
(Generate patch)

Comparing ray/test/renders/ref/combined.rad (file contents):
Revision 1.2 by greg, Sun Nov 18 17:11:54 2018 UTC vs.
Revision 1.5 by greg, Wed Nov 21 17:34:17 2018 UTC

# Line 283 | Line 283 | vase_clay mesh dielectric.1.vase
283   0
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
286 > 19 flatcorr rect_fixture.dat source.cal src_phi4 src_theta -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 0 0
287   0
288   0
289  
# Line 973 | Line 973 | void glass glass_clear
973   0
974   3               0.92               0.92               0.92
975  
976 < glass_clear polygon glass.2.clear_glazing
976 > void colordata illum_mat.dist
977 > 15 red green blue glass_illR.dat glass_illG.dat glass_illB.dat illum.cal il_alth il_azih -i 1 -t 0 5.1 0
978   0
979 + 9                  0                  1                  0                  0                  0                  1                  1                  0                  0
980 +
981 + illum_mat.dist illum illum_mat
982 + 1 glass_clear
983   0
984 + 3           0.946982           0.577398           0.452005
985 +
986 + illum_mat polygon glass.2.clear_glazing
987 + 0
988 + 0
989   12
990                 -8.1                6.1                  1
991                 -8.1                9.1                  1
# Line 1182 | Line 1192 | blue_spotlight ring inst.3.bspot
1192                    0                0.2
1193  
1194   void brightdata lum_dist
1195 < 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
1195 > 19 flatcorr rect_fixture.dat source.cal src_phi4 src_theta -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 10.2 0
1196   0
1197   0
1198  
# Line 1356 | Line 1366 | wall_mat polygon mesh.4.end_wall.6457
1366                   -8               15.2                3.1
1367                   -8               20.4                3.1
1368  
1369 + void brightdata lum_dist
1370 + 19 flatcorr rect_fixture.dat source.cal src_phi4 src_theta -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 15.3 0
1371 + 0
1372 + 0
1373 +
1374 + lum_dist light lum_bright
1375 + 0
1376 + 0
1377 + 3                 20                 20                 20
1378 +
1379 + lum_bright polygon mesh.4.luminaire
1380 + 0
1381 + 0
1382 + 12
1383 +     -3.42215031167      17.5269501473              2.999
1384 +     -4.57784968833      17.5269501473              2.999
1385 +     -4.57784968833      18.0730498527              2.999
1386 +     -3.42215031167      18.0730498527              2.999
1387 +
1388   void mesh mesh.plainclothes.5.0.woman
1389 < 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
1389 > 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.3 0
1390   0
1391   0
1392  
1393   void mesh mesh.plainclothes.5.1.woman
1394 < 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
1394 > 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.3 0
1395   0
1396   0
1397  
1398   void mesh mesh.plainclothes.5.2.woman
1399 < 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
1399 > 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.3 0
1400   0
1401   0
1402  
1403   void mesh mesh.plainclothes.5.3.woman
1404 < 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
1404 > 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.3 0
1405   0
1406   0
1407  
1408   void mesh mesh.plainclothes.5.4.woman
1409 < 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
1409 > 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.3 0
1410   0
1411   0
1412  
1413   void mesh mesh.plainclothes.5.5.woman
1414 < 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
1414 > 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.3 0
1415   0
1416   0
1417  
1418   void mesh mesh.plainclothes.5.6.woman
1419 < 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
1419 > 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.3 0
1420   0
1421   0
1422  
1423   void mesh mesh.plainclothes.5.7.woman
1424 < 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
1424 > 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.3 0
1425   0
1426   0
1427  
1428   void mesh mesh.plainclothes.5.8.woman
1429 < 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
1429 > 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.3 0
1430   0
1431   0
1432  
1433   chrome mesh mesh.shiny.6.0.woman
1434 < 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
1434 > 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.3 0
1435   0
1436   0
1437  
1438   chrome mesh mesh.shiny.6.1.woman
1439 < 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
1439 > 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.3 0
1440   0
1441   0
1442  
1443   chrome mesh mesh.shiny.6.2.woman
1444 < 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
1444 > 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.3 0
1445   0
1446   0
1447  
1448   chrome mesh mesh.shiny.6.3.woman
1449 < 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
1449 > 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.3 0
1450   0
1451   0
1452  
1453   chrome mesh mesh.shiny.6.4.woman
1454 < 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
1454 > 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.3 0
1455   0
1456   0
1457  
1458   chrome mesh mesh.shiny.6.5.woman
1459 < 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
1459 > 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.3 0
1460   0
1461   0
1462  
1463   chrome mesh mesh.shiny.6.6.woman
1464 < 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
1464 > 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.3 0
1465   0
1466   0
1467  
1468   chrome mesh mesh.shiny.6.7.woman
1469 < 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
1469 > 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.3 0
1470   0
1471   0
1472  
1473   chrome mesh mesh.shiny.6.8.woman
1474 < 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
1474 > 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.3 0
1475   0
1476   0
1477  
# Line 3231 | Line 3260 | blue_spotlight ring trans.14.bspot
3260                    0                0.2
3261  
3262   void brightdata lum_dist
3263 < 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
3263 > 19 flatcorr rect_fixture.dat source.cal src_phi4 src_theta -s 0.0253999863 -rz 90 -t -4 2.5 2.999 -i 1 -t 0 5.1 6.2
3264   0
3265   0
3266  

Diff Legend

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