--- ray/src/common/fvect.h	1992/07/09 15:34:29	2.3
+++ ray/src/common/fvect.h	2003/02/22 02:07:22	2.7
@@ -1,6 +1,64 @@
-/* Copyright (c) 1988 Regents of the University of California */
+/* RCSid: $Id: fvect.h,v 2.7 2003/02/22 02:07:22 greg Exp $ */
+/*
+ * Declarations for floating-point vector operations.
+ */
 
-/* SCCSid "$SunId$ LBL" */
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
 
 #ifdef  SMLFLT
 #define  FLOAT		float
@@ -15,8 +73,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