Skip to content

Fix new SFML 3 build error #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisThrasher merged 1 commit into from
Aug 8, 2023
Merged

Fix new SFML 3 build error #250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions imgui-SFML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,13 +984,16 @@ void Image(const sf::Sprite& sprite, const sf::Color& tintColor, const sf::Color

void Image(const sf::Sprite& sprite, const sf::Vector2f& size, const sf::Color& tintColor,
const sf::Color& borderColor) {
#if SFML_VERSION_MAJOR >= 3
const sf::Texture& texture = sprite.getTexture();
#else
const sf::Texture* texturePtr = sprite.getTexture();
// sprite without texture cannot be drawn
if (!texturePtr) {
return;
}

const sf::Texture& texture = *texturePtr;
#endif
sf::Vector2f textureSize = static_cast<sf::Vector2f>(texture.getSize());
const sf::IntRect& textureRect = sprite.getTextureRect();
ImVec2 uv0(textureRect.left / textureSize.x, textureRect.top / textureSize.y);
Expand Down Expand Up @@ -1049,13 +1052,16 @@ bool ImageButton(const sf::Sprite& sprite, const int framePadding, const sf::Col

bool ImageButton(const sf::Sprite& sprite, const sf::Vector2f& size, const int framePadding,
const sf::Color& bgColor, const sf::Color& tintColor) {
#if SFML_VERSION_MAJOR >= 3
const sf::Texture& texture = sprite.getTexture();
#else
const sf::Texture* texturePtr = sprite.getTexture();
// sprite without texture cannot be drawn
if (!texturePtr) {
return false;
}

const sf::Texture& texture = *texturePtr;
#endif
sf::Vector2f textureSize = static_cast<sf::Vector2f>(texture.getSize());
const sf::IntRect& textureRect = sprite.getTextureRect();
ImVec2 uv0(textureRect.left / textureSize.x, textureRect.top / textureSize.y);
Expand Down