Merging r41937 through r42061 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Nov 2011 14:04:34 +0000 (14:04 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Nov 2011 14:04:34 +0000 (14:04 +0000)
extern/libmv/libmv/numeric/tinyvector.cc [new file with mode: 0644]
extern/libmv/third_party/ssba/README.libmv [changed mode: 0644->0755]
intern/ghost/intern/GHOST_System.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp

diff --git a/extern/libmv/libmv/numeric/tinyvector.cc b/extern/libmv/libmv/numeric/tinyvector.cc
new file mode 100644 (file)
index 0000000..e69de29
old mode 100644 (file)
new mode 100755 (executable)
index 839e014..afc54d3 100644 (file)
@@ -136,7 +136,7 @@ bool GHOST_System::validWindow(GHOST_IWindow* window)
 
 
 GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
-                                                                                        const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
+                                                                                        const bool stereoVisual)
 {
        GHOST_TSuccess success = GHOST_kFailure;
        GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
@@ -148,7 +148,7 @@ GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting
                        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, numOfAASamples);
+                               success = createFullScreenWindow((GHOST_Window**)window, stereoVisual);
                                if (success == GHOST_kSuccess) {
                                        m_windowManager->beginFullScreen(*window, stereoVisual);
                                }
@@ -330,7 +330,7 @@ GHOST_TSuccess GHOST_System::exit()
 }
 
 
-GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual, const GHOST_TUns16 numOfAASamples)
+GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual)
 {
        GHOST_TSuccess success;
        GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
@@ -344,8 +344,7 @@ GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const
                                        0, 0, settings.xPixels, settings.yPixels,
                                        GHOST_kWindowStateFullScreen,
                                        GHOST_kDrawingContextTypeOpenGL,
-                                       stereoVisual,
-                                       numOfAASamples);
+                                       stereoVisual);
                success = *window == 0 ? GHOST_kFailure : GHOST_kSuccess;
        }
        return success;
index b1781f1..140dbad 100644 (file)
@@ -365,7 +365,6 @@ int main(int argc, char** argv)
        GHOST_TEmbedderWindowID parentWindow = 0;
        bool isBlenderPlayer = false;
        int validArguments=0;
-       bool samplesParFound = false;
        GHOST_TUns16 aasamples = 0;
        
 #ifdef __linux__
@@ -407,8 +406,6 @@ int main(int argc, char** argv)
        
        initglobals();
 
-       // Blender's VBOs cause odd problems with modifiers (we have our own vbo code)
-       U.gameflags |= USER_DISABLE_VBO;
        // We load our own G.main, so free the one that initglobals() gives us
        free_main(G.main);
        G.main = NULL;
@@ -584,14 +581,8 @@ int main(int argc, char** argv)
                                break;
                        case 'm':
                                i++;
-                               samplesParFound = true;
                                if ((i+1) <= validArguments )
-                                       aasamples = atoi(argv[i++]);
-                               else
-                               {
-                                       error = true;
-                                       printf("error: No argument supplied for -m");
-                               }
+                               aasamples = atoi(argv[i++]);
                                break;
                        case 'c':
                                i++;
@@ -827,7 +818,7 @@ int main(int argc, char** argv)
                                                if ((!fullScreenParFound) && (!windowParFound))
                                                {
                                                        // Only use file settings when command line did not override
-                                                       if ((scene->gm.playerflag & GAME_PLAYER_FULLSCREEN)) {
+                                                       if (scene->gm.fullscreen) {
                                                                //printf("fullscreen option found in Blender file\n");
                                                                fullScreen = true;
                                                                fullScreenWidth= scene->gm.xplay;
@@ -856,9 +847,6 @@ int main(int argc, char** argv)
                                                else
                                                        scene->gm.stereoflag = STEREO_ENABLED;
 
-                                               if (!samplesParFound)
-                                                       aasamples = scene->gm.aasamples;
-
                                                if (stereoFlag == STEREO_DOME){
                                                        stereomode = RAS_IRasterizer::RAS_STEREO_DOME;
                                                        scene->gm.stereoflag = STEREO_DOME;
@@ -904,7 +892,7 @@ int main(int argc, char** argv)
 #endif
                                                                {
                                                                        app.startFullScreen(fullScreenWidth, fullScreenHeight, fullScreenBpp, fullScreenFrequency,
-                                                                               stereoWindow, stereomode, aasamples, (scene->gm.playerflag & GAME_PLAYER_DESKTOP_RESOLUTION));
+                                                                               stereoWindow, stereomode, aasamples);
                                                                }
                                                        }
                                                        else