[Supertuxkart-commit] SF.net SVN: supertuxkart:[4260] main/branches/irrlicht/src/graphics/camera. cpp

[<au...@us...>]

Revision: 4260
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4260&view=rev
Author:   auria
Date:     2009-12-06 18:17:10 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
Fixed 4-player split-screen (Seems like Hiker loves ternary operators; but they made it totally unobvious that screen width was used to compute viewport y ;) )

Modified Paths:
--------------
    main/branches/irrlicht/src/graphics/camera.cpp

Modified: main/branches/irrlicht/src/graphics/camera.cpp
===================================================================
--- main/branches/irrlicht/src/graphics/camera.cpp	2009-12-06 17:56:41 UTC (rev 4259)
+++ main/branches/irrlicht/src/graphics/camera.cpp	2009-12-06 18:17:10 UTC (rev 4260)
@@ -87,7 +87,6 @@
             m_fov      = DEGREE_TO_RAD*65.0f;
             break;
     case 3: 
-            /*
             if(m_index<2)
             {
                 m_viewport = core::recti(m_index==0 ? 0 
@@ -108,15 +107,15 @@
                 m_fov      = DEGREE_TO_RAD*65.0f;
                 m_aspect  *= 2.0f;
             }
-            break;*/
-    case 4: m_viewport = core::recti(m_index%2==0 ? 0
-                                                  : UserConfigParams::m_width>>1,
-                                     m_index<2    ? 0 
-                                                  : UserConfigParams::m_width>>1,
-                                     m_index%2==0 ? UserConfigParams::m_width>>1
-                                                  : UserConfigParams::m_width, 
-                                     m_index<2    ? UserConfigParams::m_height>>1
-                                                  : UserConfigParams::m_height);
+            break;
+    case 4:
+            const int x1 = (m_index%2==0 ? 0 : UserConfigParams::m_width>>1);
+            const int y1 = (m_index<2    ? 0 : UserConfigParams::m_height>>1);
+            const int x2 = (m_index%2==0 ? UserConfigParams::m_width>>1  : UserConfigParams::m_width);
+            const int y2 = (m_index<2    ? UserConfigParams::m_height>>1 : UserConfigParams::m_height);
+            m_viewport = core::recti(x1, y1, x2, y2);
+            std::cout << "Viewport : " << m_viewport.UpperLeftCorner.X << ", " << m_viewport.UpperLeftCorner.Y << "; size : "
+                      << m_viewport.getWidth() << "x" << m_viewport.getHeight() << "\n";
             m_scaling  = core::vector2df(0.5f, 0.5f);
             m_fov      = DEGREE_TO_RAD*50.0f;
             break;
@@ -126,7 +125,7 @@
                                      UserConfigParams::m_width, 
                                      UserConfigParams::m_height);
             m_scaling  = core::vector2df(1.0f, 1.0f);
-            m_fov      = DEGREE_TO_RAD*65.0f;
+            m_fov      = DEGREE_TO_RAD*75.0f;
             break;
     }   // switch
     m_camera->setFOV(m_fov);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.