--- ray/src/common/fvect.h	2003/06/26 00:58:09	2.10
+++ ray/src/common/fvect.h	2021/04/09 17:37:47	2.20
@@ -1,4 +1,4 @@
-/* RCSid $Id: fvect.h,v 2.10 2003/06/26 00:58:09 schorsch Exp $ */
+/* RCSid $Id: fvect.h,v 2.20 2021/04/09 17:37:47 greg Exp $ */
 /*
  * Declarations for floating-point vector operations.
  */
@@ -8,17 +8,25 @@
 extern "C" {
 #endif
 
-#include "copyright.h"
-
 #ifdef  SMLFLT
 #define  RREAL		float
 #define  FTINY		(1e-3)
+#define  FVFORMAT	"%f %f %f"
 #else
 #define  RREAL		double
 #define  FTINY		(1e-6)
+#define  FVFORMAT	"%lf %lf %lf"
 #endif
 #define  FHUGE		(1e10)
 
+#define  FABSEQ(x1,x2)	((x1)+FTINY > (x2) && (x2)+FTINY > (x1))
+#define  FRELEQ(x1,x2)	((x1)*(1.+FTINY) >= (x2) && (x2)*(1.+FTINY) >= (x1))
+
+#define  VABSEQ(v,w)	(FABSEQ((v)[0],(w)[0]) && FABSEQ((v)[1],(w)[1]) \
+				&& FABSEQ((v)[2],(w)[2]))
+#define  VRELEQ(v,w)	(FRELEQ((v)[0],(w)[0]) && FRELEQ((v)[1],(w)[1]) \
+				&& FRELEQ((v)[2],(w)[2]))
+
 typedef RREAL  FVECT[3];
 
 #define  VCOPY(v1,v2)	((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
@@ -33,22 +41,35 @@ typedef RREAL  FVECT[3];
 #define  VSUM(vr,v1,v2,f)	((vr)[0]=(v1)[0]+(f)*(v2)[0], \
 				(vr)[1]=(v1)[1]+(f)*(v2)[1], \
 				(vr)[2]=(v1)[2]+(f)*(v2)[2])
+#define  VLERP(vr,v1,a,v2)	((vr)[0]=(1.-(a))*(v1)[0]+(a)*(v2)[0], \
+				(vr)[1]=(1.-(a))*(v1)[1]+(a)*(v2)[1], \
+				(vr)[2]=(1.-(a))*(v1)[2]+(a)*(v2)[2])
 #define  VCROSS(vr,v1,v2) \
 			((vr)[0]=(v1)[1]*(v2)[2]-(v1)[2]*(v2)[1], \
 			(vr)[1]=(v1)[2]*(v2)[0]-(v1)[0]*(v2)[2], \
 			(vr)[2]=(v1)[0]*(v2)[1]-(v1)[1]*(v2)[0])
 
+#define	GEOD_RAD	0	/* geodesic distance specified in radians */
+#define	GEOD_ABS	1	/* absolute geodesic distance */
+#define	GEOD_REL	2	/* relative geodesic distance */
 
-extern double	fdot(FVECT v1, FVECT v2);
-extern double	dist2(FVECT v1, FVECT v2);
-extern double	dist2line(FVECT p, FVECT ep1, FVECT ep2);
-extern double	dist2lseg(FVECT p, FVECT ep1, FVECT ep2);
-extern void	fcross(FVECT vres, FVECT v1, FVECT v2);
-extern void	fvsum(FVECT vres, FVECT v0, FVECT v1, double f);
+extern double	Acos(double x);
+extern double	Asin(double x);
+extern double	fdot(const FVECT v1, const FVECT v2);
+extern double	dist2(const FVECT v1, const FVECT v2);
+extern double	dist2line(const FVECT p, const FVECT ep1, const FVECT ep2);
+extern double	dist2lseg(const FVECT p, const FVECT ep1, const FVECT ep2);
+extern void	fcross(FVECT vres, const FVECT v1, const FVECT v2);
+extern void	fvsum(FVECT vres, const FVECT v0, const FVECT v1, double f);
 extern double	normalize(FVECT v);
-extern void	spinvector(FVECT vres, FVECT vorig, FVECT vnorm, double theta);
-
-
+extern int	getperpendicular(FVECT vp, const FVECT v, int randomize);
+extern int	closestapproach(RREAL t[2],
+			const FVECT rorg0, const FVECT rdir0,
+			const FVECT rorg1, const FVECT rdir1);
+extern void	spinvector(FVECT vres, const FVECT vorig,
+			const FVECT vnorm, double theta);
+extern double	geodesic(FVECT vres, const FVECT vorig,
+			const FVECT vtarg, double t, int meas);
 #ifdef __cplusplus
 }
 #endif