--- ray/src/rt/Rmakefile	2021/01/19 23:31:47	2.87
+++ ray/src/rt/Rmakefile	2025/05/29 18:13:22	2.102
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.87 2021/01/19 23:31:47 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.102 2025/05/29 18:13:22 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -6,8 +6,10 @@
 OPT = -O
 MACH = -DBSD
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CXXFLAGS = $(CFLAGS) -std=c++11
 SPECIAL = 
 CC = cc
+CXX = c++
 AR = ar
 MLIB = -lm
 LINT = lint
@@ -32,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):
@@ -58,6 +61,20 @@ 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
 
+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
+
+RXCOBJS = rxcmain.o RcontribSimulManager.o RtraceSimulManager.o \
+RdataShareFile.o RdataShareMap.o
+RXCSRC = rxcmain.cpp RcontribSimulManager.cpp RtraceSimulManager.cpp \
+RdataShareFile.cpp RdataShareMap.cpp
+
+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
 
@@ -78,16 +95,16 @@ SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsa
 
 MATOBJS = aniso.o normal.o dielectric.o m_clip.o glass.o m_brdf.o \
 	m_mirror.o m_direct.o m_mist.o fprism.o m_alias.o m_bsdf.o \
-	ashikhmin.o
+	m_wgmdf.o ashikhmin.o
 MATSRC = aniso.c normal.c dielectric.c m_clip.c glass.c m_brdf.c \
 	m_mirror.c m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c \
-	ashikhmin.c
+	m_wgmdf.c ashikhmin.c
 
 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 \
@@ -98,7 +115,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:
@@ -139,6 +156,22 @@ $(RLIB) $(LIBS) $(DLIBS)
 $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(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)/rxcontrib:	$(RXCOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxcontrib $(RXCOBJS) $(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)
 
@@ -181,13 +214,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
@@ -200,13 +233,14 @@ rtrace.o rvmain.o rv2.o rv3.o:	../common/octree.h
 o_instance.o:	../common/instance.h
 
 ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o glass.o \
-initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o normal.o o_cone.o \
-preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
-srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
+initotypes.o m_brdf.o m_bsdf.o m_wgmdf.o m_direct.o m_mirror.o normal.o \
+o_cone.o preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
+m_wgmdf.o srcsupp.o text.o srcdraw.o srcobstr.o \
+virtuals.o:	../common/otypes.h
 
-ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
-rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
-srcsamp.o virtuals.o:	../common/random.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 rxpiece.o persist.o source.o rv3.o \
+srcsamp.o virtuals.o m_wgmdf.o:	../common/random.h
 
 ambcomp.o ambient.o aniso.o ashikhmin.o dielectric.o freeobjmem.o func.o \
 glass.o m_bsdf.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o \
@@ -214,18 +248,20 @@ 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 rxcmain.o m_wgmdf.o \
+RcontribSimulManager.o RpictSimulManager.o RtraceSimulManager.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
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h ../common/resolu.h
 
-m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
+m_direct.o m_mirror.o m_mist.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
@@ -233,7 +269,7 @@ duphead.o octree.o:	../common/standard.h ../common/rtm
 ambio.o:	../common/fvect.h
 
 ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
-pmapooc.o pmapsrc.o pmcontrib2.o \
+pmapooc.o pmapsrc.o pmcontrib2.o m_mirror.o \
 raytrace.o rtrace.o rv2.o rv3.o source.o \
 srcdraw.o srcobstr.o virtuals.o:	otspecial.h
 
@@ -248,13 +284,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
 
@@ -273,8 +309,12 @@ aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o 
 m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
 mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
 o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
-srcobstr.o text.o:		rtotypes.h
+m_wgmdf.o srcobstr.o text.o:		rtotypes.h
 
+aniso.o ashikhmin.o dielectric.o glass.o m_brdf.o \
+m_direct.o m_mirror.o m_mist.o normal.o m_wgmdf.o \
+srcobstr.o:	source.h
+
 m_bsdf.o:	ambient.h source.h func.h \
 ../common/calcomp.h ../common/bsdf.h ../common/random.h
 
@@ -284,9 +324,11 @@ func.h ../common/calcomp.h ../common/rtprocess.h
 
 ambient.o rcmain.o:	ambient.h
 
-rcmain.o:	source.h
+rcmain.o rpmain.o rtmain.o rvmain.o rtrace.o \
+rcontrib.o source.o srcdraw.o srcobstr.o \
+srcsamp.o srcsupp.o virtuals.o:	source.h
 
-rcontrib.o:	source.h ../common/otypes.h
+rcontrib.o:	../common/otypes.h
 
 rc2.o:	../common/resolu.h
 
@@ -297,8 +339,9 @@ rc3.o:	../common/selcall.h
 #
 ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
 
-dielectric.o glass.o normal.o m_brdf.o m_bsdf.o ashikhmin.o aniso.o: \
-   pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h
+dielectric.o glass.o normal.o m_brdf.o m_bsdf.o \
+m_wgmdf.o ashikhmin.o aniso.o:	pmapparm.h pmaptype.h \
+pmapmat.h pmap.h pmapdata.h
    
 raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
    pmapparm.h pmaptype.h pmapray.h
@@ -381,8 +424,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
@@ -431,3 +474,25 @@ oocsort.o: oocsort.c oocsort.h ../common/fvect.h
 oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
 
 oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
+
+rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \
+RcontribSimulManager.o RpictSimulManager.o \
+RtraceSimulManager.o:	RtraceSimulManager.h \
+../common/abitmap.h
+
+RpictSimulManager.o rxpiece.o rxpmain.o:	RpictSimulManager.h \
+../common/view.h ../common/depthcodec.h ../common/abitmap.h
+
+rxcmain.o RcontribSimulManager.o:	RcontribSimulManager.h RdataShare.h \
+../common/lookup.h ../common/rtprocess.h
+
+RdataShareFile.o RdataShareMap.o:	RdataShare.h \
+../common/rtio.h ../common/rterror.h
+
+RcontribSimulManager.o:	source.h func.h \
+../common/selcall.h ../common/calcomp.h \
+../common/resolu.h ../common/platform.h
+
+rxcmain.o:	func.h ../common/calcomp.h ../common/platform.h
+
+RpictSimulManager.o:	../common/random.h