diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-02-24 14:50:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-24 14:50:33 +0400 |
commit | 963b1c1b165a471f05cde38d0e5dd1ae4a346090 (patch) | |
tree | 56e2d002618c54d4ee6f0a34dceaf2d967f6efe4 /source/gameengine | |
parent | 2c348d003e007fc168ae7a8d60b9d59792270ade (diff) |
fix for own commit r54806 with argument order and multisampling.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 47 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.h | 36 |
2 files changed, 47 insertions, 36 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index f3f4c31149a..58710120afa 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -308,20 +308,21 @@ bool GPG_Application::startScreenSaverFullScreen( #endif -bool GPG_Application::startWindow(STR_String& title, - int windowLeft, - int windowTop, - int windowWidth, - int windowHeight, - const bool stereoVisual, - const int stereoMode, - const GHOST_TUns16 samples) +bool GPG_Application::startWindow( + STR_String& title, + int windowLeft, + int windowTop, + int windowWidth, + int windowHeight, + const bool stereoVisual, + const int stereoMode, + const GHOST_TUns16 samples) { bool success; // Create the main window //STR_String title ("Blender Player - GHOST"); m_mainWindow = fSystem->createWindow(title, windowLeft, windowTop, windowWidth, windowHeight, GHOST_kWindowStateNormal, - GHOST_kDrawingContextTypeOpenGL, stereoVisual, samples); + GHOST_kDrawingContextTypeOpenGL, stereoVisual, false, samples); if (!m_mainWindow) { printf("error: could not create main window\n"); exit(-1); @@ -340,16 +341,18 @@ bool GPG_Application::startWindow(STR_String& title, return success; } -bool GPG_Application::startEmbeddedWindow(STR_String& title, - const GHOST_TEmbedderWindowID parentWindow, - const bool stereoVisual, - const int stereoMode, - const GHOST_TUns16 samples) { +bool GPG_Application::startEmbeddedWindow( + STR_String& title, + const GHOST_TEmbedderWindowID parentWindow, + const bool stereoVisual, + const int stereoMode, + const GHOST_TUns16 samples) +{ GHOST_TWindowState state = GHOST_kWindowStateNormal; if (parentWindow != 0) state = GHOST_kWindowStateEmbedded; m_mainWindow = fSystem->createWindow(title, 0, 0, 0, 0, state, - GHOST_kDrawingContextTypeOpenGL, stereoVisual, samples, parentWindow); + GHOST_kDrawingContextTypeOpenGL, stereoVisual, false, samples, parentWindow); if (!m_mainWindow) { printf("error: could not create main window\n"); @@ -366,13 +369,13 @@ bool GPG_Application::startEmbeddedWindow(STR_String& title, bool GPG_Application::startFullScreen( - int width, - int height, - int bpp,int frequency, - const bool stereoVisual, - const int stereoMode, - const GHOST_TUns16 samples, - bool useDesktop) + int width, + int height, + int bpp,int frequency, + const bool stereoVisual, + const int stereoMode, + const GHOST_TUns16 samples, + bool useDesktop) { bool success; GHOST_TUns32 sysWidth=0, sysHeight=0; diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h index e04fcc2a555..f141443e738 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h @@ -61,23 +61,32 @@ public: GPG_Application(GHOST_ISystem* system); ~GPG_Application(void); - bool SetGameEngineData(struct Main* maggie, struct Scene* scene, GlobalSettings* gs, int argc, char** argv); - bool startWindow(STR_String& title, int windowLeft, int windowTop, int windowWidth, int windowHeight, - const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); - bool startFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0, bool useDesktop=false); - bool startEmbeddedWindow(STR_String& title, const GHOST_TEmbedderWindowID parent_window, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); + bool SetGameEngineData(struct Main* maggie, struct Scene* scene, GlobalSettings* gs, int argc, char** argv); + bool startWindow(STR_String& title, + int windowLeft, int windowTop, + int windowWidth, int windowHeight, + const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); + bool startFullScreen(int width, int height, + int bpp, int frequency, + const bool stereoVisual, const int stereoMode, + const GHOST_TUns16 samples=0, bool useDesktop=false); + bool startEmbeddedWindow(STR_String& title, const GHOST_TEmbedderWindowID parent_window, + const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); #ifdef WIN32 - bool startScreenSaverFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); - bool startScreenSaverPreview(HWND parentWindow, const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); + bool startScreenSaverFullScreen(int width, int height, + int bpp, int frequency, + const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); + bool startScreenSaverPreview(HWND parentWindow, + const bool stereoVisual, const int stereoMode, const GHOST_TUns16 samples=0); #endif virtual bool processEvent(GHOST_IEvent* event); - int getExitRequested(void); - const STR_String& getExitString(void); - GlobalSettings* getGlobalSettings(void); - bool StartGameEngine(int stereoMode); - void StopGameEngine(); - void EngineNextFrame(); + int getExitRequested(void); + const STR_String& getExitString(void); + GlobalSettings* getGlobalSettings(void); + bool StartGameEngine(int stereoMode); + void StopGameEngine(); + void EngineNextFrame(); protected: bool handleWheel(GHOST_IEvent* event); @@ -165,4 +174,3 @@ protected: int m_argc; char** m_argv; }; - |