--- ray/src/common/fvect.h	1992/07/09 15:34:29	2.3
+++ ray/src/common/fvect.h	2003/02/25 02:47:21	2.8
@@ -1,6 +1,9 @@
-/* Copyright (c) 1988 Regents of the University of California */
+/* RCSid $Id: fvect.h,v 2.8 2003/02/25 02:47:21 greg Exp $ */
+/*
+ * Declarations for floating-point vector operations.
+ */
 
-/* SCCSid "$SunId$ LBL" */
+#include "copyright.h"
 
 #ifdef  SMLFLT
 #define  FLOAT		float
@@ -15,8 +18,35 @@ typedef FLOAT  FVECT[3];
 
 #define  VCOPY(v1,v2)	((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
 #define  DOT(v1,v2)	((v1)[0]*(v2)[0]+(v1)[1]*(v2)[1]+(v1)[2]*(v2)[2])
+#define  VLEN(v)	sqrt(DOT(v,v))
+#define  VADD(vr,v1,v2)	((vr)[0]=(v1)[0]+(v2)[0], \
+				(vr)[1]=(v1)[1]+(v2)[1], \
+				(vr)[2]=(v1)[2]+(v2)[2])
+#define  VSUB(vr,v1,v2)	((vr)[0]=(v1)[0]-(v2)[0], \
+				(vr)[1]=(v1)[1]-(v2)[1], \
+				(vr)[2]=(v1)[2]-(v2)[2])
 #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  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])
 
-extern double  sqrt(), fdot(), dist2(), dist2lseg(), dist2line(), normalize();
+#ifdef NOPROTO
+
+extern double  fdot(), dist2(), dist2lseg(), dist2line(), normalize();
+extern void  fcross(), fvsum(), spinvector();
+
+#else
+
+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	normalize(FVECT v);
+extern void	spinvector(FVECT vres, FVECT vorig, FVECT vnorm, double theta);
+
+#endif