--- ray/src/rt/Rmakefile	2023/11/17 20:02:07	2.93
+++ ray/src/rt/Rmakefile	2024/09/16 23:49:12	2.96
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.93 2023/11/17 20:02:07 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.96 2024/09/16 23:49:12 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -34,6 +34,7 @@ LIBDIR = /usr/local/lib/ray
 RLIB = ../lib/libradiance.a
 RCLIB = ../lib/libraycalls.a
 LIBS = -lrtrad $(MLIB)
+CXXLIBS = -lcpprad $(LIBS)
 
 #
 # Device drivers for rvu (see also devtable.c):
@@ -60,9 +61,15 @@ RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
 RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
 RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
 
-RATOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
-RATSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
+RXTOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
+RXTSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
 
+RXPOBJS = rxpmain.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
+RXPSRC = rxpmain.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
+
+RXPCOBJS = rxpiece.o RpictSimulManager.o RtraceSimulManager.o srcdraw.o
+RXPCSRC = rxpiece.cpp RpictSimulManager.cpp RtraceSimulManager.cpp srcdraw.c
+
 RLOBJS = raycalls.o raypcalls.o rayfifo.o
 RLSRC = raycalls.c raypcalls.c rayfifo.c
 
@@ -91,8 +98,8 @@ MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.
 MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
 MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
 
-SUPPOBJS = func.o noise3.o data.o
-SUPPSRC = func.c noise3.c data.c
+SUPPOBJS = func.o noise3.o
+SUPPSRC = func.c noise3.c
 
 PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
          pmapbias.o pmapparm.o pmapcontrib.o pmapamb.o pmapray.o pmapopt.o \
@@ -103,7 +110,7 @@ PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c
         pmapdiag.c pmaptype.c pmapkdt.c pmapooc.c oocmorton.c oococt.c \
         oocsort.c oocbuild.c oocnn.c ooccache.c pmutil.c pmcontrib2.c
 
-HEADERS = ambient.h ray.h data.h otspecial.h source.h
+HEADERS = ambient.h ray.h otspecial.h source.h
 
 #
 # What this makefile produces:
@@ -144,10 +151,18 @@ $(RLIB) $(LIBS) $(DLIBS)
 $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
 
-$(DESTDIR)/rxtrace:	$(RATOBJS) $(RCLIB) $(RLIB)
-	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
-$(RLIB) $(LIBS)
+$(DESTDIR)/rxtrace:	$(RXTOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RXTOBJS) $(RCLIB) \
+$(RLIB) $(CXXLIBS)
 
+$(DESTDIR)/rxpict:	$(RXPOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpict $(RXPOBJS) $(RCLIB) \
+$(RLIB) $(CXXLIBS)
+
+$(DESTDIR)/rxpiece:	$(RXPCOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxpiece $(RXPCOBJS) $(RCLIB) \
+$(RLIB) $(CXXLIBS)
+
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
@@ -190,13 +205,13 @@ Version.c:	VERSION $(RSRC) $(HEADERS)
 # Include dependencies:
 #
 
-ambio.o colortab.o data.o devcomm.o \
+ambio.o colortab.o devcomm.o \
 devmain.o lookamb.o rview.o x11.o:	../common/color.h
 
 freeobjmem.o o_cone.o srcsupp.o:	../common/cone.h
 
-data.o freeobjmem.o m_brdf.o mx_data.o \
-p_data.o raycalls.o t_data.o:	data.h
+freeobjmem.o m_brdf.o mx_data.o \
+p_data.o raycalls.o t_data.o:	../common/data.h
 
 devcomm.o devmain.o devtable.o \
 editline.o x11.o:	driver.h
@@ -214,7 +229,7 @@ preload.o raycalls.o raytrace.o rtrace.o rv2.o source.
 srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
 
 ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
-rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
+rpict.o rvmain.o rtmain.o rpmain.o rcmain.o rxpiece.o persist.o source.o rv3.o \
 srcsamp.o virtuals.o:	../common/random.h
 
 ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
@@ -223,7 +238,8 @@ o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instan
 raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
 source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
 text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o rcmain.o \
-rcontrib.o rc2.o rc3.o:	ray.h \
+rcontrib.o rc2.o rc3.o RtraceSimulManager.o RpictSimulManager.o \
+rxtrace.o rxtmain.o rxpiece.o rxpmain.o:	ray.h \
 ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
 ../common/rterror.h ../common/octree.h \
 ../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
@@ -234,7 +250,7 @@ m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o
 rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
 srcobstr.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
-cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
+cone.o devcomm.o initotypes.o fprism.o preload.o \
 duphead.o octree.o:	../common/standard.h ../common/rtmisc.h \
 ../common/rtio.h ../common/rtmath.h \
 ../common/rterror.h ../common/mat4.h ../common/fvect.h
@@ -257,13 +273,13 @@ x11.o:	x11icon.h
 
 ambient.o ambcomp.o ambio.o lookamb.o raycalls.o:	ambient.h
 
-data.o rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
+rpmain.o rtmain.o rvmain.o rpict.o rtrace.o \
 rv2.o:	../common/resolu.h
 
 aniso.o func.o m_brdf.o m_direct.o mx_data.o mx_func.o p_data.o \
 p_func.o t_data.o t_func.o:	func.h ../common/calcomp.h
 
-preload.o:	data.h func.h ../common/object.h ../common/face.h \
+preload.o:	func.h ../common/data.h ../common/object.h ../common/face.h \
 ../common/cone.h ../common/instance.h ../common/mesh.h \
 ../common/color.h ../common/bsdf.h ../common/otypes.h
 
@@ -390,8 +406,8 @@ pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmapt
  ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
  ../common/fvect.h ../common/rterror.h ../common/octree.h \
  ../common/object.h ../common/color.h ../common/lookup.h pmaprand.h \
- ../common/otypes.h data.h func.h ../common/calcomp.h ../common/bsdf.h \
- ../common/ccolor.h
+ ../common/otypes.h ../common/data.h func.h ../common/calcomp.h \
+ ../common/bsdf.h ../common/ccolor.h
 
 pmapopt.o: pmapopt.c pmapparm.h pmaptype.h ../common/rtio.h \
  ../common/rterror.h
@@ -441,4 +457,10 @@ oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
 
 oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
 
-RtraceSimulManager.o rxtrace.o:	RtraceSimulManager.h
+RtraceSimulManager.o rxpiece.o rxpmain.o \
+rxtmain.o rxtrace.o:	RtraceSimulManager.h
+
+RpictSimulManager.o rxpiece.o rxpmain.o:	RpictSimulManager.h \
+../common/view.h ../common/depthcodec.h ../common/abitmap.h
+
+RpictSimulManager.o:	../common/random.h