Commit 8c207cad46269b6653b5735e254e6bf4ac357283
2004-10-11T01:58:43
Renamed variable
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
diff --git a/include/FTPoint.h b/include/FTPoint.h
index 6bd6009..a9b5f89 100755
--- a/include/FTPoint.h
+++ b/include/FTPoint.h
@@ -18,9 +18,9 @@ class FTGL_EXPORT FTPoint
*/
FTPoint()
{
- elements[0] = 0;
- elements[1] = 0;
- elements[2] = 0;
+ values[0] = 0;
+ values[1] = 0;
+ values[2] = 0;
}
/**
@@ -32,9 +32,9 @@ class FTGL_EXPORT FTPoint
*/
FTPoint( const FTGL_DOUBLE x, const FTGL_DOUBLE y, const FTGL_DOUBLE z)
{
- elements[0] = x;
- elements[1] = y;
- elements[2] = z;
+ values[0] = x;
+ values[1] = y;
+ values[2] = z;
}
/**
@@ -44,9 +44,9 @@ class FTGL_EXPORT FTPoint
*/
FTPoint( const FT_Vector& ft_vector)
{
- elements[0] = ft_vector.x;
- elements[1] = ft_vector.y;
- elements[2] = 0;
+ values[0] = ft_vector.x;
+ values[1] = ft_vector.y;
+ values[2] = 0;
}
/**
@@ -57,9 +57,9 @@ class FTGL_EXPORT FTPoint
*/
FTPoint& operator += ( const FTPoint& point)
{
- elements[0] += point.elements[0];
- elements[1] += point.elements[1];
- elements[2] += point.elements[2];
+ values[0] += point.values[0];
+ values[1] += point.values[1];
+ values[2] += point.values[2];
return *this;
}
@@ -88,30 +88,30 @@ class FTGL_EXPORT FTPoint
*/
operator FTGL_DOUBLE*()
{
- return elements;
+ return values;
}
/**
* Setters
*/
- void X( FTGL_DOUBLE x) { elements[0] = x;};
- void Y( FTGL_DOUBLE y) { elements[1] = y;};
- void Z( FTGL_DOUBLE z) { elements[2] = z;};
+ void X( FTGL_DOUBLE x) { values[0] = x;};
+ void Y( FTGL_DOUBLE y) { values[1] = y;};
+ void Z( FTGL_DOUBLE z) { values[2] = z;};
/**
* Getters
*/
- FTGL_DOUBLE X() const { return elements[0];};
- FTGL_DOUBLE Y() const { return elements[1];};
- FTGL_DOUBLE Z() const { return elements[2];};
+ FTGL_DOUBLE X() const { return values[0];};
+ FTGL_DOUBLE Y() const { return values[1];};
+ FTGL_DOUBLE Z() const { return values[2];};
private:
/**
* The point data
*/
- FTGL_DOUBLE elements[3];
+ FTGL_DOUBLE values[3];
};
#endif // __FTPoint__
diff --git a/src/FTPoint.cpp b/src/FTPoint.cpp
index 284a810..dd012ec 100755
--- a/src/FTPoint.cpp
+++ b/src/FTPoint.cpp
@@ -3,10 +3,10 @@
bool operator == ( const FTPoint &a, const FTPoint &b)
{
- return((a.elements[0] == b.elements[0]) && (a.elements[1] == b.elements[1]) && (a.elements[2] == b.elements[2]));
+ return((a.values[0] == b.values[0]) && (a.values[1] == b.values[1]) && (a.values[2] == b.values[2]));
}
bool operator != ( const FTPoint &a, const FTPoint &b)
{
- return((a.elements[0] != b.elements[0]) || (a.elements[1] != b.elements[1]) || (a.elements[2] != b.elements[2]));
+ return((a.values[0] != b.values[0]) || (a.values[1] != b.values[1]) || (a.values[2] != b.values[2]));
}