--- ray/src/rt/ray.h 1992/01/04 19:53:55 2.2 +++ ray/src/rt/ray.h 1995/11/02 17:38:07 2.5 @@ -1,4 +1,4 @@ -/* Copyright (c) 1992 Regents of the University of California */ +/* Copyright (c) 1995 Regents of the University of California */ /* SCCSid "$SunId$ LBL" */ @@ -27,7 +27,7 @@ #define RAYREFL (SHADOW|REFLECTED|AMBIENT|SPECULAR) typedef struct ray { - long rno; /* unique ray number */ + unsigned long rno; /* unique ray number */ int rlvl; /* number of reflections for this ray */ float rweight; /* cumulative weight of this ray */ short rtype; /* ray type */ @@ -35,6 +35,7 @@ typedef struct ray { struct ray *parent; /* ray this originated from */ FVECT rorg; /* origin of ray */ FVECT rdir; /* normalized direction of ray */ + double rmax; /* maximum distance (aft clipping plane) */ int rsrc; /* source we're aiming for */ OBJECT *clipset; /* set of objects currently clipped */ OBJECT *newcset; /* next clipset, used for transmission */ @@ -54,6 +55,8 @@ typedef struct ray { extern int raytrace(); extern double raynormal(); + +extern double raydistance(); extern int dimlist[]; /* dimension list for distribution */ extern int ndims; /* number of dimensions so far */