From 30dbf805071992e7471dd1ea167877968415ec55 Mon Sep 17 00:00:00 2001 From: Luhrel Date: Fri, 22 Nov 2019 21:36:20 +0100 Subject: [PATCH] Implements sfTextureCoordinateType with sfTexture_bind --- include/SFML/Graphics/Texture.h | 11 ++++++++++- src/SFML/Graphics/Texture.cpp | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/SFML/Graphics/Texture.h b/include/SFML/Graphics/Texture.h index a0eccea..033b079 100644 --- a/include/SFML/Graphics/Texture.h +++ b/include/SFML/Graphics/Texture.h @@ -36,6 +36,15 @@ #include #include +//////////////////////////////////////////////////////////// +/// \brief Types of texture coordinates that can be used for rendering. +/// +//////////////////////////////////////////////////////////// +typedef enum +{ + sfTextureNormalized, ///< sfTexture coordinates in range [0 .. 1]. + sfTexturePixels ///< sfTexture coordinates in range [0 .. size]. +} sfTextureCoordinateType; //////////////////////////////////////////////////////////// /// \brief Create a new texture @@ -351,7 +360,7 @@ CSFML_GRAPHICS_API unsigned int sfTexture_getNativeHandle(const sfTexture* textu /// \param texture Pointer to the texture to bind, can be null to use no texture /// //////////////////////////////////////////////////////////// -CSFML_GRAPHICS_API void sfTexture_bind(const sfTexture* texture); +CSFML_GRAPHICS_API void sfTexture_bind(const sfTexture* texture, sfTextureCoordinateType type); //////////////////////////////////////////////////////////// /// \brief Get the maximum texture size allowed diff --git a/src/SFML/Graphics/Texture.cpp b/src/SFML/Graphics/Texture.cpp index 9857d17..108d24e 100644 --- a/src/SFML/Graphics/Texture.cpp +++ b/src/SFML/Graphics/Texture.cpp @@ -290,9 +290,9 @@ unsigned int sfTexture_getNativeHandle(const sfTexture* texture) //////////////////////////////////////////////////////////// -void sfTexture_bind(const sfTexture* texture) +void sfTexture_bind(const sfTexture* texture, sfTextureCoordinateType type) { - sf::Texture::bind(texture ? texture->This : NULL); + sf::Texture::bind(texture ? texture->This : NULL, static_cast(type)); }