--- ray/src/rt/Rmakefile	2015/08/21 01:57:56	2.75
+++ ray/src/rt/Rmakefile	2023/11/15 18:02:52	2.92
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.75 2015/08/21 01:57:56 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.92 2023/11/15 18:02:52 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -6,8 +6,11 @@
 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
 LINTFLAGS = -DBSD
@@ -57,13 +60,16 @@ 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
+
 RLOBJS = raycalls.o raypcalls.o rayfifo.o
 RLSRC = raycalls.c raypcalls.c rayfifo.c
 
 ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
 	$(MODOBJS) $(SUPPOBJS) $(PMOBJS)
 RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
-	$(MODSRC) $(SUPPSRC) $(PMSRC)
+	$(MODSRC) $(SUPPSRC)
 
 RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
 	preload.o raytrace.o renderopts.o
@@ -90,10 +96,12 @@ SUPPSRC = func.c noise3.c data.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 \
-         pmapdiag.o pmaptype.o
+         pmapdiag.o pmaptype.o oocmorton.o oococt.o oocsort.o oocbuild.o \
+         oocnn.o ooccache.o pmutil.o pmcontrib2.o
 PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
         pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c \
-        pmapdiag.c pmaptype.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
 
@@ -108,8 +116,6 @@ all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
 install:	all rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
-	cd $(INSTDIR) ; rm -f rview ; ln -s rvu rview
-	cd $(INSTDIR) ; rm -f rtcontrib ; ln -s rcontrib rtcontrib
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
@@ -138,6 +144,10 @@ $(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)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
@@ -149,12 +159,12 @@ $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
 
 $(RLIB):	$(ROBJS) Version.o
 	rm -f $(RLIB)
-	ar rc $(RLIB) $(ROBJS) Version.o
+	$(AR) rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
 
 $(RCLIB):	$(RLOBJS)
 	rm -f $(RCLIB)
-	ar rc $(RCLIB) $(RLOBJS)
+	$(AR) rc $(RCLIB) $(RLOBJS)
 	-ranlib $(RCLIB)
 
 #
@@ -174,7 +184,7 @@ devcomm.o:	devcomm.c
 
 Version.c:	VERSION $(RSRC) $(HEADERS)
 	( cat VERSION ; date ; whoami ; hostname ) > Version.c
-	ed - Version.c < verscript.ed
+	ed - Version.c < verscript.ed || rm Version.c
 
 #
 # Include dependencies:
@@ -199,9 +209,9 @@ 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_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_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
 
 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 \
@@ -221,7 +231,7 @@ rcontrib.o rc2.o rc3.o:	ray.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 \
-rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.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 \
@@ -231,7 +241,10 @@ duphead.o octree.o:	../common/standard.h ../common/rtm
 
 ambio.o:	../common/fvect.h
 
-initotypes.o srcobstr.o raytrace.o:	otspecial.h
+ambient.o initotypes.o m_alias.o pmapcontrib.o pmapkdt.o \
+pmapooc.o pmapsrc.o pmcontrib2.o \
+raytrace.o rtrace.o rv2.o rv3.o source.o \
+srcdraw.o srcobstr.o virtuals.o:	otspecial.h
 
 rpmain.o rtmain.o rvmain.o rpict.o \
 srcdraw.o:	../common/view.h ../common/resolu.h
@@ -278,8 +291,10 @@ rcmain.o rcontrib.o rc2.o rc3.o:	rcontrib.h \
 ../common/platform.h ../common/paths.h ../common/lookup.h \
 func.h ../common/calcomp.h ../common/rtprocess.h
 
-rcmain.o:	source.h ambient.h
+ambient.o rcmain.o:	ambient.h
 
+rcmain.o:	source.h
+
 rcontrib.o:	source.h ../common/otypes.h
 
 rc2.o:	../common/resolu.h
@@ -289,11 +304,9 @@ rc3.o:	../common/selcall.h
 #
 # Photon map include dependencies (via 'gcc -MM -I../common')
 #
-
-
 ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h
 
-dielectric.o glass.o normal.o: \
+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
    
 raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
@@ -326,29 +339,30 @@ pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h
  ../common/standard.h ../common/copyright.h ../common/rtio.h \
  ../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 pmapmat.h \
- pmapsrc.h source.h pmaprand.h pmapio.h pmapbias.h pmapdiag.h \
- ../common/platform.h ../common/otypes.h
+ ../common/object.h ../common/color.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapsrc.h source.h pmaprand.h \
+ pmapio.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h
 
 pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
  ../common/standard.h ../common/copyright.h ../common/rtio.h \
  ../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 pmapparm.h pmaptype.h \
- ../common/lookup.h pmap.h pmapmat.h pmapsrc.h source.h pmaprand.h \
- pmapio.h pmapdiag.h ../common/platform.h rcontrib.h ../common/paths.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmap.h \
+ pmapsrc.h source.h pmaprand.h pmapio.h pmapdiag.h ../common/platform.h \
+ rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
+ ../common/calcomp.h ../common/otypes.h
+
+pmapdata.o: pmapdata.c pmapdata.h ray.h ../common/standard.h \
+ ../common/copyright.h ../common/rtio.h ../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 pmapparm.h pmaptype.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmaprand.h pmapmat.h pmap.h \
+ ../common/otypes.h source.h rcontrib.h ../common/platform.h \
  ../common/rtprocess.h ../common/paths.h func.h ../common/calcomp.h \
- ../common/otypes.h
+ ../common/random.h pmapkdt.c pmapooc.c
 
-pmapdata.o: pmapdata.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
- ../common/standard.h ../common/copyright.h ../common/rtio.h \
- ../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 \
- pmapmat.h ../common/otypes.h source.h rcontrib.h ../common/platform.h \
- ../common/paths.h ../common/rtprocess.h ../common/paths.h func.h \
- ../common/calcomp.h
-
 pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
  ../common/standard.h ../common/copyright.h ../common/rtio.h \
  ../common/rtmisc.h ../common/rtmath.h ../common/tiff.h ../common/mat4.h \
@@ -367,8 +381,9 @@ pmapio.o: pmapio.c pmapio.h pmapdata.h ray.h ../common
  ../common/copyright.h ../common/rtio.h ../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 pmapparm.h pmaptype.h ../common/lookup.h pmapdiag.h \
- ../common/platform.h ../common/resolu.h
+ ../common/color.h pmapparm.h pmaptype.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapdiag.h ../common/platform.h \
+ ../common/resolu.h
 
 pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.h pmapdata.h \
  ray.h ../common/standard.h ../common/copyright.h ../common/rtio.h \
@@ -385,7 +400,8 @@ pmapparm.o: pmapparm.c pmapparm.h pmaptype.h pmapdata.
  ../common/standard.h ../common/copyright.h ../common/rtio.h \
  ../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
+ ../common/object.h ../common/color.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h
 
 pmapray.o: pmapray.c pmapray.h ray.h ../common/standard.h \
  ../common/copyright.h ../common/rtio.h ../common/rtmisc.h \
@@ -401,5 +417,28 @@ pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standar
  ../common/color.h pmapparm.h pmaptype.h source.h pmap.h pmapdata.h \
  ../common/lookup.h pmaprand.h ../common/otypes.h
 
+pmutil.o:	pmap.h pmapio.h pmapdata.h pmapparm.h pmaptype.h pmapbias.h \
+  ../common/otypes.h
+
 pmaptype.o: pmaptype.c pmaptype.h
 
+mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
+ ../common/standard.h ../common/copyright.h ../common/rtio.h \
+ ../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/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapmat.h pmapcontrib.h pmaprand.h \
+ ambient.h ../common/resolu.h source.h
+      
+oococt.o: oococt.c oococt.h oocsort.h ooccache.h \
+ ../common/rtio.h ../common/fvect.h
+
+ooccache.o: ooccache.c ooccache.h
+
+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
+
+RtraceSimulManager.o rxtrace.o:	RtraceSimulManager.h