ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/RtraceSimulManager.cpp
(Generate patch)

Comparing ray/src/rt/RtraceSimulManager.cpp (file contents):
Revision 2.7 by greg, Wed May 1 20:28:53 2024 UTC vs.
Revision 2.8 by greg, Thu May 2 22:10:43 2024 UTC

# Line 217 | Line 217 | RtraceSimulManager::EnqueueBundle(const FVECT orig_dir
217                  return -1;
218  
219          if (castonly && !cookedCall)
220 <                error(CONSISTENCY, "EnqueueBundle() called in castonly mode without cookedCall");
220 >                error(INTERNAL, "EnqueueBundle() called in castonly mode without cookedCall");
221  
222          if (!UpdateMode())              // update rendering mode if requested
223                  return -1;
# Line 227 | Line 227 | RtraceSimulManager::EnqueueBundle(const FVECT orig_dir
227                  VCOPY(res.rdir, orig_direc[1]);
228                  orig_direc += 2;
229                  rayorigin(&res, PRIMARY, NULL, NULL);
230 <                if (rID0) res.rno = rID0++;
231 <                else res.rno = ++lastRayID;
230 >                if (!rID0)
231 >                        res.rno = ++lastRayID;
232 >                else if (curFlags & RTdoFIFO)
233 >                        error(INTERNAL, "Ray number assignment unsupported with FIFO");
234 >                else
235 >                        res.rno = lastRayID = rID0++;
236                  if (curFlags & RTimmIrrad)
237                          res.revf = rayirrad;
238                  else if (castonly)

Diff Legend

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