Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 3, 2005, 4:49:42 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: setting the resolution works again (workaround. now i fix the subprojects again.)

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4782 r4784  
    3030    inline static GraphicsEngine* getInstance() { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
    3131
    32     int initVideo();
    33     int loadFromIniFile(IniParser* iniParser);
     32    int init();
     33    int initFromIniFile(IniParser* iniParser);
    3434
    3535    void setWindowName(const char* windowName, const char* icon);
    … …  
    6464    static void swapBuffers() { SDL_GL_SwapBuffers(); };
    6565
    66   public:
    67     static bool texturesEnabled;
    6866
    6967  private:
    7068    GraphicsEngine();
     69    int initVideo(unsigned int resX, unsigned int resY, unsigned int bbp);
     70
     71  public:
     72    static bool             texturesEnabled; //!< if textures should be enabled (globally)
     73
    7174
    7275  private:
    73     static GraphicsEngine* singletonRef;
     76    static GraphicsEngine*  singletonRef;    //!< Pointer to the only instance of this Class
     77    bool                    isInit;          //!< if the GraphicsEngine is initialized.
    7478
    75     SDL_Surface*   screen;          //!< the screen we draw to
    76     int            resolutionX;     //!< the X-resoultion of the screen
    77     int            resolutionY;     //!< the Y-resolution of the screen
    78     int            bitsPerPixel;    //!< the bits per pixels of the screen
    79     Uint32         fullscreenFlag;  //!< if we are in fullscreen mode
    80     Uint32         videoFlags;      //!< flags for video
    81     SDL_Rect**     videoModes;      //!< list of resolutions
     79    SDL_Surface*            screen;          //!< the screen we draw to
     80    int                     resolutionX;     //!< the X-resoultion of the screen
     81    int                     resolutionY;     //!< the Y-resolution of the screen
     82    int                     bitsPerPixel;    //!< the bits per pixels of the screen
     83    Uint32                  fullscreenFlag;  //!< if we are in fullscreen mode
     84    Uint32                  videoFlags;      //!< flags for video
     85    SDL_Rect**              videoModes;      //!< list of resolutions
    8286
    83     bool           bDisplayFPS;     //!< is true if the fps should be displayed
    84     float          currentFPS;      //!< the current frame rate: frames per seconds
    85     float          maxFPS;          //!< maximal frame rate we ever got since start of the game
    86     float          minFPS;          //!< minimal frame rate we ever got since start
     87    bool                    bDisplayFPS;     //!< is true if the fps should be displayed
     88    float                   currentFPS;      //!< the current frame rate: frames per seconds
     89    float                   maxFPS;          //!< maximal frame rate we ever got since start of the game
     90    float                   minFPS;          //!< minimal frame rate we ever got since start
    8791
    8892
Note: See TracChangeset for help on using the changeset viewer.