From 963b1c1b165a471f05cde38d0e5dd1ae4a346090 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 24 Feb 2013 10:50:33 +0000 Subject: [PATCH] fix for own commit r54806 with argument order and multisampling. --- intern/ghost/GHOST_ISystem.h | 22 +++++---- intern/ghost/intern/GHOST_C-api.cpp | 3 +- .../GamePlayer/ghost/GPG_Application.cpp | 47 ++++++++++--------- .../GamePlayer/ghost/GPG_Application.h | 36 ++++++++------ 4 files changed, 61 insertions(+), 47 deletions(-) diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index e0b483d07fe..37e82c29f80 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -249,13 +249,13 @@ public: * \return The new window (or 0 if creation failed). */ virtual GHOST_IWindow *createWindow( - const STR_String& title, - GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height, - GHOST_TWindowState state, GHOST_TDrawingContextType type, - const bool stereoVisual = false, - const bool exclusive = false, - const GHOST_TUns16 numOfAASamples = 0, - const GHOST_TEmbedderWindowID parentWindow = 0) = 0; + const STR_String& title, + GHOST_TInt32 left, GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height, + GHOST_TWindowState state, GHOST_TDrawingContextType type, + const bool stereoVisual = false, + const bool exclusive = false, + const GHOST_TUns16 numOfAASamples = 0, + const GHOST_TEmbedderWindowID parentWindow = 0) = 0; /** * Dispose a window. @@ -278,8 +278,9 @@ public: * This window is invalid after full screen has been ended. * \return Indication of success. */ - virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow **window, - const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0) = 0; + virtual GHOST_TSuccess beginFullScreen( + const GHOST_DisplaySetting& setting, GHOST_IWindow **window, + const bool stereoVisual, const GHOST_TUns16 numOfAASamples = 0) = 0; /** * Updates the resolution while in fullscreen mode. @@ -288,7 +289,8 @@ public: * * \return Indication of success. */ - virtual GHOST_TSuccess updateFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow **window) = 0; + virtual GHOST_TSuccess updateFullScreen( + const GHOST_DisplaySetting& setting, GHOST_IWindow **window) = 0; /** * Ends full screen mode. diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp index 7622a2a7330..b73ff26c259 100644 --- a/intern/ghost/intern/GHOST_C-api.cpp +++ b/intern/ghost/intern/GHOST_C-api.cpp @@ -152,7 +152,8 @@ GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle, bstereoVisual = false; return (GHOST_WindowHandle) system->createWindow(title, left, top, width, height, - state, type, bstereoVisual, numOfAASamples); + state, type, bstereoVisual, false, + numOfAASamples); } GHOST_TUserDataPtr GHOST_GetWindowUserData(GHOST_WindowHandle windowhandle) 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; }; -