diff --git a/test/renders/Makefile b/test/renders/Makefile index c9b656599..6bf6454ae 100644 --- a/test/renders/Makefile +++ b/test/renders/Makefile @@ -1,4 +1,4 @@ -# RCSid $Id: Makefile,v 1.25 2020/07/29 18:45:00 greg Exp $ +# RCSid $Id: Makefile,v 1.26 2020/07/29 23:38:22 greg Exp $ # # Render and primitive type testing # @@ -377,7 +377,7 @@ trans_fish.hdr: trans.oct ### Octree for trans2 ### -trans2.oct: trans2.rif +trans21.oct: trans2.rif rad -v 0 trans2.rif ### Reference and test for trans2 view def ### @@ -389,7 +389,7 @@ ref/trans2_def.hdr: make trans2_def.hdr $(RDU_PFILT) trans2_def.hdr > ref/trans2_def.hdr -trans2_def.hdr: trans2.oct +trans2_def.hdr: trans21.oct rad -v def trans2.rif ### End trans2-def tests @@ -403,7 +403,7 @@ ref/trans2_fish.hdr: make trans2_fish.hdr $(RDU_PFILT) trans2_fish.hdr > ref/trans2_fish.hdr -trans2_fish.hdr: trans2.oct +trans2_fish.hdr: trans21.oct rad -v fish trans2.rif ### End trans2-fish tests @@ -417,7 +417,7 @@ ref/trans2_win.hdr: make trans2_win.hdr $(RDU_PFILT) trans2_win.hdr > ref/trans2_win.hdr -trans2_win.hdr: trans2.oct +trans2_win.hdr: trans21.oct rad -v win trans2.rif ### End trans2-win tests diff --git a/test/renders/blinds.rad b/test/renders/blinds.rad index fc24ad0cf..af7490caa 100644 --- a/test/renders/blinds.rad +++ b/test/renders/blinds.rad @@ -1,643 +1,6 @@ -# RCSid $Id: blinds.rad,v 1.2 2018/12/01 05:40:35 greg Exp $ +# RCSid $Id: blinds.rad,v 1.3 2020/07/29 23:38:22 greg Exp $ # Venetian blinds with BSDF in rectangular window #@mkillum f=blinds_ill c=d d=200 s=100 i=m_blinds20c_f -# xform -rz 90 -ry 90 -t -8.04 2.5 1.5 -# Material 'Green specular venetian blinds at 20 degree angle' by 'Greg Ward' - -void BSDF m_blinds20c_f -16 0.0375926 blinds20c.xml 0 1 0 . -i 1 -rz 90 -ry 90 -t -8.04 2.5 1.5 -0 -0 - -m_blinds20c_f polygon blinds20c_f -0 -0 -12 - -8.03999924818 1 1.0131551 - -8.03999924818 4 1.0131551 - -8.03999924818 4 1.9868449 - -8.03999924818 1 1.9868449 - -void BSDF m_blinds20c_b -16 -0.0375926 blinds20c.xml 0 1 0 . -i 1 -rz 90 -ry 90 -t -8.04 2.5 1.5 -0 -0 - -m_blinds20c_b polygon blinds20c_b -0 -0 -12 - -8.07759185 1 1.0131551 - -8.07759185 4 1.0131551 - -8.07759185 4 1.9868449 - -8.07759185 1 1.9868449 -## Translated from MGF Version 2.0 -## mgf2rad -## mgf2rad /tmp/rtOf2KzM ############################## -# Y-axis points "up", Z-axis into room, right-handed coordinates - -void plastic MagentaPlastic -0 -0 -5 1.677905 0.34403 0.600828 0.02 0.05 - -MagentaPlastic polygon VenetianBlinds.a0.mSlat.f1 -0 -0 -12 - -8.07758770483 1 1.01315519427 - -8.07758770483 4 1.01315519427 - -8.04 4 1.026836 - -8.04 1 1.026836 - -void metal SpecularGreen -0 -0 -5 0.138419 0.898658 0.171458 0.923077 0.03 - -SpecularGreen polygon VenetianBlinds.a0.gSlat.f2 -0 -0 -12 - -8.07759112503 1 1.01316459119 - -8.07759112503 4 1.01316459119 - -8.0400034202 4 1.02684539693 - -8.0400034202 1 1.02684539693 - -MagentaPlastic polygon VenetianBlinds.a1.mSlat.f3 -0 -0 -12 - -8.07758770483 1 1.04315519427 - -8.07758770483 4 1.04315519427 - -8.04 4 1.056836 - -8.04 1 1.056836 - -SpecularGreen polygon VenetianBlinds.a1.gSlat.f4 -0 -0 -12 - -8.07759112503 1 1.04316459119 - -8.07759112503 4 1.04316459119 - -8.0400034202 4 1.05684539693 - -8.0400034202 1 1.05684539693 - -MagentaPlastic polygon VenetianBlinds.a2.mSlat.f5 -0 -0 -12 - -8.07758770483 1 1.07315519427 - -8.07758770483 4 1.07315519427 - -8.04 4 1.086836 - -8.04 1 1.086836 - -SpecularGreen polygon VenetianBlinds.a2.gSlat.f6 -0 -0 -12 - -8.07759112503 1 1.07316459119 - -8.07759112503 4 1.07316459119 - -8.0400034202 4 1.08684539693 - -8.0400034202 1 1.08684539693 - -MagentaPlastic polygon VenetianBlinds.a3.mSlat.f7 -0 -0 -12 - -8.07758770483 1 1.10315519427 - -8.07758770483 4 1.10315519427 - -8.04 4 1.116836 - -8.04 1 1.116836 - -SpecularGreen polygon VenetianBlinds.a3.gSlat.f8 -0 -0 -12 - -8.07759112503 1 1.10316459119 - -8.07759112503 4 1.10316459119 - -8.0400034202 4 1.11684539693 - -8.0400034202 1 1.11684539693 - -MagentaPlastic polygon VenetianBlinds.a4.mSlat.f9 -0 -0 -12 - -8.07758770483 1 1.13315519427 - -8.07758770483 4 1.13315519427 - -8.04 4 1.146836 - -8.04 1 1.146836 - -SpecularGreen polygon VenetianBlinds.a4.gSlat.f10 -0 -0 -12 - -8.07759112503 1 1.13316459119 - -8.07759112503 4 1.13316459119 - -8.0400034202 4 1.14684539693 - -8.0400034202 1 1.14684539693 - -MagentaPlastic polygon VenetianBlinds.a5.mSlat.f11 -0 -0 -12 - -8.07758770483 1 1.16315519427 - -8.07758770483 4 1.16315519427 - -8.04 4 1.176836 - -8.04 1 1.176836 - -SpecularGreen polygon VenetianBlinds.a5.gSlat.f12 -0 -0 -12 - -8.07759112503 1 1.16316459119 - -8.07759112503 4 1.16316459119 - -8.0400034202 4 1.17684539693 - -8.0400034202 1 1.17684539693 - -MagentaPlastic polygon VenetianBlinds.a6.mSlat.f13 -0 -0 -12 - -8.07758770483 1 1.19315519427 - -8.07758770483 4 1.19315519427 - -8.04 4 1.206836 - -8.04 1 1.206836 - -SpecularGreen polygon VenetianBlinds.a6.gSlat.f14 -0 -0 -12 - -8.07759112503 1 1.19316459119 - -8.07759112503 4 1.19316459119 - -8.0400034202 4 1.20684539693 - -8.0400034202 1 1.20684539693 - -MagentaPlastic polygon VenetianBlinds.a7.mSlat.f15 -0 -0 -12 - -8.07758770483 1 1.22315519427 - -8.07758770483 4 1.22315519427 - -8.04 4 1.236836 - -8.04 1 1.236836 - -SpecularGreen polygon VenetianBlinds.a7.gSlat.f16 -0 -0 -12 - -8.07759112503 1 1.22316459119 - -8.07759112503 4 1.22316459119 - -8.0400034202 4 1.23684539693 - -8.0400034202 1 1.23684539693 - -MagentaPlastic polygon VenetianBlinds.a8.mSlat.f17 -0 -0 -12 - -8.07758770483 1 1.25315519427 - -8.07758770483 4 1.25315519427 - -8.04 4 1.266836 - -8.04 1 1.266836 - -SpecularGreen polygon VenetianBlinds.a8.gSlat.f18 -0 -0 -12 - -8.07759112503 1 1.25316459119 - -8.07759112503 4 1.25316459119 - -8.0400034202 4 1.26684539693 - -8.0400034202 1 1.26684539693 - -MagentaPlastic polygon VenetianBlinds.a9.mSlat.f19 -0 -0 -12 - -8.07758770483 1 1.28315519427 - -8.07758770483 4 1.28315519427 - -8.04 4 1.296836 - -8.04 1 1.296836 - -SpecularGreen polygon VenetianBlinds.a9.gSlat.f20 -0 -0 -12 - -8.07759112503 1 1.28316459119 - -8.07759112503 4 1.28316459119 - -8.0400034202 4 1.29684539693 - -8.0400034202 1 1.29684539693 - -MagentaPlastic polygon VenetianBlinds.a10.mSlat.f21 -0 -0 -12 - -8.07758770483 1 1.31315519427 - -8.07758770483 4 1.31315519427 - -8.04 4 1.326836 - -8.04 1 1.326836 - -SpecularGreen polygon VenetianBlinds.a10.gSlat.f22 -0 -0 -12 - -8.07759112503 1 1.31316459119 - -8.07759112503 4 1.31316459119 - -8.0400034202 4 1.32684539693 - -8.0400034202 1 1.32684539693 - -MagentaPlastic polygon VenetianBlinds.a11.mSlat.f23 -0 -0 -12 - -8.07758770483 1 1.34315519427 - -8.07758770483 4 1.34315519427 - -8.04 4 1.356836 - -8.04 1 1.356836 - -SpecularGreen polygon VenetianBlinds.a11.gSlat.f24 -0 -0 -12 - -8.07759112503 1 1.34316459119 - -8.07759112503 4 1.34316459119 - -8.0400034202 4 1.35684539693 - -8.0400034202 1 1.35684539693 - -MagentaPlastic polygon VenetianBlinds.a12.mSlat.f25 -0 -0 -12 - -8.07758770483 1 1.37315519427 - -8.07758770483 4 1.37315519427 - -8.04 4 1.386836 - -8.04 1 1.386836 - -SpecularGreen polygon VenetianBlinds.a12.gSlat.f26 -0 -0 -12 - -8.07759112503 1 1.37316459119 - -8.07759112503 4 1.37316459119 - -8.0400034202 4 1.38684539693 - -8.0400034202 1 1.38684539693 - -MagentaPlastic polygon VenetianBlinds.a13.mSlat.f27 -0 -0 -12 - -8.07758770483 1 1.40315519427 - -8.07758770483 4 1.40315519427 - -8.04 4 1.416836 - -8.04 1 1.416836 - -SpecularGreen polygon VenetianBlinds.a13.gSlat.f28 -0 -0 -12 - -8.07759112503 1 1.40316459119 - -8.07759112503 4 1.40316459119 - -8.0400034202 4 1.41684539693 - -8.0400034202 1 1.41684539693 - -MagentaPlastic polygon VenetianBlinds.a14.mSlat.f29 -0 -0 -12 - -8.07758770483 1 1.43315519427 - -8.07758770483 4 1.43315519427 - -8.04 4 1.446836 - -8.04 1 1.446836 - -SpecularGreen polygon VenetianBlinds.a14.gSlat.f30 -0 -0 -12 - -8.07759112503 1 1.43316459119 - -8.07759112503 4 1.43316459119 - -8.0400034202 4 1.44684539693 - -8.0400034202 1 1.44684539693 - -MagentaPlastic polygon VenetianBlinds.a15.mSlat.f31 -0 -0 -12 - -8.07758770483 1 1.46315519427 - -8.07758770483 4 1.46315519427 - -8.04 4 1.476836 - -8.04 1 1.476836 - -SpecularGreen polygon VenetianBlinds.a15.gSlat.f32 -0 -0 -12 - -8.07759112503 1 1.46316459119 - -8.07759112503 4 1.46316459119 - -8.0400034202 4 1.47684539693 - -8.0400034202 1 1.47684539693 - -MagentaPlastic polygon VenetianBlinds.a16.mSlat.f33 -0 -0 -12 - -8.07758770483 1 1.49315519427 - -8.07758770483 4 1.49315519427 - -8.04 4 1.506836 - -8.04 1 1.506836 - -SpecularGreen polygon VenetianBlinds.a16.gSlat.f34 -0 -0 -12 - -8.07759112503 1 1.49316459119 - -8.07759112503 4 1.49316459119 - -8.0400034202 4 1.50684539693 - -8.0400034202 1 1.50684539693 - -MagentaPlastic polygon VenetianBlinds.a17.mSlat.f35 -0 -0 -12 - -8.07758770483 1 1.52315519427 - -8.07758770483 4 1.52315519427 - -8.04 4 1.536836 - -8.04 1 1.536836 - -SpecularGreen polygon VenetianBlinds.a17.gSlat.f36 -0 -0 -12 - -8.07759112503 1 1.52316459119 - -8.07759112503 4 1.52316459119 - -8.0400034202 4 1.53684539693 - -8.0400034202 1 1.53684539693 - -MagentaPlastic polygon VenetianBlinds.a18.mSlat.f37 -0 -0 -12 - -8.07758770483 1 1.55315519427 - -8.07758770483 4 1.55315519427 - -8.04 4 1.566836 - -8.04 1 1.566836 - -SpecularGreen polygon VenetianBlinds.a18.gSlat.f38 -0 -0 -12 - -8.07759112503 1 1.55316459119 - -8.07759112503 4 1.55316459119 - -8.0400034202 4 1.56684539693 - -8.0400034202 1 1.56684539693 - -MagentaPlastic polygon VenetianBlinds.a19.mSlat.f39 -0 -0 -12 - -8.07758770483 1 1.58315519427 - -8.07758770483 4 1.58315519427 - -8.04 4 1.596836 - -8.04 1 1.596836 - -SpecularGreen polygon VenetianBlinds.a19.gSlat.f40 -0 -0 -12 - -8.07759112503 1 1.58316459119 - -8.07759112503 4 1.58316459119 - -8.0400034202 4 1.59684539693 - -8.0400034202 1 1.59684539693 - -MagentaPlastic polygon VenetianBlinds.a20.mSlat.f41 -0 -0 -12 - -8.07758770483 1 1.61315519427 - -8.07758770483 4 1.61315519427 - -8.04 4 1.626836 - -8.04 1 1.626836 - -SpecularGreen polygon VenetianBlinds.a20.gSlat.f42 -0 -0 -12 - -8.07759112503 1 1.61316459119 - -8.07759112503 4 1.61316459119 - -8.0400034202 4 1.62684539693 - -8.0400034202 1 1.62684539693 - -MagentaPlastic polygon VenetianBlinds.a21.mSlat.f43 -0 -0 -12 - -8.07758770483 1 1.64315519427 - -8.07758770483 4 1.64315519427 - -8.04 4 1.656836 - -8.04 1 1.656836 - -SpecularGreen polygon VenetianBlinds.a21.gSlat.f44 -0 -0 -12 - -8.07759112503 1 1.64316459119 - -8.07759112503 4 1.64316459119 - -8.0400034202 4 1.65684539693 - -8.0400034202 1 1.65684539693 - -MagentaPlastic polygon VenetianBlinds.a22.mSlat.f45 -0 -0 -12 - -8.07758770483 1 1.67315519427 - -8.07758770483 4 1.67315519427 - -8.04 4 1.686836 - -8.04 1 1.686836 - -SpecularGreen polygon VenetianBlinds.a22.gSlat.f46 -0 -0 -12 - -8.07759112503 1 1.67316459119 - -8.07759112503 4 1.67316459119 - -8.0400034202 4 1.68684539693 - -8.0400034202 1 1.68684539693 - -MagentaPlastic polygon VenetianBlinds.a23.mSlat.f47 -0 -0 -12 - -8.07758770483 1 1.70315519427 - -8.07758770483 4 1.70315519427 - -8.04 4 1.716836 - -8.04 1 1.716836 - -SpecularGreen polygon VenetianBlinds.a23.gSlat.f48 -0 -0 -12 - -8.07759112503 1 1.70316459119 - -8.07759112503 4 1.70316459119 - -8.0400034202 4 1.71684539693 - -8.0400034202 1 1.71684539693 - -MagentaPlastic polygon VenetianBlinds.a24.mSlat.f49 -0 -0 -12 - -8.07758770483 1 1.73315519427 - -8.07758770483 4 1.73315519427 - -8.04 4 1.746836 - -8.04 1 1.746836 - -SpecularGreen polygon VenetianBlinds.a24.gSlat.f50 -0 -0 -12 - -8.07759112503 1 1.73316459119 - -8.07759112503 4 1.73316459119 - -8.0400034202 4 1.74684539693 - -8.0400034202 1 1.74684539693 - -MagentaPlastic polygon VenetianBlinds.a25.mSlat.f51 -0 -0 -12 - -8.07758770483 1 1.76315519427 - -8.07758770483 4 1.76315519427 - -8.04 4 1.776836 - -8.04 1 1.776836 - -SpecularGreen polygon VenetianBlinds.a25.gSlat.f52 -0 -0 -12 - -8.07759112503 1 1.76316459119 - -8.07759112503 4 1.76316459119 - -8.0400034202 4 1.77684539693 - -8.0400034202 1 1.77684539693 - -MagentaPlastic polygon VenetianBlinds.a26.mSlat.f53 -0 -0 -12 - -8.07758770483 1 1.79315519427 - -8.07758770483 4 1.79315519427 - -8.04 4 1.806836 - -8.04 1 1.806836 - -SpecularGreen polygon VenetianBlinds.a26.gSlat.f54 -0 -0 -12 - -8.07759112503 1 1.79316459119 - -8.07759112503 4 1.79316459119 - -8.0400034202 4 1.80684539693 - -8.0400034202 1 1.80684539693 - -MagentaPlastic polygon VenetianBlinds.a27.mSlat.f55 -0 -0 -12 - -8.07758770483 1 1.82315519427 - -8.07758770483 4 1.82315519427 - -8.04 4 1.836836 - -8.04 1 1.836836 - -SpecularGreen polygon VenetianBlinds.a27.gSlat.f56 -0 -0 -12 - -8.07759112503 1 1.82316459119 - -8.07759112503 4 1.82316459119 - -8.0400034202 4 1.83684539693 - -8.0400034202 1 1.83684539693 - -MagentaPlastic polygon VenetianBlinds.a28.mSlat.f57 -0 -0 -12 - -8.07758770483 1 1.85315519427 - -8.07758770483 4 1.85315519427 - -8.04 4 1.866836 - -8.04 1 1.866836 - -SpecularGreen polygon VenetianBlinds.a28.gSlat.f58 -0 -0 -12 - -8.07759112503 1 1.85316459119 - -8.07759112503 4 1.85316459119 - -8.0400034202 4 1.86684539693 - -8.0400034202 1 1.86684539693 - -MagentaPlastic polygon VenetianBlinds.a29.mSlat.f59 -0 -0 -12 - -8.07758770483 1 1.88315519427 - -8.07758770483 4 1.88315519427 - -8.04 4 1.896836 - -8.04 1 1.896836 - -SpecularGreen polygon VenetianBlinds.a29.gSlat.f60 -0 -0 -12 - -8.07759112503 1 1.88316459119 - -8.07759112503 4 1.88316459119 - -8.0400034202 4 1.89684539693 - -8.0400034202 1 1.89684539693 - -MagentaPlastic polygon VenetianBlinds.a30.mSlat.f61 -0 -0 -12 - -8.07758770483 1 1.91315519427 - -8.07758770483 4 1.91315519427 - -8.04 4 1.926836 - -8.04 1 1.926836 - -SpecularGreen polygon VenetianBlinds.a30.gSlat.f62 -0 -0 -12 - -8.07759112503 1 1.91316459119 - -8.07759112503 4 1.91316459119 - -8.0400034202 4 1.92684539693 - -8.0400034202 1 1.92684539693 - -MagentaPlastic polygon VenetianBlinds.a31.mSlat.f63 -0 -0 -12 - -8.07758770483 1 1.94315519427 - -8.07758770483 4 1.94315519427 - -8.04 4 1.956836 - -8.04 1 1.956836 - -SpecularGreen polygon VenetianBlinds.a31.gSlat.f64 -0 -0 -12 - -8.07759112503 1 1.94316459119 - -8.07759112503 4 1.94316459119 - -8.0400034202 4 1.95684539693 - -8.0400034202 1 1.95684539693 - -MagentaPlastic polygon VenetianBlinds.a32.mSlat.f65 -0 -0 -12 - -8.07758770483 1 1.97315519427 - -8.07758770483 4 1.97315519427 - -8.04 4 1.986836 - -8.04 1 1.986836 - -SpecularGreen polygon VenetianBlinds.a32.gSlat.f66 -0 -0 -12 - -8.07759112503 1 1.97316459119 - -8.07759112503 4 1.97316459119 - -8.0400034202 4 1.98684539693 - -8.0400034202 1 1.98684539693 +!pkgBSDF -s blinds20c.xml | xform -rz 90 -ry 90 -t -8.04 2.5 1.5 diff --git a/test/renders/torus.rad b/test/renders/torus.rad index da0391f78..e7a53f443 100644 --- a/test/renders/torus.rad +++ b/test/renders/torus.rad @@ -1,4 +1,4 @@ -# RCSid $Id: torus.rad,v 1.1 2018/11/17 22:09:12 greg Exp $ +# RCSid $Id: torus.rad,v 1.2 2020/07/29 23:38:22 greg Exp $ # A green metal torus with glowing red stripes void metal green_metal @@ -16,5 +16,5 @@ void mixfunc striped 0 3 -4 2.5 1.5 -!genrev striped torus 'sin(2*PI*t)' '2+cos(2*PI*t)' 32 -s \ +!genrev striped torus "sin(2*PI*t)" "2+cos(2*PI*t)" 32 -s \ | xform -ry 52 -s .2 -t -4 2.5 1.5