Changeset 3790 in orxonox.OLD for orxonox/trunk/src/lib/graphics/graphics_engine.h

Timestamp:

Apr 13, 2005, 12:33:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

• orxonox/trunk/src/lib/graphics/graphics_engine.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -26 +26 @@
   int setGLattribs(void);
   int setResolution(int width, int height, int bpp);
+  /** \returns the x resolution */
+  inline int getResolutionX(void) {return this->resolutionX;}
+  /** \returns the y resolution */
+  inline int getResolutionY(void) {return this->resolutionY;}
+  /** \returns the Bits Per Pixel */
+  inline int getbbp(void) {return this->bitsPerPixel;}
   int resolutionChanged(SDL_ResizeEvent* resizeInfo);
   void listModes(void);
 
   static bool texturesEnabled;
+
+  static void enter2DMode(void);
+  static void leave2DMode(void);
 
  private: