Changeset 5378 for anuga_work/development

Timestamp:

May 29, 2008, 10:05:54 AM (17 years ago)

Author:

jack

Message:

Inlined vector.h functions for performance.

Location:

anuga_work/development/anugavis/src

Files:

• Makefile.am (modified) (1 diff)
• vector.c (deleted)
• vector.h (modified) (1 diff)

anuga_work/development/anugavis/src/Makefile.am

@@ -18 +18 @@
                         netcdf_util.h \
                         vector.c \
-                        vector.h \
                         xfunctions.c \
                         xfunctions.h

anuga_work/development/anugavis/src/vector.h

@@ -2 +2 @@
 #define VECTOR_H
 
+#include <math.h>
+
 typedef float vector[3];
+
 /* Useful vector operations. */
-extern void vadd(const vector v1, const vector v2, vector result);
-extern float vlen(const vector v);
-extern void vscale(const vector v, const float scale, vector result);
-extern void vsub(const vector v1, const vector v2, vector result);
-extern float vdot(const vector v1, const vector v2);
-extern void vcross(const vector v1, const vector v2, vector result);
+static inline void vadd(const vector v1, const vector v2, vector result){
+  int i;
+  for(i = 0 ; i < 3 ; i++) result[i] = v1[i] + v2[i];
+}
+
+static inline float vlen(const vector v){
+  return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+}
+
+static inline void vscale(const vector v, const float scale, vector result){
+  int i;
+  for(i = 0 ; i < 3 ; i++) result[i] = scale * v[i];
+}
+
+static inline void vsub(const vector v1, const vector v2, vector result){
+  int i;
+  for(i = 0 ; i < 3 ; i++) result[i] = v1[i] - v2[i];
+}
+
+static inline float vdot(const vector v1, const vector v2){
+  int i;
+  float rv = 0;
+  for(i = 0 ; i < 3 ; i++) rv += v1[i] * v2[i];
+  return rv;
+}
+
+static inline void vcross(const vector v1, const vector v2, vector result){
+  result[0] = v1[1] * v2[2] - v1[2] * v2[1];
+  result[1] = v1[2] * v2[0] - v1[0] * v2[2];
+  result[2] = v1[0] * v2[1] - v1[1] * v2[0];
+}
 
 #endif