[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38970] branches/soc-2011-cucumber: Multisampling now works in a fullscreen Blender Player.

[Daniel Stokes]

Revision: 38970
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38970
Author:   kupoman
Date:     2011-08-03 07:20:07 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Multisampling now works in a fullscreen Blender Player.

Modified Paths:
--------------
    branches/soc-2011-cucumber/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp

Modified: branches/soc-2011-cucumber/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/GHOST_ISystem.h	2011-08-03 07:08:28 UTC (rev 38969)
+++ branches/soc-2011-cucumber/intern/ghost/GHOST_ISystem.h	2011-08-03 07:20:07 UTC (rev 38970)
@@ -253,7 +253,7 @@
 	 * @return	Indication of success.
 	 */
 	virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
-		const bool stereoVisual) = 0;
+		const bool stereoVisual, const GHOST_TUns16 numOfAASamples=0) = 0;
 
 	/**
 	 * Ends full screen mode.

Modified: branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.cpp	2011-08-03 07:08:28 UTC (rev 38969)
+++ branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.cpp	2011-08-03 07:20:07 UTC (rev 38970)
@@ -131,7 +131,7 @@
 
 
 GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
-											 const bool stereoVisual)
+											 const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
 {
 	GHOST_TSuccess success = GHOST_kFailure;
 	GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
@@ -143,7 +143,7 @@
 			success = m_displayManager->setCurrentDisplaySetting(GHOST_DisplayManager::kMainDisplay, setting);
 			if (success == GHOST_kSuccess) {
 				//GHOST_PRINT("GHOST_System::beginFullScreen(): creating full-screen window\n");
-				success = createFullScreenWindow((GHOST_Window**)window, stereoVisual);
+				success = createFullScreenWindow((GHOST_Window**)window, stereoVisual, numOfAASamples);
 				if (success == GHOST_kSuccess) {
 					m_windowManager->beginFullScreen(*window, stereoVisual);
 				}
@@ -336,7 +336,7 @@
 }
 
 
-GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual)
+GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
 {
 	GHOST_TSuccess success;
 	GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
@@ -350,7 +350,8 @@
 					0, 0, settings.xPixels, settings.yPixels,
 					GHOST_kWindowStateFullScreen,
 					GHOST_kDrawingContextTypeOpenGL,
-					stereoVisual);
+					stereoVisual,
+					numOfAASamples);
 		success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess;
 	}
 	return success;

Modified: branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.h
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.h	2011-08-03 07:08:28 UTC (rev 38969)
+++ branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.h	2011-08-03 07:20:07 UTC (rev 38970)
@@ -142,7 +142,7 @@
 	 * @return	Indication of success.
 	 */
 	virtual GHOST_TSuccess beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
-		const bool stereoVisual);
+		const bool stereoVisual, const GHOST_TUns16 numOfAASamples=0);
 
 	/**
 	 * Ends full screen mode.
@@ -323,7 +323,7 @@
 	 * @return Indication of success.
 	 */
 	virtual GHOST_TSuccess createFullScreenWindow(GHOST_Window** window,
-		const bool stereoVisual);
+		const bool stereoVisual, const GHOST_TUns16 numOfAASamples=0);
 
 	/** The display manager (platform dependant). */
 	GHOST_DisplayManager* m_displayManager;

Modified: branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===================================================================
--- branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2011-08-03 07:08:28 UTC (rev 38969)
+++ branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp	2011-08-03 07:20:07 UTC (rev 38970)
@@ -380,7 +380,7 @@
 	setting.bpp = bpp;
 	setting.frequency = frequency;
 
-	fSystem->beginFullScreen(setting, &m_mainWindow, stereoVisual);
+	fSystem->beginFullScreen(setting, &m_mainWindow, stereoVisual, samples);
 	m_mainWindow->setCursorVisibility(false);
 	m_mainWindow->setState(GHOST_kWindowStateFullScreen);