Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Include / general.hxx

diff --git a/src/Include/general.hxx b/src/Include/general.hxx
index 9d7fecb6da45b464d7fca7d2efd08310a9d7e359..0db2b8829fc046dfbab6f7f29ad870bc27b4fac4 100644 (file)
--- a/src/Include/general.hxx
+++ b/src/Include/general.hxx
@@ -4,7 +4,7 @@
 //
 // Written by Curtis Olson, started July 1997.
 //
-// Copyright (C) 1997  Curtis L. Olson  - curt@infoplane.com
+// Copyright (C) 1997  Curtis L. Olson  - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -31,6 +31,8 @@
 # error This library requires C++
 #endif                                   
 
+#include <simgear/structure/OSGVersion.hxx>
+#define FG_OSG_VERSION SG_OSG_VERSION
 
 // #define FANCY_FRAME_COUNTER
 #ifdef FANCY_FRAME_COUNTER
@@ -44,6 +46,8 @@ class FGGeneral {
     char *glVendor;
     char *glRenderer;
     char *glVersion;
+    int glMaxTexSize;
+    int glDepthBits;
 
     // Last frame rate measurement
     int frame_rate;
@@ -57,6 +61,10 @@ public:
     inline char* get_glRenderer() const { return glRenderer; }
     inline void set_glRenderer( char *str ) { glRenderer = str; }
     inline void set_glVersion( char *str ) { glVersion = str; }
+    inline void set_glMaxTexSize( int i ) { glMaxTexSize = i; }
+    inline int get_glMaxTexSize() const { return glMaxTexSize; }
+    inline void set_glDepthBits( int d ) { glDepthBits = d; }
+    inline int get_glDepthBits() const { return glDepthBits; }
     inline double get_frame_rate() const { return frame_rate; }
 #ifdef FANCY_FRAME_COUNTER
     inline double get_frame(int idx) const { return frames[idx]; }