--- ray/test/renders/combined_scene.rad	2018/11/21 17:34:17	1.4
+++ ray/test/renders/combined_scene.rad	2022/04/26 00:23:39	1.11
@@ -1,20 +1,34 @@
-# RCSid $Id: combined_scene.rad,v 1.4 2018/11/21 17:34:17 greg Exp $
+# RCSid $Id: combined_scene.rad,v 1.11 2022/04/26 00:23:39 greg Exp $
 #
 # A collection of all our scene bits without the front caps
 #
 !xform basic.mat chrome.mat gold.mat sunset_sky.rad
-!xform -n dielectric -t 0 0 0 diorama_walls.rad rect_opening.rad vase.rad rect_fixture.rad dielectric_pane.rad
-!xform -n glass -t 0 5.1 0 diorama_walls.rad rect_opening.rad torus.rad glass_ill.rad 
-!xform -n inst -t 0 10.2 0 diorama_walls.rad closed_end.rad porsches.rad spotlights.rad rect_fixture.rad
-!xform -n mesh -t 0 15.3 0 diorama_walls.rad closed_end.rad rect_fixture.rad
-!xform -n mesh.plainclothes -s 1.5 -rx 90 -rz -80 -t 1 0 0 -a 9 -rz 40 -i 1 -t -5 2.5 0 -t 0 15.3 0 ./woman.rad
-!xform -m chrome -n mesh.shiny -s 1.5 -rx 90 -rz -105 -t 1 0 0 -rz 20 -a 9 -rz 40 -i 1 -t -5 2.5 0 -t 0 15.3 0 ./woman.rad
-!xform -n mirror -t 0 0 3.1 diorama_walls.rad closed_end.rad glass_pane.rad antimatter_portal.rad bubble_in_cube.rad mirror.rad
-!xform -n mist -t 0 5.1 3.1 diorama_walls.rad closed_end.rad ball_in_cube.rad mist.rad spotlights.rad spotcones.rad
-!xform -n prism1 -t 0 10.2 3.1 diorama_walls.rad rect_opening.rad prism1.rad
-!xform -m gold -n prism1 -t 0 10.2 3.1 ./vase.rad
-!xform -n prism2 -t 0 15.3 3.1 diorama_walls.rad rect_opening.rad prism2.rad
-!xform -m gold -n prism2 -t 0 15.3 3.1 ./vase.rad
-!xform -n tfunc -t 0 0 6.2 basic.mat diorama_walls.rad rect_opening.rad gymbal.rad illum_tfunc.rad
-!xform -n trans -t 0 5.1 6.2 diorama_walls.rad rect_opening.rad ballcompare.rad spotlights.rad rect_fixture.rad trans_pane.rad
-!xform -n trans2 -t 0 10.2 6.2 diorama_walls.rad rect_opening.rad gymbal.rad illum_trans2.rad
+!xform -n dielectric -t 0 0 0 diorama_walls.rad rect_opening.rad \
+	vase.rad rect_fixture.rad dielectric_pane.rad
+!xform -n glass -t 0 5.2 0 diorama_walls.rad rect_opening.rad \
+	torus.rad glass_ill.rad 
+!xform -n inst -t 0 10.4 0 diorama_walls.rad closed_end.rad \
+	porsches.rad spotlights.rad rect_fixture.rad glowbulb.rad
+!xform -n mesh -t 0 15.6 0 diorama_walls.rad closed_end.rad rect_fixture.rad
+!xform -n mesh.plainclothes -s 1.5 -rx 90 -rz -80 -t 1 0 0 \
+	-a 9 -rz 40 -i 1 -t -5 2.5 0 -t 0 15.6 0 ./woman.rad
+!xform -m chrome -n mesh.shiny -s 1.5 -rx 90 -rz -105 -t 1 0 0 \
+	-rz 20 -a 9 -rz 40 -i 1 -t -5 2.5 0 -t 0 15.6 0 ./woman.rad
+!xform -n mirror -t 0 0 3.2 diorama_walls.rad closed_end.rad \
+	glass_pane.rad antimatter_portal.rad bubble_in_cube.rad mirror.rad
+!xform -n mist -t 0 5.2 3.2 diorama_walls.rad closed_end.rad \
+	gymbal.rad mist.rad spotlights.rad spotcones.rad
+!xform -n prism1 -t 0 10.4 3.2 diorama_walls.rad rect_opening.rad prism1.rad
+!xform -m gold -n prism1 -t 0 10.2 3.2 ./vase.rad
+!xform -n prism2 -t 0 15.6 3.2 diorama_walls.rad rect_opening.rad prism2.rad
+!xform -m gold -n prism2 -t 0 15.3 3.2 ./vase.rad
+!xform -n tfunc -t 0 0 6.4 basic.mat diorama_walls.rad \
+	rect_opening.rad ball_in_cube.rad illum_tfunc.rad
+!xform -n trans -t 0 5.2 6.4 diorama_walls.rad rect_opening.rad \
+	ballcompare.rad spotlights.rad rect_fixture.rad trans_pane.rad
+!xform -n trans2 -t 0 10.4 6.4 diorama_walls.rad rect_opening.rad \
+	gymbal.rad illum_trans2.rad
+!xform -n patterns -t 0 15.6 6.4 patterns.mat diorama_walls.rad \
+	closed_end.rad disks.rad rect_fixture.rad
+!xform -n mixtex -t 0 0 9.6 mixtex.mat diorama_walls.rad \
+	glass_pane.rad blinds.rad rect_opening.rad disks.rad constellation.rad