Erik Hofman:

[flightgear.git] / src / WeatherCM / linintp2.h

diff --git a/src/WeatherCM/linintp2.h b/src/WeatherCM/linintp2.h
index f0e8a1a9eb1594789157afe2305ccafb8508dd7d..c0925b4403c4b88e3e30351c7975f95251874af5 100644 (file)
--- a/src/WeatherCM/linintp2.h
+++ b/src/WeatherCM/linintp2.h
@@ -32,11 +32,16 @@
 #ifndef LININTP2_H
 #define LININTP2_H
 
-template<class T>
+struct EvaluateData
+{
+    unsigned int index[3];
+    double percentage[3];
+};
+
 class mgcLinInterp2D
 {
 public:
-    mgcLinInterp2D (int _numPoints, double* x, double* y, T* _f);
+    mgcLinInterp2D (int _numPoints, double* x, double* y, unsigned int* _f);
 
     ~mgcLinInterp2D ();
 
@@ -57,7 +62,7 @@ public:
     void GetTriangle (int i, double& x0, double& y0, double& x1, double& y1,
         double& x2, double& y2);
 
-    int Evaluate (double x, double y, T& F);
+    int Evaluate (double x, double y, EvaluateData& F);
     
 private:
     typedef struct
@@ -88,7 +93,7 @@ private:
     int numPoints;
     double** point;
     double** tmppoint;
-    T* f;
+    unsigned int* f;
 
     double xmin, xmax, ymin, ymax;
 
@@ -105,6 +110,4 @@ private:
     int InTriangle (Vertex& v0, Vertex& v1, Vertex& v2, Vertex& test);
 };
 
-#include "linintp2.inl"
-
 #endif