--- ray/src/rt/Rmakefile 2024/08/14 20:05:23 2.95 +++ ray/src/rt/Rmakefile 2025/01/18 03:49:00 2.101 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.95 2024/08/14 20:05:23 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.101 2025/01/18 03:49:00 greg Exp $ # # Compiles for ray tracing programs. # @@ -67,6 +67,14 @@ RXTSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cp 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 @@ -87,10 +95,10 @@ 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 @@ -156,6 +164,14 @@ $(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) @@ -217,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 p_func.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 +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 \ @@ -232,14 +249,15 @@ raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rt 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 RtraceSimulManager.o RpictSimulManager.o \ -rxtrace.o rxtmain.o rxpmain.o: ray.h \ +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 @@ -291,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 @@ -302,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 @@ -315,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 @@ -450,9 +475,24 @@ oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h -RtraceSimulManager.o rxpmain.o rxtmain.o rxtrace.o: RtraceSimulManager.h +rxtrace.o rxtmain.o rxpiece.o rxpmain.o rxcmain.o \ +RcontribSimulManager.o RpictSimulManager.o \ +RtraceSimulManager.o: RtraceSimulManager.h \ +../common/abitmap.h -RpictSimulManager.o rxpmain.o: RpictSimulManager.h ../common/view.h \ -../common/depthcodec.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