[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24099] trunk/blender/source/gameengine: added SetDisplayArea, GetDisplayArea was used in a confusing way

[Campbell Barton]

Revision: 24099
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24099
Author:   campbellbarton
Date:     2009-10-26 23:33:43 +0100 (Mon, 26 Oct 2009)

Log Message:
-----------
added SetDisplayArea, GetDisplayArea was used in a confusing way

Modified Paths:
--------------
    trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h	2009-10-26 19:54:55 UTC (rev 24098)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h	2009-10-26 22:33:43 UTC (rev 24099)
@@ -116,10 +116,10 @@
 		return m_displayarea;
 	};
 
-		RAS_Rect &
-	GetDisplayArea(
+		void
+	SetDisplayArea(RAS_Rect *rect
 	) {
-		return m_displayarea;
+		m_displayarea= *rect;
 	};
 
 		RAS_Rect &

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h	2009-10-26 19:54:55 UTC (rev 24098)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_ICanvas.h	2009-10-26 22:33:43 UTC (rev 24099)
@@ -135,9 +135,9 @@
 	GetDisplayArea(
 	) const = 0;
 
-	virtual 
-		RAS_Rect &
-	GetDisplayArea(
+	virtual
+		void
+	SetDisplayArea(RAS_Rect *rect
 	) = 0;
 
 	/**

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2009-10-26 19:54:55 UTC (rev 24098)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2009-10-26 22:33:43 UTC (rev 24099)
@@ -386,6 +386,7 @@
 
 void RAS_OpenGLRasterizer::SetRenderArea()
 {
+	RAS_Rect area;
 	// only above/below stereo method needs viewport adjustment
 	switch (m_stereomode)
 	{
@@ -394,19 +395,21 @@
 			{
 				case RAS_STEREO_LEFTEYE:
 					// upper half of window
-					m_2DCanvas->GetDisplayArea().SetLeft(0);
-					m_2DCanvas->GetDisplayArea().SetBottom(m_2DCanvas->GetHeight() -
+					area.SetLeft(0);
+					area.SetBottom(m_2DCanvas->GetHeight() -
 						int(m_2DCanvas->GetHeight() - m_noOfScanlines) / 2);
 	
-					m_2DCanvas->GetDisplayArea().SetRight(int(m_2DCanvas->GetWidth()));
-					m_2DCanvas->GetDisplayArea().SetTop(int(m_2DCanvas->GetHeight()));
+					area.SetRight(int(m_2DCanvas->GetWidth()));
+					area.SetTop(int(m_2DCanvas->GetHeight()));
+					m_2DCanvas->SetDisplayArea(&area);
 					break;
 				case RAS_STEREO_RIGHTEYE:
 					// lower half of window
-					m_2DCanvas->GetDisplayArea().SetLeft(0);
-					m_2DCanvas->GetDisplayArea().SetBottom(0);
-					m_2DCanvas->GetDisplayArea().SetRight(int(m_2DCanvas->GetWidth()));
-					m_2DCanvas->GetDisplayArea().SetTop(int(m_2DCanvas->GetHeight() - m_noOfScanlines) / 2);
+					area.SetLeft(0);
+					area.SetBottom(0);
+					area.SetRight(int(m_2DCanvas->GetWidth()));
+					area.SetTop(int(m_2DCanvas->GetHeight() - m_noOfScanlines) / 2);
+					m_2DCanvas->SetDisplayArea(&area);
 					break;
 			}
 			break;
@@ -415,26 +418,29 @@
 			{
 				case RAS_STEREO_LEFTEYE:
 					// Left half of window
-					m_2DCanvas->GetDisplayArea().SetLeft(0);
-					m_2DCanvas->GetDisplayArea().SetBottom(0);
-					m_2DCanvas->GetDisplayArea().SetRight(m_2DCanvas->GetWidth()/2);
-					m_2DCanvas->GetDisplayArea().SetTop(m_2DCanvas->GetHeight());
+					area.SetLeft(0);
+					area.SetBottom(0);
+					area.SetRight(m_2DCanvas->GetWidth()/2);
+					area.SetTop(m_2DCanvas->GetHeight());
+					m_2DCanvas->SetDisplayArea(&area);
 					break;
 				case RAS_STEREO_RIGHTEYE:
 					// Right half of window
-					m_2DCanvas->GetDisplayArea().SetLeft(m_2DCanvas->GetWidth()/2);
-					m_2DCanvas->GetDisplayArea().SetBottom(0);
-					m_2DCanvas->GetDisplayArea().SetRight(m_2DCanvas->GetWidth());
-					m_2DCanvas->GetDisplayArea().SetTop(m_2DCanvas->GetHeight());
+					area.SetLeft(m_2DCanvas->GetWidth()/2);
+					area.SetBottom(0);
+					area.SetRight(m_2DCanvas->GetWidth());
+					area.SetTop(m_2DCanvas->GetHeight());
+					m_2DCanvas->SetDisplayArea(&area);
 					break;
 			}
 			break;
 		default:
 			// every available pixel
-			m_2DCanvas->GetDisplayArea().SetLeft(0);
-			m_2DCanvas->GetDisplayArea().SetBottom(0);
-			m_2DCanvas->GetDisplayArea().SetRight(int(m_2DCanvas->GetWidth()));
-			m_2DCanvas->GetDisplayArea().SetTop(int(m_2DCanvas->GetHeight()));
+			area.SetLeft(0);
+			area.SetBottom(0);
+			area.SetRight(int(m_2DCanvas->GetWidth()));
+			area.SetTop(int(m_2DCanvas->GetHeight()));
+			m_2DCanvas->SetDisplayArea(&area);
 			break;
 	}
 }