Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed rectangle bug in Image::CopyScreen

Browse Source
This commit is contained in:
Laurent Gomila 2011-07-11 23:42:32 +02:00
parent e46016a79d
commit 61adc51d09
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/SFML/Graphics/Image.cpp
View File

@ -318,30 +318,31 @@ void Image::Copy(const Image& source, unsigned int destX, unsigned int destY, co
bool Image::CopyScreen(RenderWindow& window, const IntRect& sourceRect) bool Image::CopyScreen(RenderWindow& window, const IntRect& sourceRect)
{ {
// Adjust the source rectangle // Adjust the source rectangle
IntRect srcRect = sourceRect; IntRect rect = sourceRect;
if (srcRect.Width == 0 || (srcRect.Height == 0)) if (rect.Width == 0 || (rect.Height == 0))
{ {
srcRect.Left = 0; rect.Left = 0;
srcRect.Top = 0; rect.Top = 0;
srcRect.Width = window.GetWidth(); rect.Width = window.GetWidth();
srcRect.Height = window.GetHeight(); rect.Height = window.GetHeight();
} }
else else
{ {
if (srcRect.Left < 0) srcRect.Left = 0; if (rect.Left < 0) rect.Left = 0;
if (srcRect.Top < 0) srcRect.Top = 0; if (rect.Top < 0) rect.Top = 0;
if (srcRect.Width > static_cast<int>(window.GetWidth())) srcRect.Width = window.GetWidth(); if (rect.Width > static_cast<int>(window.GetWidth())) rect.Width = window.GetWidth();
if (srcRect.Height > static_cast<int>(window.GetHeight())) srcRect.Height = window.GetHeight(); if (rect.Height > static_cast<int>(window.GetHeight())) rect.Height = window.GetHeight();
} }
// We can then create the texture // We can then create the texture
if (window.SetActive() && CreateTexture(srcRect.Width, srcRect.Height)) if (window.SetActive() && CreateTexture(rect.Width, rect.Height))
{ {
GLint previous; GLint previous;
GLCheck(glGetIntegerv(GL_TEXTURE_BINDING_2D, &previous)); GLCheck(glGetIntegerv(GL_TEXTURE_BINDING_2D, &previous));
GLCheck(glBindTexture(GL_TEXTURE_2D, myTexture)); GLCheck(glBindTexture(GL_TEXTURE_2D, myTexture));
GLCheck(glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, srcRect.Left, srcRect.Top, myWidth, myHeight)); int y = window.GetHeight() - (rect.Top + rect.Height); // Y axis is inverted
GLCheck(glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rect.Left, y, myWidth, myHeight));
GLCheck(glBindTexture(GL_TEXTURE_2D, previous)); GLCheck(glBindTexture(GL_TEXTURE_2D, previous));