--- ray/test/renders/Makefile 2020/06/29 23:41:32 1.21 +++ ray/test/renders/Makefile 2020/07/29 18:45:00 1.25 @@ -1,4 +1,4 @@ -# RCSid $Id: Makefile,v 1.21 2020/06/29 23:41:32 greg Exp $ +# RCSid $Id: Makefile,v 1.25 2020/07/29 18:45:00 greg Exp $ # # Render and primitive type testing # @@ -21,7 +21,7 @@ test-dielectric-fish test-glass-def test-glass-fish te test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \ test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \ test-trans-def test-trans-fish test-patterns-def test-patterns-plan \ -test-rtrace +test-rtrace test-obj2mesh clean: rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \ @@ -36,22 +36,25 @@ test-rpiece test-mkpmap: test-mixtex-def ### Special test of xform ### test-xform: combined.rad - radcompare -max 0.04 ref/combined.rad combined.rad + radcompare "-c#" -max 0.04 ref/combined.rad combined.rad combined.rad: combined_scene.rad - xform -f combined_scene.rad | grep -v '^[ ]*#' > combined.rad + xform -f combined_scene.rad > combined.rad ### Special test of rad ### -test-rad: inst.rif +test-rad: inst.oct rad -n -s -e inst.rif > inst_rad.txt radcompare ref/inst_rad.txt inst_rad.txt -### Special test of oconv ### +### Special tests of oconv and obj2mesh ### test-oconv: inst.oct radcompare ref/inst.oct inst.oct +test-obj2mesh: cab.obj + obj2mesh -w cab.obj | radcompare ref/cab.rtm - + ### Special test of rtrace ### test-rtrace: ref/mirror_fish.hdr rtmirror_fish.hdr @@ -308,7 +311,7 @@ prism2_fish.hdr: prism2.oct ### Octree for tfunc ### -tfunc.oct: tfunc.rif +tfunc1.oct: tfunc.rif rad -v 0 tfunc.rif ### Reference and test for tfunc view def ### @@ -320,7 +323,7 @@ ref/tfunc_def.hdr: make tfunc_def.hdr $(RDU_PFILT) tfunc_def.hdr > ref/tfunc_def.hdr -tfunc_def.hdr: tfunc.oct +tfunc_def.hdr: tfunc1.oct rad -v def tfunc.rif ### End tfunc-def tests @@ -334,7 +337,7 @@ ref/tfunc_fish.hdr: make tfunc_fish.hdr $(RDU_PFILT) tfunc_fish.hdr > ref/tfunc_fish.hdr -tfunc_fish.hdr: tfunc.oct +tfunc_fish.hdr: tfunc1.oct rad -v fish tfunc.rif ### End tfunc-fish tests