Fixed RenderTarget::ConvertCoords returning wrong Y coordinates
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1410 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
47d019098c
commit
504804a06e
5 changed files with 21 additions and 11 deletions
|
@ -28,7 +28,6 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/System/NonCopyable.hpp>
|
||||
#include <SFML/Graphics/Image.hpp>
|
||||
#include <SFML/Graphics/RenderTarget.hpp>
|
||||
|
||||
|
@ -44,7 +43,7 @@ namespace priv
|
|||
/// Target for 2D rendering into an image that can be reused
|
||||
/// in a sprite
|
||||
////////////////////////////////////////////////////////////
|
||||
class SFML_API RenderImage : public RenderTarget, NonCopyable
|
||||
class SFML_API RenderImage : public RenderTarget
|
||||
{
|
||||
public :
|
||||
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
////////////////////////////////////////////////////////////
|
||||
// Headers
|
||||
////////////////////////////////////////////////////////////
|
||||
#include <SFML/System/NonCopyable.hpp>
|
||||
#include <SFML/Graphics/Color.hpp>
|
||||
#include <SFML/Graphics/Rect.hpp>
|
||||
#include <SFML/Graphics/Renderer.hpp>
|
||||
|
@ -42,7 +43,7 @@ class Shader;
|
|||
////////////////////////////////////////////////////////////
|
||||
/// Base class for all render targets (window, image, ...)
|
||||
////////////////////////////////////////////////////////////
|
||||
class SFML_API RenderTarget
|
||||
class SFML_API RenderTarget : NonCopyable
|
||||
{
|
||||
public :
|
||||
|
||||
|
|
|
@ -63,10 +63,12 @@ public :
|
|||
public :
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Default constructor
|
||||
/// \brief Construct the renderer with its owner render target
|
||||
///
|
||||
/// \param target Owner render target
|
||||
///
|
||||
////////////////////////////////////////////////////////////
|
||||
Renderer();
|
||||
Renderer(RenderTarget& target);
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
/// \brief Destructor
|
||||
|
@ -347,6 +349,7 @@ private :
|
|||
////////////////////////////////////////////////////////////
|
||||
// Member data
|
||||
////////////////////////////////////////////////////////////
|
||||
RenderTarget& myTarget; ///< Reference to the render target owning this renderer
|
||||
States myStatesStack[64]; ///< Stack of render states
|
||||
States* myStates; ///< Current set of render states
|
||||
const Image* myTexture; ///< Current texture
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue