--- ray/test/renders/Makefile	2018/11/17 23:22:43	1.2
+++ ray/test/renders/Makefile	2018/11/18 16:37:32	1.3
@@ -1,4 +1,4 @@
-# RCSid $Id: Makefile,v 1.2 2018/11/17 23:22:43 greg Exp $
+# RCSid $Id: Makefile,v 1.3 2018/11/18 16:37:32 greg Exp $
 #
 # Render and primitive type testing
 #
@@ -17,10 +17,21 @@ test-tfunc-def test-tfunc-fish test-trans-def test-tra
 test-trans2-def test-trans2-fish
 
 clean:
-	rm -f *.oct *.amb *.dat *_*.hdr *.unf
+	rm -f *.oct *.amb *.dat *_*.hdr *.unf combined.rad
 
-### Reference and test for dielectric view def ###
+# Special test of xform
 
+test-xform:	combined_scene.rad
+	xform -f combined_scene.rad > combined.rad
+	radcompare ref/combined.rad combined.rad
+
+### Octree for dielectric ###
+
+dielectric.oct:	dielectric.rif
+	rad -v 0 dielectric.rif
+
+### Reference and test for dielectric view   def ###
+
 test-dielectric-def:	ref/dielectric_def.hdr dielectric_def.hdr
 	$(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr -
 
@@ -28,12 +39,12 @@ ref/dielectric_def.hdr:
 	make dielectric_def.hdr
 	$(RDU_PFILT) dielectric_def.hdr > ref/dielectric_def.hdr
 
-dielectric_def.hdr:	dielectric.rif
-	rad -v def dielectric.rif
+dielectric_def.hdr:	dielectric.oct
+	rad -v   def dielectric.rif
 
-### End dielectric-def tests
+### End dielectric-def   tests
 
-### Reference and test for dielectric view fish ###
+### Reference and test for dielectric view  fish ###
 
 test-dielectric-fish:	ref/dielectric_fish.hdr dielectric_fish.hdr
 	$(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr -
@@ -42,273 +53,323 @@ ref/dielectric_fish.hdr:
 	make dielectric_fish.hdr
 	$(RDU_PFILT) dielectric_fish.hdr > ref/dielectric_fish.hdr
 
-dielectric_fish.hdr:	dielectric.rif
-	rad -v fish dielectric.rif
+dielectric_fish.hdr:	dielectric.oct
+	rad -v  fish dielectric.rif
 
-### End dielectric-fish tests
+### End dielectric-fish  tests
 
-### Reference and test for glass view def ###
+### Octree for   glass ###
 
-test-glass-def:	ref/glass_def.hdr glass_def.hdr
-	$(RDU_PFILT) glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
+glass.oct:	glass.rif
+	rad -v 0   glass.rif
 
+### Reference and test for   glass view   def ###
+
+test-glass-def:	ref/glass_def.hdr   glass_def.hdr
+	$(RDU_PFILT)   glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
+
 ref/glass_def.hdr:
-	make glass_def.hdr
-	$(RDU_PFILT) glass_def.hdr > ref/glass_def.hdr
+	make   glass_def.hdr
+	$(RDU_PFILT)   glass_def.hdr > ref/glass_def.hdr
 
-glass_def.hdr:	glass.rif
-	rad -v def glass.rif
+glass_def.hdr:	glass.oct
+	rad -v   def   glass.rif
 
-### End glass-def tests
+### End   glass-def   tests
 
-### Reference and test for glass view fish ###
+### Reference and test for   glass view  fish ###
 
-test-glass-fish:	ref/glass_fish.hdr glass_fish.hdr
-	$(RDU_PFILT) glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
+test-glass-fish:	ref/glass_fish.hdr   glass_fish.hdr
+	$(RDU_PFILT)   glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
 
 ref/glass_fish.hdr:
-	make glass_fish.hdr
-	$(RDU_PFILT) glass_fish.hdr > ref/glass_fish.hdr
+	make   glass_fish.hdr
+	$(RDU_PFILT)   glass_fish.hdr > ref/glass_fish.hdr
 
-glass_fish.hdr:	glass.rif
-	rad -v fish glass.rif
+glass_fish.hdr:	glass.oct
+	rad -v  fish   glass.rif
 
-### End glass-fish tests
+### End   glass-fish  tests
 
-### Reference and test for glass view up ###
+### Reference and test for   glass view    up ###
 
-test-glass-up:	ref/glass_up.hdr glass_up.hdr
-	$(RDU_PFILT) glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
+test-glass-up:	ref/glass_up.hdr   glass_up.hdr
+	$(RDU_PFILT)   glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
 
 ref/glass_up.hdr:
-	make glass_up.hdr
-	$(RDU_PFILT) glass_up.hdr > ref/glass_up.hdr
+	make   glass_up.hdr
+	$(RDU_PFILT)   glass_up.hdr > ref/glass_up.hdr
 
-glass_up.hdr:	glass.rif
-	rad -v up glass.rif
+glass_up.hdr:	glass.oct
+	rad -v    up   glass.rif
 
-### End glass-up tests
+### End   glass-up    tests
 
-### Reference and test for inst view def ###
+### Octree for    inst ###
 
-test-inst-def:	ref/inst_def.hdr inst_def.hdr
-	$(RDU_PFILT) inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
+inst.oct:	inst.rif
+	rad -v 0    inst.rif
 
+### Reference and test for    inst view   def ###
+
+test-inst-def:	ref/inst_def.hdr    inst_def.hdr
+	$(RDU_PFILT)    inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
+
 ref/inst_def.hdr:
-	make inst_def.hdr
-	$(RDU_PFILT) inst_def.hdr > ref/inst_def.hdr
+	make    inst_def.hdr
+	$(RDU_PFILT)    inst_def.hdr > ref/inst_def.hdr
 
-inst_def.hdr:	inst.rif
-	rad -v def inst.rif
+inst_def.hdr:	inst.oct
+	rad -v   def    inst.rif
 
-### End inst-def tests
+### End    inst-def   tests
 
-### Reference and test for inst view fish ###
+### Reference and test for    inst view  fish ###
 
-test-inst-fish:	ref/inst_fish.hdr inst_fish.hdr
-	$(RDU_PFILT) inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
+test-inst-fish:	ref/inst_fish.hdr    inst_fish.hdr
+	$(RDU_PFILT)    inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
 
 ref/inst_fish.hdr:
-	make inst_fish.hdr
-	$(RDU_PFILT) inst_fish.hdr > ref/inst_fish.hdr
+	make    inst_fish.hdr
+	$(RDU_PFILT)    inst_fish.hdr > ref/inst_fish.hdr
 
-inst_fish.hdr:	inst.rif
-	rad -v fish inst.rif
+inst_fish.hdr:	inst.oct
+	rad -v  fish    inst.rif
 
-### End inst-fish tests
+### End    inst-fish  tests
 
-### Reference and test for mesh view def ###
+### Octree for    mesh ###
 
-test-mesh-def:	ref/mesh_def.hdr mesh_def.hdr
-	$(RDU_PFILT) mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
+mesh.oct:	mesh.rif
+	rad -v 0    mesh.rif
 
+### Reference and test for    mesh view   def ###
+
+test-mesh-def:	ref/mesh_def.hdr    mesh_def.hdr
+	$(RDU_PFILT)    mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
+
 ref/mesh_def.hdr:
-	make mesh_def.hdr
-	$(RDU_PFILT) mesh_def.hdr > ref/mesh_def.hdr
+	make    mesh_def.hdr
+	$(RDU_PFILT)    mesh_def.hdr > ref/mesh_def.hdr
 
-mesh_def.hdr:	mesh.rif
-	rad -v def mesh.rif
+mesh_def.hdr:	mesh.oct
+	rad -v   def    mesh.rif
 
-### End mesh-def tests
+### End    mesh-def   tests
 
-### Reference and test for mesh view cyl ###
+### Reference and test for    mesh view   cyl ###
 
-test-mesh-cyl:	ref/mesh_cyl.hdr mesh_cyl.hdr
-	$(RDU_PFILT) mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
+test-mesh-cyl:	ref/mesh_cyl.hdr    mesh_cyl.hdr
+	$(RDU_PFILT)    mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
 
 ref/mesh_cyl.hdr:
-	make mesh_cyl.hdr
-	$(RDU_PFILT) mesh_cyl.hdr > ref/mesh_cyl.hdr
+	make    mesh_cyl.hdr
+	$(RDU_PFILT)    mesh_cyl.hdr > ref/mesh_cyl.hdr
 
-mesh_cyl.hdr:	mesh.rif
-	rad -v cyl mesh.rif
+mesh_cyl.hdr:	mesh.oct
+	rad -v   cyl    mesh.rif
 
-### End mesh-cyl tests
+### End    mesh-cyl   tests
 
-### Reference and test for mesh view cyl2 ###
+### Reference and test for    mesh view  cyl2 ###
 
-test-mesh-cyl2:	ref/mesh_cyl2.hdr mesh_cyl2.hdr
-	$(RDU_PFILT) mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
+test-mesh-cyl2:	ref/mesh_cyl2.hdr    mesh_cyl2.hdr
+	$(RDU_PFILT)    mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
 
 ref/mesh_cyl2.hdr:
-	make mesh_cyl2.hdr
-	$(RDU_PFILT) mesh_cyl2.hdr > ref/mesh_cyl2.hdr
+	make    mesh_cyl2.hdr
+	$(RDU_PFILT)    mesh_cyl2.hdr > ref/mesh_cyl2.hdr
 
-mesh_cyl2.hdr:	mesh.rif
-	rad -v cyl2 mesh.rif
+mesh_cyl2.hdr:	mesh.oct
+	rad -v  cyl2    mesh.rif
 
-### End mesh-cyl2 tests
+### End    mesh-cyl2  tests
 
-### Reference and test for mirror view fish ###
+### Octree for  mirror ###
 
-test-mirror-fish:	ref/mirror_fish.hdr mirror_fish.hdr
-	$(RDU_PFILT) mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
+mirror.oct:	mirror.rif
+	rad -v 0  mirror.rif
 
+### Reference and test for  mirror view  fish ###
+
+test-mirror-fish:	ref/mirror_fish.hdr  mirror_fish.hdr
+	$(RDU_PFILT)  mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
+
 ref/mirror_fish.hdr:
-	make mirror_fish.hdr
-	$(RDU_PFILT) mirror_fish.hdr > ref/mirror_fish.hdr
+	make  mirror_fish.hdr
+	$(RDU_PFILT)  mirror_fish.hdr > ref/mirror_fish.hdr
 
-mirror_fish.hdr:	mirror.rif
-	rad -v fish mirror.rif
+mirror_fish.hdr:	mirror.oct
+	rad -v  fish  mirror.rif
 
-### End mirror-fish tests
+### End  mirror-fish  tests
 
-### Reference and test for mist view def ###
+### Octree for    mist ###
 
-test-mist-def:	ref/mist_def.hdr mist_def.hdr
-	$(RDU_PFILT) mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
+mist.oct:	mist.rif
+	rad -v 0    mist.rif
 
+### Reference and test for    mist view   def ###
+
+test-mist-def:	ref/mist_def.hdr    mist_def.hdr
+	$(RDU_PFILT)    mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
+
 ref/mist_def.hdr:
-	make mist_def.hdr
-	$(RDU_PFILT) mist_def.hdr > ref/mist_def.hdr
+	make    mist_def.hdr
+	$(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
 
-mist_def.hdr:	mist.rif
-	rad -v def mist.rif
+mist_def.hdr:	mist.oct
+	rad -v   def    mist.rif
 
-### End mist-def tests
+### End    mist-def   tests
 
-### Reference and test for prism1 view fish ###
+### Octree for  prism1 ###
 
-test-prism1-fish:	ref/prism1_fish.hdr prism1_fish.hdr
-	$(RDU_PFILT) prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
+prism1.oct:	prism1.rif
+	rad -v 0  prism1.rif
 
+### Reference and test for  prism1 view  fish ###
+
+test-prism1-fish:	ref/prism1_fish.hdr  prism1_fish.hdr
+	$(RDU_PFILT)  prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
+
 ref/prism1_fish.hdr:
-	make prism1_fish.hdr
-	$(RDU_PFILT) prism1_fish.hdr > ref/prism1_fish.hdr
+	make  prism1_fish.hdr
+	$(RDU_PFILT)  prism1_fish.hdr > ref/prism1_fish.hdr
 
-prism1_fish.hdr:	prism1.rif
-	rad -v fish prism1.rif
+prism1_fish.hdr:	prism1.oct
+	rad -v  fish  prism1.rif
 
-### End prism1-fish tests
+### End  prism1-fish  tests
 
-### Reference and test for prism2 view fish ###
+### Octree for  prism2 ###
 
-test-prism2-fish:	ref/prism2_fish.hdr prism2_fish.hdr
-	$(RDU_PFILT) prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
+prism2.oct:	prism2.rif
+	rad -v 0  prism2.rif
 
+### Reference and test for  prism2 view  fish ###
+
+test-prism2-fish:	ref/prism2_fish.hdr  prism2_fish.hdr
+	$(RDU_PFILT)  prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
+
 ref/prism2_fish.hdr:
-	make prism2_fish.hdr
-	$(RDU_PFILT) prism2_fish.hdr > ref/prism2_fish.hdr
+	make  prism2_fish.hdr
+	$(RDU_PFILT)  prism2_fish.hdr > ref/prism2_fish.hdr
 
-prism2_fish.hdr:	prism2.rif
-	rad -v fish prism2.rif
+prism2_fish.hdr:	prism2.oct
+	rad -v  fish  prism2.rif
 
-### End prism2-fish tests
+### End  prism2-fish  tests
 
-### Reference and test for tfunc view def ###
+### Octree for   tfunc ###
 
-test-tfunc-def:	ref/tfunc_def.hdr tfunc_def.hdr
-	$(RDU_PFILT) tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
+tfunc.oct:	tfunc.rif
+	rad -v 0   tfunc.rif
 
+### Reference and test for   tfunc view   def ###
+
+test-tfunc-def:	ref/tfunc_def.hdr   tfunc_def.hdr
+	$(RDU_PFILT)   tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
+
 ref/tfunc_def.hdr:
-	make tfunc_def.hdr
-	$(RDU_PFILT) tfunc_def.hdr > ref/tfunc_def.hdr
+	make   tfunc_def.hdr
+	$(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
 
-tfunc_def.hdr:	tfunc.rif
-	rad -v def tfunc.rif
+tfunc_def.hdr:	tfunc.oct
+	rad -v   def   tfunc.rif
 
-### End tfunc-def tests
+### End   tfunc-def   tests
 
-### Reference and test for tfunc view fish ###
+### Reference and test for   tfunc view  fish ###
 
-test-tfunc-fish:	ref/tfunc_fish.hdr tfunc_fish.hdr
-	$(RDU_PFILT) tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
+test-tfunc-fish:	ref/tfunc_fish.hdr   tfunc_fish.hdr
+	$(RDU_PFILT)   tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
 
 ref/tfunc_fish.hdr:
-	make tfunc_fish.hdr
-	$(RDU_PFILT) tfunc_fish.hdr > ref/tfunc_fish.hdr
+	make   tfunc_fish.hdr
+	$(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
 
-tfunc_fish.hdr:	tfunc.rif
-	rad -v fish tfunc.rif
+tfunc_fish.hdr:	tfunc.oct
+	rad -v  fish   tfunc.rif
 
-### End tfunc-fish tests
+### End   tfunc-fish  tests
 
-### Reference and test for trans view def ###
+### Octree for   trans ###
 
-test-trans-def:	ref/trans_def.hdr trans_def.hdr
-	$(RDU_PFILT) trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
+trans.oct:	trans.rif
+	rad -v 0   trans.rif
 
+### Reference and test for   trans view   def ###
+
+test-trans-def:	ref/trans_def.hdr   trans_def.hdr
+	$(RDU_PFILT)   trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
+
 ref/trans_def.hdr:
-	make trans_def.hdr
-	$(RDU_PFILT) trans_def.hdr > ref/trans_def.hdr
+	make   trans_def.hdr
+	$(RDU_PFILT)   trans_def.hdr > ref/trans_def.hdr
 
-trans_def.hdr:	trans.rif
-	rad -v def trans.rif
+trans_def.hdr:	trans.oct
+	rad -v   def   trans.rif
 
-### End trans-def tests
+### End   trans-def   tests
 
-### Reference and test for trans view fish ###
+### Reference and test for   trans view  fish ###
 
-test-trans-fish:	ref/trans_fish.hdr trans_fish.hdr
-	$(RDU_PFILT) trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
+test-trans-fish:	ref/trans_fish.hdr   trans_fish.hdr
+	$(RDU_PFILT)   trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
 
 ref/trans_fish.hdr:
-	make trans_fish.hdr
-	$(RDU_PFILT) trans_fish.hdr > ref/trans_fish.hdr
+	make   trans_fish.hdr
+	$(RDU_PFILT)   trans_fish.hdr > ref/trans_fish.hdr
 
-trans_fish.hdr:	trans.rif
-	rad -v fish trans.rif
+trans_fish.hdr:	trans.oct
+	rad -v  fish   trans.rif
 
-### End trans-fish tests
+### End   trans-fish  tests
 
-### Reference and test for trans2 view def ###
+### Octree for  trans2 ###
 
-test-trans2-def:	ref/trans2_def.hdr trans2_def.hdr
-	$(RDU_PFILT) trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
+trans2.oct:	trans2.rif
+	rad -v 0  trans2.rif
 
+### Reference and test for  trans2 view   def ###
+
+test-trans2-def:	ref/trans2_def.hdr  trans2_def.hdr
+	$(RDU_PFILT)  trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
+
 ref/trans2_def.hdr:
-	make trans2_def.hdr
-	$(RDU_PFILT) trans2_def.hdr > ref/trans2_def.hdr
+	make  trans2_def.hdr
+	$(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
 
-trans2_def.hdr:	trans2.rif
-	rad -v def trans2.rif
+trans2_def.hdr:	trans2.oct
+	rad -v   def  trans2.rif
 
-### End trans2-def tests
+### End  trans2-def   tests
 
-### Reference and test for trans2 view fish ###
+### Reference and test for  trans2 view  fish ###
 
-test-trans2-fish:	ref/trans2_fish.hdr trans2_fish.hdr
-	$(RDU_PFILT) trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
+test-trans2-fish:	ref/trans2_fish.hdr  trans2_fish.hdr
+	$(RDU_PFILT)  trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
 
 ref/trans2_fish.hdr:
-	make trans2_fish.hdr
-	$(RDU_PFILT) trans2_fish.hdr > ref/trans2_fish.hdr
+	make  trans2_fish.hdr
+	$(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
 
-trans2_fish.hdr:	trans2.rif
-	rad -v fish trans2.rif
+trans2_fish.hdr:	trans2.oct
+	rad -v  fish  trans2.rif
 
-### End trans2-fish tests
+### End  trans2-fish  tests
 
-### Reference and test for trans2 view win ###
+### Reference and test for  trans2 view   win ###
 
-test-trans2-win:	ref/trans2_win.hdr trans2_win.hdr
-	$(RDU_PFILT) trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
+test-trans2-win:	ref/trans2_win.hdr  trans2_win.hdr
+	$(RDU_PFILT)  trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
 
 ref/trans2_win.hdr:
-	make trans2_win.hdr
-	$(RDU_PFILT) trans2_win.hdr > ref/trans2_win.hdr
+	make  trans2_win.hdr
+	$(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
 
-trans2_win.hdr:	trans2.rif
-	rad -v win trans2.rif
+trans2_win.hdr:	trans2.oct
+	rad -v   win  trans2.rif
 
-### End trans2-win tests
+### End  trans2-win   tests