Skip to content

refactor: fix conversion warnings on Clang #245

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
oprypin merged 4 commits into from
Aug 8, 2023
Merged

refactor: fix conversion warnings on Clang #245

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52e5d96
refactor: fix conversion warnings on Clang
JohelEGP Jul 28, 2023
f2b20b6
refactor: use direct construction
JohelEGP Jul 30, 2023
8bb1e22
Merge remote-tracking branch 'origin/master' into clang_conversion_wa…
oprypin Aug 8, 2023
b5a390f
Another fix
oprypin Aug 8, 2023
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
29 changes: 17 additions & 12 deletions imgui-SFML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,12 @@ void ProcessEvent(const sf::Event& event) {
if (s_currWindowCtx->windowHasFocus) {
switch (event.type) {
case sf::Event::Resized:
io.DisplaySize = ImVec2(event.size.width, event.size.height);
io.DisplaySize =
ImVec2(static_cast<float>(event.size.width), static_cast<float>(event.size.height));
break;
case sf::Event::MouseMoved:
io.AddMousePosEvent(event.mouseMove.x, event.mouseMove.y);
io.AddMousePosEvent(static_cast<float>(event.mouseMove.x),
static_cast<float>(event.mouseMove.y));
s_currWindowCtx->mouseMoved = true;
break;
case sf::Event::MouseButtonPressed: // fall-through
Expand Down Expand Up @@ -804,11 +806,12 @@ bool UpdateFontTexture() {

sf::Texture& texture = s_currWindowCtx->fontTexture;
#if SFML_VERSION_MAJOR >= 3
if (!texture.create(sf::Vector2u(width, height))) {
if (!texture.create(
sf::Vector2u(static_cast<unsigned>(width), static_cast<unsigned>(height)))) {
return false;
}
#else
if (!texture.create(width, height)) {
if (!texture.create(static_cast<unsigned>(width), static_cast<unsigned>(height))) {
return false;
}
#endif
Expand Down Expand Up @@ -994,8 +997,8 @@ void Image(const sf::Sprite& sprite, const sf::Vector2f& size, const sf::Color&
}
const sf::Texture& texture = *texturePtr;
#endif
sf::Vector2f textureSize = static_cast<sf::Vector2f>(texture.getSize());
const sf::IntRect& textureRect = sprite.getTextureRect();
const sf::Vector2f textureSize(texture.getSize());
const sf::FloatRect textureRect(sprite.getTextureRect());
ImVec2 uv0(textureRect.left / textureSize.x, textureRect.top / textureSize.y);
ImVec2 uv1((textureRect.left + textureRect.width) / textureSize.x,
(textureRect.top + textureRect.height) / textureSize.y);
Expand Down Expand Up @@ -1062,8 +1065,8 @@ bool ImageButton(const sf::Sprite& sprite, const sf::Vector2f& size, const int f
}
const sf::Texture& texture = *texturePtr;
#endif
sf::Vector2f textureSize = static_cast<sf::Vector2f>(texture.getSize());
const sf::IntRect& textureRect = sprite.getTextureRect();
const sf::Vector2f textureSize(texture.getSize());
const sf::FloatRect textureRect(sprite.getTextureRect());
ImVec2 uv0(textureRect.left / textureSize.x, textureRect.top / textureSize.y);
ImVec2 uv1((textureRect.left + textureRect.width) / textureSize.x,
(textureRect.top + textureRect.height) / textureSize.y);
Expand Down Expand Up @@ -1249,10 +1252,11 @@ void RenderDrawLists(ImDrawData* draw_data) {
clip_rect.z = (pcmd->ClipRect.z - clip_off.x) * clip_scale.x;
clip_rect.w = (pcmd->ClipRect.w - clip_off.y) * clip_scale.y;

if (clip_rect.x < fb_width && clip_rect.y < fb_height && clip_rect.z >= 0.0f &&
if (clip_rect.x < static_cast<float>(fb_width) &&
clip_rect.y < static_cast<float>(fb_height) && clip_rect.z >= 0.0f &&
clip_rect.w >= 0.0f) {
// Apply scissor/clipping rectangle
glScissor((int)clip_rect.x, (int)(fb_height - clip_rect.w),
glScissor((int)clip_rect.x, (int)(static_cast<float>(fb_height) - clip_rect.w),
(int)(clip_rect.z - clip_rect.x), (int)(clip_rect.w - clip_rect.y));

// Bind texture, Draw
Expand Down Expand Up @@ -1282,7 +1286,7 @@ void RenderDrawLists(ImDrawData* draw_data) {
(GLsizei)last_viewport[3]);
glScissor(last_scissor_box[0], last_scissor_box[1], (GLsizei)last_scissor_box[2],
(GLsizei)last_scissor_box[3]);
glShadeModel(last_shade_model);
glShadeModel((GLenum)last_shade_model);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, last_tex_env_mode);

#ifdef GL_VERSION_ES_CL_1_1
Expand Down Expand Up @@ -1338,7 +1342,8 @@ void updateJoystickButtonState(ImGuiIO& io) {
for (int i = 0; i < static_cast<int>(sf::Joystick::ButtonCount); ++i) {
ImGuiKey key = s_currWindowCtx->joystickMapping[i];
if (key != ImGuiKey_None) {
bool isPressed = sf::Joystick::isButtonPressed(s_currWindowCtx->joystickId, i);
bool isPressed = sf::Joystick::isButtonPressed(s_currWindowCtx->joystickId,
static_cast<unsigned>(i));
if (s_currWindowCtx->windowHasFocus || !isPressed) {
io.AddKeyEvent(key, isPressed);
}
Expand Down