--- ray/src/common/mat4.h 2003/06/06 16:38:47 2.7 +++ ray/src/common/mat4.h 2003/07/14 22:23:59 2.12 @@ -1,24 +1,21 @@ -/* RCSid $Id: mat4.h,v 2.7 2003/06/06 16:38:47 schorsch Exp $ */ +/* RCSid $Id: mat4.h,v 2.12 2003/07/14 22:23:59 schorsch Exp $ */ /* * Definitions for 4x4 matrix operations */ #ifndef _RAD_MAT4_H_ #define _RAD_MAT4_H_ -#ifdef __cplusplus -extern "C" { -#endif -#include "copyright.h" +#include #include "fvect.h" -typedef FLOAT MAT4[4][4]; +#ifdef __cplusplus +extern "C" { +#endif -#ifdef BSD -#define copymat4(m4a,m4b) bcopy((void *)m4b,(void *)m4a,sizeof(MAT4)) -#else +typedef RREAL MAT4[4][4]; + #define copymat4(m4a,m4b) (void)memcpy((void *)m4a,(void *)m4b,sizeof(MAT4)) -#endif #define MAT4IDENT { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \ {0.,0.,1.,0.}, {0.,0.,0.,1.} }