ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/RtraceSimulManager.h

Comparing ray/src/rt/RtraceSimulManager.h (file contents):
Revision 2.1 by greg, Wed Feb 8 17:41:48 2023 UTC vs.
Revision 2.5 by greg, Tue Mar 12 16:54:51 2024 UTC

#	Line 22 | Line 22 | typedef void   RayReportCall(RAY *r, void *cd);
22		/// Multi-threaded simulation manager base class
23		class RadSimulManager {
24		int                     nThreads;       // number of active threads
25	+	protected:
26	+	// Assign ray to subthread (fails if NThreads()<2)
27	+	bool                    SplitRay(RAY *r);
28		public:
29		RadSimulManager(const char *octn = NULL) {
30		LoadOctree(octn);
#	Line 32 | Line 35 | class RadSimulManager { (public)
35		}
36		/// Load octree and prepare renderer
37		bool                    LoadOctree(const char *octn);
38	+	/// How many cores are available?
39	+	static int              GetNCores();
40		/// Set number of computation threads (0 => #cores)
41		int                     SetThreadCount(int nt = 0);
42		/// Check thread count (1 means no multi-threading)
#	Line 44 | Line 49 | class RadSimulManager { (public)
49		bool                    Ready() const {
50		return (octname && nsceneobjs > 0);
51		}
52	+	/// Process a ray (in subthread), optional result
53	+	bool                    ProcessRay(RAY *r);
54	+	/// Wait for next result (or fail)
55	+	bool                    WaitResult(RAY *r);
56		/// Close octree, free data, return status
57	<	int                     Cleanup();
57	>	int                     Cleanup(bool everything = false);
58		};
59
60		/// Flags to control rendering operations
#	Line 63 | Line 72 | class RtraceSimulManager : public RadSimulManager {
72		// Check for changes to render flags, etc.
73		bool                    UpdateMode();
74		protected:
75	+	// Add a ray result to FIFO, flushing what we can
76	+	int                     QueueResult(const RAY &ra);
77		RNUMBER                 lastRayID;      // last ray ID assigned
78		public:
79		int                     rtFlags;        // operation (RT*) flags
#	Line 73 | Line 84 | class RtraceSimulManager : public RadSimulManager {
84		SetCookedCall(cb, cd);
85		traceCall = NULL; tcData = NULL;
86		}
87	<	~RtraceSimulManager() {}
87	>	~RtraceSimulManager() {
88	>	FlushQueue();
89	>	}
90	>	/// Set number of computation threads (0 => #cores)
91	>	int                     SetThreadCount(int nt = 0) {
92	>	if (nt <= 0) nt = GetNCores();
93	>	if (nt == NThreads()) return nt;
94	>	FlushQueue();
95	>	return RadSimulManager::SetThreadCount(nt);
96	>	}
97		/// Add ray bundle to queue w/ optional 1st ray ID
98		int                     EnqueueBundle(const FVECT orig_direc[], int n,
99		RNUMBER rID0 = 0);
#	Line 81 | Line 101 | class RtraceSimulManager : public RadSimulManager {
101		bool                    EnqueueRay(const FVECT org, const FVECT dir,
102		RNUMBER rID = 0) {
103		if (dir == org+1)
104	<	return EnqueueBundle((const FVECT *)org, 1, rID);
104	>	return(EnqueueBundle((const FVECT *)org, 1, rID) > 0);
105		FVECT   orgdir[2];
106		VCOPY(orgdir[0], org); VCOPY(orgdir[1], dir);
107	<	return EnqueueBundle(orgdir, 1, rID);
107	>	return(EnqueueBundle(orgdir, 1, rID) > 0);
108		}
109		/// Set/change cooked ray callback & FIFO flag
110		void                    SetCookedCall(RayReportCall *cb, void *cd = NULL) {
#	Line 103 | Line 123 | class RtraceSimulManager : public RadSimulManager {
123		return (cookedCall != NULL) | (traceCall != NULL) &&
124		RadSimulManager::Ready();
125		}
126	<	/// Finish pending rays and complete callbacks
127	<	bool                    FlushQueue();
126	>	/// Finish pending rays and complete callbacks (return #sent)
127	>	int                     FlushQueue();
128		/// Close octree, free data, return status
129	<	int                     Cleanup() {
129	>	int                     Cleanup(bool everything = false) {
130		SetCookedCall(NULL);
131		SetTraceCall(NULL);
132		rtFlags = 0;
133		UpdateMode();
134		lastRayID = 0;
135	<	return RadSimulManager::Cleanup();
135	>	return RadSimulManager::Cleanup(everything);
136		}
137		};
138

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)