lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Window::GetPosition, and renamed some setters in Window for better consistency

Browse source
This commit is contained in:
Laurent Gomila 2012-03-07 23:29:54 +01:00
parent 90854907b5
commit 15e9d999b3
26 changed files with 473 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/SFML/Graphics/RenderTarget.hpp
View file

@ -200,24 +200,14 @@ public :
PrimitiveType type, const RenderStates& states = RenderStates::Default);
////////////////////////////////////////////////////////////
/// \brief Return the width of the rendering region of the target
/// \brief Return the size of the rendering region of the target
///
/// \return Width in pixels
/// \return Size in pixels
///
/// \see GetHeight
///
////////////////////////////////////////////////////////////
virtual unsigned int GetWidth() const = 0;
////////////////////////////////////////////////////////////
/// \brief Return the height of the rendering region of the target
///
/// \return Height in pixels
///
/// \see GetWidth
///
////////////////////////////////////////////////////////////
virtual unsigned int GetHeight() const = 0;
virtual Vector2u GetSize() const = 0;
////////////////////////////////////////////////////////////
/// \brief Save the current OpenGL render states and matrices

21
include/SFML/Graphics/RenderTexture.hpp
View file

@ -137,30 +137,15 @@ public :
void Display();
////////////////////////////////////////////////////////////
/// \brief Return the width of the rendering region of the texture
/// \brief Return the size of the rendering region of the texture
///
/// The returned value is the size that you passed to
/// the Create function.
///
/// \return Width in pixels
///
/// \return GetHeight
/// \return Size in pixels
///
////////////////////////////////////////////////////////////
virtual unsigned int GetWidth() const;
////////////////////////////////////////////////////////////
/// \brief Return the height of the rendering region of the texture
///
/// The returned value is the size that you passed to
/// the Create function.
///
/// \return Height in pixels
///
/// \return GetWidth
///
////////////////////////////////////////////////////////////
virtual unsigned int GetHeight() const;
virtual Vector2u GetSize() const;
////////////////////////////////////////////////////////////
/// \brief Get a read-only reference to the target texture

23
include/SFML/Graphics/RenderWindow.hpp
View file

@ -101,30 +101,15 @@ public :
virtual ~RenderWindow();
////////////////////////////////////////////////////////////
/// \brief Get the width of the rendering region of the window
/// \brief Get the size of the rendering region of the window
///
/// The width doesn't include the titlebar and borders
/// The size doesn't include the titlebar and borders
/// of the window.
///
/// \return Width in pixels
///
/// \see GetHeight
/// \return Size in pixels
///
////////////////////////////////////////////////////////////
virtual unsigned int GetWidth() const;
////////////////////////////////////////////////////////////
/// Get the height of the rendering region of the window
///
/// The height doesn't include the titlebar and borders
/// of the window.
///
/// \return Height in pixels
///
/// \see GetWidth
///
////////////////////////////////////////////////////////////
virtual unsigned int GetHeight() const;
virtual Vector2u GetSize() const;
////////////////////////////////////////////////////////////
/// \brief Copy the current contents of the window to an image