diff --git a/Rmakefile b/Rmakefile
index 35846d2..d0754f5 100644
--- a/Rmakefile
+++ b/Rmakefile
@@ -1,562 +1,683 @@
 # RCSid: $Id: Rmakefile,v 2.87 2021/01/19 23:31:47 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
 
 OPT = -O
 MACH = -DBSD
 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
 SPECIAL = 
 CC = cc
 AR = ar
 MLIB = -lm
 LINT = lint
 LINTFLAGS = -DBSD
 
 #
 # The following are user-definable:
 #
 DESTDIR = .
 INSTDIR = /usr/local/bin
 INSTALL = cp
 
 #
 # The following paths must exist and be relative to root:
 #
 DEVDIR = $(INSTDIR)/dev
 LIBDIR = /usr/local/lib/ray
 
 #
 # Library routines:
 #
 RLIB = ../lib/libradiance.a
 RCLIB = ../lib/libraycalls.a
 LIBS = -lrtrad $(MLIB)
 
 #
 # Device drivers for rvu (see also devtable.c):
 #
 DOBJS = devtable.o devcomm.o editline.o x11.o x11twind.o \
 	colortab.o
 DSRC = devtable.c devcomm.c editline.c x11.c x11twind.c \
 	colortab.c
 DLIBS = -lX11
 
 #
 # Standard object files:
 #
 
 RTOBJS = rtmain.o rtrace.o duphead.o persist.o
 RTSRC = rtmain.c rtrace.c duphead.c persist.c
 
 RPOBJS = rpmain.o rpict.o srcdraw.o duphead.o persist.o
 RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
 
 RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
 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
 
 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)
 
 RAYOBJS = ambcomp.o ambient.o ambio.o freeobjmem.o initotypes.o \
 	preload.o raytrace.o renderopts.o
 RAYSRC = ambcomp.c ambient.c ambio.c freeobjmem.c initotypes.c \
 	preload.c raytrace.c renderopts.c
 
 SURFOBJS = source.o sphere.o srcobstr.o srcsupp.o srcsamp.o virtuals.o \
 	o_face.o o_cone.o o_instance.o o_mesh.o
 SURFSRC = sphere.c source.c srcobstr.c srcsupp.c srcsamp.c virtuals.c \
 	o_face.c srcsamp.c o_cone.c o_instance.c o_mesh.c
 
 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
 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
 
 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
 
 PMOBJS = pmap.o pmapsrc.o pmapmat.o pmaprand.o pmapio.o pmapdata.o \
 	pmapdens.o pmapbias.o pmapparm.o pmapamb.o pmapray.o \
 	pmapopt.o pmapdiag.o pmaptype.o morton.o oococt.o oocsort.o \
 	oocbuild.o oocnn.o ooccache.o pmutil.o pmaproi.o pmapfilt.o \
 	$(PMRCOBJS)
 
 PMSRC = pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c \
 	pmapdens.c pmapbias.c pmapparm.c pmapamb.c pmapray.c \
 	pmapopt.c pmapdiag.c pmaptype.c morton.c oococt.c oocsort.c \
 	oocbuild.c oocnn.c ooccache.c pmutil.c pmapfilt.c pmaproi.c \
 	pmapkdt.c pmaptkdt.c pmapooc.c $(PMRCSRC)
 
 PMRCOBJS = pmapcontrib.o pmcontrib2.o pmcontrib3.o pmcontrib4.o \
 	pmcontribsort.o pmcontribcache.o wavelet.o wavelet2.o wavelet3.o \
 	mrgbe.o 
    
 PMRCSRC = pmapcontrib.c pmcontrib2.c pmcontrib3.c pmcontrib4.c \
 	pmcontribsort.c pmcontribcache.c wavelet.c wavelet2.c wavelet3.c \
 	mrgbe.c
 
 HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
 #
 # What this makefile produces:
 #
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
 $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
 
 all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
 install:	all rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
 
 ogl:	
 
 clean:
 	set nonomatch; \
 	rm -f $(PROGS) mrgbe-test wavelet*-test pmapcontrib-test *.o
 
 lint:	$(RVSRC)
 	$(LINT) $(LINTFLAGS) -DRVIEW $(RVSRC) $(LIBS)
 	
 # Precomputed contrib pmap unit tests
 wavelet-test: wavelet.c wavelet.h
 	$(CC) $(CFLAGS) -DWAVELET_TEST_1D -DWAVELET_DBG \
 	-o wavelet-test -g wavelet.c $(MLIB)
 	
 wavelet2-test: wavelet2.c wavelet2.h mrgbe.c mrgbe.h
 	$(CC) $(CFLAGS) -DWAVELET_TEST_2D -DWAVELET_TEST_mRGBE -DWAVELET_DBG \
 	-o wavelet2-test -g wavelet2.c mrgbe.c $(MLIB)
 
 wavelet3-test: wavelet3.c wavelet2.c wavelet2.h mrgbe.c mrgbe.h
 	$(CC) $(CFLAGS) -DWAVELET_TEST_2DPAD -DWAVELET_TEST_mRGBE -DWAVELET_DBG \
 	-o wavelet3-test -g wavelet3.c wavelet2.c mrgbe.c $(MLIB)
 
 mrgbe-test: mrgbe.c mrgbe.h
 	$(CC) $(CFLAGS) -DmRGBE_TEST -o mrgbe-test -g mrgbe.c $(LIBS)
 
 pmapcontrib-test: pmapcontrib.c pmapcontrib.h
 	$(CC) $(CFLAGS) -DPMAP_CONTRIB -DPMAP_CONTRIB_TEST -o pmapcontrib-test \
 	-g pmapcontrib.c $(LIBS)
 
 #
 # Links:
 #
 
 $(DESTDIR)/rtrace:	$(RTOBJS) $(RCLIB) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
 
 $(DESTDIR)/rpict:	$(RPOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
 
 $(DESTDIR)/rvu:	$(RVOBJS) $(RCLIB) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
 $(RLIB) $(LIBS) $(DLIBS)
 
 $(DESTDIR)/rcontrib:	$(RCOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS) 
 
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
 	$(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
 
 $(DESTDIR)/mkpmap: mkpmap.o $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/mkpmap mkpmap.o $(RLIB) $(LIBS)
 
 $(DESTDIR)/pmapdump: pmapdump.o pmaptype.o pmapparm.o
 	$(CC) $(CFLAGS) -o pmapdump pmapdump.o pmaptype.o pmapparm.o $(RLIB) $(LIBS)
 
 $(RLIB):	$(ROBJS) Version.o
 	rm -f $(RLIB)
 	$(AR) rc $(RLIB) $(ROBJS) Version.o
 	-ranlib $(RLIB)
 
 $(RCLIB):	$(RLOBJS)
 	rm -f $(RCLIB)
 	$(AR) rc $(RCLIB) $(RLOBJS)
 	-ranlib $(RCLIB)
 
 #
 # Uncomment the following to model dispersion:
 #
 dielectric.o:	dielectric.c source.h
 	$(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
 
 # end of dispersion compiles.
 
 devcomm.o:	devcomm.c
 	$(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
 
 #
 # Version module:
 #
 
 Version.c:	VERSION $(RSRC) $(HEADERS)
 	( cat VERSION ; date ; whoami ; hostname ) > Version.c
 	ed - Version.c < verscript.ed || rm Version.c
 
 #
 # Include dependencies:
 #
 
 ambio.o colortab.o data.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
 
 devcomm.o devmain.o devtable.o \
 editline.o x11.o:	driver.h
 
 freeobjmem.o o_face.o srcsupp.o:	../common/face.h
 
 ambient.o raytrace.o rpmain.o rtmain.o \
 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
 
 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
 
 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 \
 o_mesh.o mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
 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 \
 ../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 \
 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 \
 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
 
 ambio.o:	../common/fvect.h
 
 ambient.o initotypes.o m_alias.o pmapcontrib.o pmapdata.o pmapsrc.o \
 pmcontrib4.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
 
 rpict.o:	../common/hilbert.h
 
 x11.o x11twind.o: x11twind.h
 
 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 \
 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 \
 ../common/cone.h ../common/instance.h ../common/mesh.h \
 ../common/color.h ../common/bsdf.h ../common/otypes.h
 
 rtmain.o rpmain.o rvmain.o persist.o duphead.o \
 renderopts.o rpict.o:	../common/paths.h
 
 freeobjmem.o raycalls.o text.o:	../common/font.h
 
 raypcalls.o:	../common/selcall.h
 
 o_mesh.o:	../common/mesh.h
 
 noise3.o:	../common/calcomp.h
 
 aniso.o ashikhmin.o dielectric.o freeobjmem.o glass.o initotypes.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_bsdf.o:	ambient.h source.h func.h \
 ../common/calcomp.h ../common/bsdf.h ../common/random.h
 
 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
 
 ambient.o rcmain.o:	ambient.h
 
 rcmain.o:	source.h
 
 rcontrib.o:	source.h ../common/otypes.h
 
 rc2.o:	../common/resolu.h
 
 rc3.o:	../common/selcall.h
 
 #
 # Photon map include dependencies (via 'gcc -MM -I../common')
-# TODO: Update after adding pmaproi module!
 #
-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
-   
-raycalls.o rpmain.o rcmain.o rtmain.o rvmain.o: \
-   pmapparm.h pmaptype.h pmapray.h
-   
-rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h
-   
-raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h
+ambcomp.o: pmapparm.h pmaptype.h
 
-renderopts.o: pmapparm.h pmaptype.h pmapopt.h
+ambient.o: pmapparm.h pmaptype.h pmapamb.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h
 
-rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h pmapdiag.h
+ambio.o: pmapparm.h pmaptype.h
 
-source.o: pmapparm.h pmaptype.h pmap.h pmapdata.h pmapsrc.h
+aniso.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
 
-pmapbias.o: pmapbias.c pmapbias.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 \
- pmaprand.h
+ashikhmin.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h pmaptkdt.h pmutil.h
+
+dielectric.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
+
+fprism.o: pmapparm.h pmaptype.h
+
+glass.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
 
+initotypes.o: pmapparm.h pmaptype.h
 
+lookamb.o: pmapparm.h pmaptype.h 
 
-pmapdiag.o: pmapdiag.c pmapdiag.h ../common/platform.h pmapdata.h ray.h \
+m_alias.o: pmapparm.h pmaptype.h 
+
+m_brdf.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
+
+m_bsdf.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
+
+m_clip.o: pmapparm.h pmaptype.h
+
+m_direct.o: pmapparm.h pmaptype.h
+
+mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.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
+ ../common/object.h ../common/color.h pmapdata.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmutil.h pmapmat.h pmapsrc.h source.h pmapcontrib.h wavelet2.h \
+ mrgbe.h rcontrib.h ../common/platform.h ../common/rtprocess.h \
+ ../common/paths.h func.h ../common/calcomp.h pmaprand.h pmaproi.h \
+ pmapio.h ambient.h ../common/resolu.h
 
-pmapio.o: pmapio.c pmapio.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/paths.h \
- ../common/lookup.h pmapdiag.h ../common/platform.h ../common/resolu.h \
-  pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c
+m_mirror.o: pmapparm.h pmaptype.h 
 
-pmapray.o: pmapray.c pmapray.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 pmap.h pmapdata.h \
- ../common/lookup.h
+m_mist.o: pmapparm.h pmaptype.h
 
-pmaptype.o: pmaptype.c pmaptype.h
+morton.o: morton.c morton.h ../common/fvect.h
 
-ooccache.o: ooccache.c ooccache.h
+mrgbe.o: mrgbe.c mrgbe.h
 
-oocsort.o: oocsort.c oocsort.h ../common/fvect.h morton.h
+mx_data.o: pmapparm.h pmaptype.h
+
+mx_func.o: pmapparm.h pmaptype.h 
+
+noise3.o: pmapparm.h pmaptype.h
+
+normal.o: pmapparm.h pmaptype.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
+
+o_cone.o: pmapparm.h pmaptype.h
+
+o_face.o: pmapparm.h pmaptype.h
+
+o_instance.o: pmapparm.h pmaptype.h
+
+o_mesh.o: pmapparm.h pmaptype.h
 
 oocbuild.o: oocbuild.c oococt.h morton.h ../common/fvect.h ooccache.h \
- oocsort.h
+   oocsort.h
+
+ooccache.o: ooccache.c ooccache.h
+
+oocnn.o: oocnn.c
 
 oococt.o: oococt.c oococt.h morton.h ../common/fvect.h ooccache.h \
- ../common/rtio.h
+   ../common/rtio.h
+
+oocsort.o: oocsort.c oocsort.h ../common/fvect.h morton.h
 
-oocnn.o: oocnn.c oocnn.h oococt.h morton.h ../common/fvect.h \
- ooccache.h pmapfilt.h ../common/lookup.h oocsort.h
+p_data.o: pmapparm.h pmaptype.h
 
-pmapfilt.o: pmapfilt.c pmapfilt.h ../common/lookup.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/paths.h  ../common/random.h source.h otspecial.h \
- pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c 
+persist.o: pmapparm.h pmaptype.h 
 
-pmapdens.o: pmapdens.c pmapdens.h 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 pmapbias.h ../common/otypes.h \
-  pmapkdt.h pmapkdt.c pmaptkdt.h pmaptkdt.c pmapooc.h pmapooc.c 
+p_func.o: pmapparm.h pmaptype.h
+
+pmapamb.o: pmapamb.c pmapamb.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/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmap.h pmutil.h
 
-pmapdump.o: pmapdump.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
+pmapbias.o: pmapbias.c pmapbias.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/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmap.h pmutil.h pmaprand.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 ../common/paths.h \
- ../common/lookup.h pmapio.h ../common/rtio.h \
- ../common/resolu.h ../common/random.h \
-  pmapkdt.h pmapkdt.c pmaptkdt.h pmaptkdt.c pmapooc.h pmapooc.c
+ ../common/object.h ../common/color.h pmapparm.h pmaptype.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
+ ../common/fvect.h pmaptkdt.h wavelet2.h mrgbe.h rcontrib.h \
+ ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
+ ../common/calcomp.h pmapdiag.h pmaprand.h pmapmat.h pmap.h pmutil.h \
+ pmapsrc.h source.h otspecial.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 pmapdens.h pmap.h pmaprand.h pmapmat.h \
- ../common/otypes.h ../common/random.h source.h otspecial.h \
-  pmapkdt.h pmapkdt.c pmaptkdt.h pmaptkdt.c pmapooc.h pmapooc.c
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmapdens.h pmap.h pmutil.h pmaprand.h pmapmat.h pmaproi.h \
+ ../common/otypes.h ../common/random.h pmapkdt.c pmapooc.c source.h \
+ otspecial.h pmaptkdt.c
 
-pmap.o: pmap.c pmap.h pmapparm.h pmaptype.h pmapdata.h ray.h \
+pmapdens.o: pmapdens.c pmapdens.h pmap.h pmapparm.h pmaptype.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 pmapmat.h pmapsrc.h source.h pmaprand.h pmapio.h \
- pmapdens.h pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h \
-  pmapkdt.h pmapkdt.c pmaptkdt.h pmaptkdt.c pmapooc.h pmapooc.c
+ ../common/object.h ../common/color.h pmapdata.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmutil.h pmapbias.h ../common/otypes.h ../common/random.h
 
-pmapamb.o: pmapamb.c pmapamb.h pmapdata.h ray.h ../common/standard.h \
+pmapdiag.o: pmapdiag.c pmap.h pmapparm.h pmaptype.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 pmapdata.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmutil.h pmapdiag.h ../common/platform.h
+
+pmapdump.o: pmapdump.c pmap.h pmapparm.h pmaptype.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 pmapdata.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmutil.h pmapio.h ../common/rtio.h ../common/resolu.h \
+ ../common/random.h
+
+pmapfilt.o: pmapfilt.c pmapfilt.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/lookup.h ../common/fvect.h \
+ ../common/object.h pmapdata.h ray.h ../common/octree.h ../common/color.h \
+ pmapparm.h pmaptype.h ../common/paths.h pmapkdt.h pmapooc.h pmaptkdt.h \
+ pmap.h pmutil.h ../common/random.h source.h otspecial.h
+
+pmapio.o: pmapio.c pmapio.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/paths.h \
- ../common/lookup.h pmap.h \
-  pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmapdiag.h ../common/platform.h pmapcontrib.h wavelet2.h \
+ mrgbe.h rcontrib.h ../common/rtprocess.h ../common/paths.h func.h \
+ ../common/calcomp.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 \
+pmapmat.o: pmapmat.c pmapmat.h pmap.h pmapparm.h pmaptype.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 pmaprand.h ../common/otypes.h data.h func.h \
+ ../common/object.h ../common/color.h pmapdata.h ../common/paths.h \
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h pmutil.h pmaprand.h ../common/otypes.h data.h func.h \
  ../common/calcomp.h ../common/bsdf.h ../common/ccolor.h \
- ../common/platform.h \
-  pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c
+ ../common/platform.h
 
-pmapsrc.o: pmapsrc.c pmapsrc.h ray.h ../common/standard.h \
+pmap.o: pmap.c pmap.h pmapparm.h pmaptype.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 source.h pmap.h pmapdata.h \
- ../common/paths.h ../common/lookup.h pmaprand.h \
- ../common/otypes.h otspecial.h \
-  pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c
+ ../common/color.h pmapdata.h ../common/paths.h ../common/lookup.h \
+ pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h pmaptkdt.h pmutil.h \
+ pmapmat.h pmapsrc.h source.h pmaprand.h pmaproi.h pmapio.h pmapdens.h \
+ pmapbias.h pmapdiag.h ../common/platform.h ../common/otypes.h otspecial.h
 
 pmapopt.o: pmapopt.c 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
 
-pmapparm.o: pmapparm.c 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 pmapkdt.c pmapooc.h pmapooc.c
- 
-pmutil.o: pmutil.h pmutil.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 pmapio.h \
-  pmapkdt.h pmapkdt.c pmapooc.h pmapooc.c
-
-pmaproi.o: pmaproi.c pmaproi.h ray.h ../common/standard.h \
+pmapparm.o: pmapparm.c pmapparm.h pmaptype.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 otspecial.h ../common/otypes.h
+ ../common/color.h pmapdata.h ../common/paths.h ../common/lookup.h \
+ pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h pmaptkdt.h otspecial.h \
+ ../common/otypes.h
 
-mkpmap.o: mkpmap.c pmap.h pmapparm.h pmaptype.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 pmapdata.h ../common/paths.h \
- ../common/lookup.h pmapkdt.h pmapfilt.h ../common/fvect.h pmaptkdt.h \
- pmutil.h pmapmat.h pmapsrc.h source.h pmapcontrib.h mrgbe.h rcontrib.h \
- ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
- ../common/calcomp.h pmaprand.h pmaproi.h pmapio.h ambient.h \
- ../common/resolu.h
+pmaprand.o: pmaprand.c
 
-mrgbe.o: mrgbe.c mrgbe.h
+pmapray.o: pmapray.c pmapray.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 pmapio.h pmapdata.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
+ ../common/fvect.h pmaptkdt.h pmutil.h
 
-wavelet.o: wavelet.c wavelet.h
+pmaproi.o: pmaproi.c pmaproi.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 otspecial.h ../common/otypes.h \
+ ../common/face.h
 
-wavelet2.o: wavelet2.c wavelet2.h
+pmapsrc.o: pmapsrc.c pmapsrc.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 source.h pmap.h pmapdata.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
+ ../common/fvect.h pmaptkdt.h pmutil.h pmaprand.h ../common/face.h \
+ ../common/otypes.h otspecial.h
 
-wavelet3.o: wavelet3.c wavelet2.h
+pmaptype.o: pmaptype.c pmaptype.h
 
-pmapcontrib.o: pmapcontrib.c pmapcontrib.h pmapdata.h ray.h \
+pmcontrib2.o: pmcontrib2.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/paths.h ../common/lookup.h pmapkdt.h pmapfilt.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
  ../common/fvect.h pmaptkdt.h wavelet2.h mrgbe.h rcontrib.h \
  ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
- ../common/calcomp.h pmapdiag.h pmaprand.h pmapmat.h pmap.h pmutil.h \
- pmapsrc.h source.h otspecial.h ../common/otypes.h
+ ../common/calcomp.h
 
-pmcontrib2.o: pmcontrib2.c pmapcontrib.h pmapdata.h ray.h \
+pmcontrib3.o: pmcontrib3.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/paths.h ../common/lookup.h pmapkdt.h pmapfilt.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
  ../common/fvect.h pmaptkdt.h wavelet2.h mrgbe.h rcontrib.h \
  ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
- ../common/calcomp.h pmapdiag.h pmaprand.h pmapmat.h pmap.h pmutil.h \
- pmaproi.h pmapsrc.h source.h pmapio.h otspecial.h
+ ../common/calcomp.h
 
-pmcontrib3.o: pmcontrib3.c pmapcontrib.h pmapdata.h ray.h \
- ../common/standard.h ../common/copyright.h ../common/rtio.h \
+pmcontrib4.o: pmcontrib4.c pmcontribcache.h 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/paths.h ../common/lookup.h pmapkdt.h pmapfilt.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
  ../common/fvect.h pmaptkdt.h wavelet2.h mrgbe.h rcontrib.h \
  ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
- ../common/calcomp.h pmapdiag.h pmapio.h
+ ../common/calcomp.h
 
-pmcontrib4.o: pmcontrib4.c pmapcontrib.h pmapdata.h ray.h \
+pmcontribcache.o: pmcontribcache.c pmcontribcache.h 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/paths.h ../common/lookup.h pmapkdt.h pmapooc.h \
+ pmapfilt.h ../common/fvect.h pmaptkdt.h wavelet2.h mrgbe.h rcontrib.h \
+ ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
+ ../common/calcomp.h
+
+pmcontribsort.o: pmcontribsort.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/paths.h ../common/lookup.h pmapkdt.h pmapfilt.h \
+ ../common/paths.h ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h \
  ../common/fvect.h pmaptkdt.h wavelet2.h mrgbe.h rcontrib.h \
  ../common/platform.h ../common/rtprocess.h ../common/paths.h func.h \
- ../common/calcomp.h pmapmat.h pmap.h pmutil.h pmapsrc.h source.h \
- pmaprand.h pmapio.h pmapdiag.h ../common/otypes.h otspecial.h
+ ../common/calcomp.h
 
-pmcontribsort.o: pmcontribsort.c oocsort.h ../common/fvect.h morton.h \
- pmapcontrib.h pmapdata.h ray.h ../common/standard.h \
+pmutil.o: pmutil.c pmutil.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/paths.h \
- ../common/lookup.h pmapkdt.h pmapfilt.h pmaptkdt.h wavelet2.h mrgbe.h \
- rcontrib.h ../common/platform.h ../common/rtprocess.h ../common/paths.h \
- func.h ../common/calcomp.h
+ ../common/lookup.h pmapkdt.h pmapooc.h pmapfilt.h ../common/fvect.h \
+ pmaptkdt.h
+
+raycalls.o: pmapparm.h pmaptype.h pmapray.h
+
+rayfifo.o: pmapparm.h pmaptype.h
+
+raypcalls.o: pmapparm.h pmaptype.h
+
+raytrace.o: pmapparm.h pmaptype.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
+
+rc2.o: pmapparm.h pmaptype.h 
+
+rc3.o: pmapparm.h pmaptype.h
+
+rcmain.o: pmapparm.h pmaptype.h pmapray.h pmapcontrib.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h wavelet2.h mrgbe.h
+
+rcontrib.o: pmapparm.h pmaptype.h
+
+renderopts.o: pmapparm.h pmaptype.h pmapopt.h
+
+rpict.o: pmapparm.h pmaptype.h pmapbias.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmapdiag.h
+
+rpmain.o: pmapparm.h pmaptype.h pmapray.h
+
+rtmain.o: pmapparm.h pmaptype.h pmapray.h
+
+rtrace.o: pmapparm.h pmaptype.h
+
+rv2.o: pmapparm.h pmaptype.h
+
+rv3.o: pmapparm.h pmaptype.h
+
+rview.o: pmapparm.h pmaptype.h
+
+rvmain.o: pmapparm.h pmaptype.h pmapray.h
+
+source.o: pmapparm.h pmaptype.h pmapsrc.h pmapmat.h pmap.h pmapdata.h \
+   pmapkdt.h pmapooc.h pmapfilt.h pmaptkdt.h pmutil.h
+
+sphere.o: pmapparm.h pmaptype.h
+
+srcdraw.o: pmapparm.h pmaptype.h
+
+srcobstr.o: pmapparm.h pmaptype.h 
+
+srcsamp.o: pmapparm.h pmaptype.h
+
+srcsupp.o: pmapparm.h pmaptype.h
+
+t_data.o: pmapparm.h pmaptype.h
+
+text.o: pmapparm.h pmaptype.h
+
+t_func.o: pmapparm.h pmaptype.h
+
+virtuals.o: pmapparm.h pmaptype.h
+
+wavelet2.o: wavelet2.c wavelet2.h
+
+wavelet3.o: wavelet3.c wavelet2.h
+
+wavelet.o: wavelet.c wavelet.h