kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

added SetDisplayArea, GetDisplayArea was used in a confusing way

Browse Source
This commit is contained in:
Campbell Barton 2009-10-26 22:33:43 +00:00
parent 5d333f72c3
commit 839ac92f65
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
View File

@ -116,10 +116,10 @@ public:
return m_displayarea;
};
RAS_Rect &
GetDisplayArea(
void
SetDisplayArea(RAS_Rect *rect
) {
return m_displayarea;
m_displayarea= *rect;
};
RAS_Rect &

6
source/gameengine/Rasterizer/RAS_ICanvas.h
View File

@ -135,9 +135,9 @@ public:
GetDisplayArea(
) const = 0;
virtual
RAS_Rect &
GetDisplayArea(
virtual
void
SetDisplayArea(RAS_Rect *rect
) = 0;
/**

46
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -386,6 +386,7 @@ void RAS_OpenGLRasterizer::EndFrame()
void RAS_OpenGLRasterizer::SetRenderArea()
{
RAS_Rect area;
// only above/below stereo method needs viewport adjustment
switch (m_stereomode)
{
@ -394,19 +395,21 @@ void RAS_OpenGLRasterizer::SetRenderArea()
{
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 @@ void RAS_OpenGLRasterizer::SetRenderArea()
{
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;
}
}