admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-27 13:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pass by reference if it is never null

Browse Source 
sfEvent was not checked for null and was assumed to be non null in convertEvent so I made it a reference to reflect that
This commit is contained in:
ZXShady authored and Chris Thrasher committed 2024-10-03 10:42:15 -06:00
1 parent 556ca510d4
commit cc92ca36b7
4 files changed
+70 -70
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/CSFML/Graphics/RenderWindow.cpp
+2 -2
View File
@@ -145,7 +145,7 @@ bool sfRenderWindow_pollEvent(sfRenderWindow* renderWindow, sfEvent* event)
{ {
assert(renderWindow); assert(renderWindow);
assert(event); assert(event);
return convertEvent(renderWindow->pollEvent(), event); return convertEvent(renderWindow->pollEvent(), *event);
} }
@@ -154,7 +154,7 @@ bool sfRenderWindow_waitEvent(sfRenderWindow* renderWindow, sfTime timeout, sfEv
{ {
assert(renderWindow); assert(renderWindow);
assert(event); assert(event);
return convertEvent(renderWindow->waitEvent(sf::microseconds(timeout.microseconds)), event); return convertEvent(renderWindow->waitEvent(sf::microseconds(timeout.microseconds)), *event);
} }
src/CSFML/Window/ConvertEvent.hpp
+64 -64
View File
@@ -39,142 +39,142 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Convert sf::Event to sfEvent // Convert sf::Event to sfEvent
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
[[nodiscard]] inline bool convertEvent(const std::optional<sf::Event>& sfmlEvent, sfEvent* event) [[nodiscard]] inline bool convertEvent(const std::optional<sf::Event>& sfmlEvent, sfEvent& event)
{ {
if (!sfmlEvent) if (!sfmlEvent)
return false; return false;
if (sfmlEvent->is<sf::Event::Closed>()) if (sfmlEvent->is<sf::Event::Closed>())
{ {
event->type = sfEvtClosed; event.type = sfEvtClosed;
} }
else if (const auto* resized = sfmlEvent->getIf<sf::Event::Resized>()) else if (const auto* resized = sfmlEvent->getIf<sf::Event::Resized>())
{ {
event->type = sfEvtResized; event.type = sfEvtResized;
event->size.size = convertVector2(resized->size); event.size.size = convertVector2(resized->size);
} }
else if (sfmlEvent->is<sf::Event::FocusLost>()) else if (sfmlEvent->is<sf::Event::FocusLost>())
{ {
event->type = sfEvtFocusLost; event.type = sfEvtFocusLost;
} }
else if (sfmlEvent->is<sf::Event::FocusGained>()) else if (sfmlEvent->is<sf::Event::FocusGained>())
{ {
event->type = sfEvtFocusGained; event.type = sfEvtFocusGained;
} }
else if (const auto* textEntered = sfmlEvent->getIf<sf::Event::TextEntered>()) else if (const auto* textEntered = sfmlEvent->getIf<sf::Event::TextEntered>())
{ {
event->type = sfEvtTextEntered; event.type = sfEvtTextEntered;
event->text.unicode = textEntered->unicode; event.text.unicode = textEntered->unicode;
} }
else if (const auto* keyReleased = sfmlEvent->getIf<sf::Event::KeyReleased>()) else if (const auto* keyReleased = sfmlEvent->getIf<sf::Event::KeyReleased>())
{ {
event->type = sfEvtKeyReleased; event.type = sfEvtKeyReleased;
event->key.code = static_cast<sfKeyCode>(keyReleased->code); event.key.code = static_cast<sfKeyCode>(keyReleased->code);
event->key.scancode = static_cast<sfScancode>(keyReleased->scancode); event.key.scancode = static_cast<sfScancode>(keyReleased->scancode);
event->key.alt = keyReleased->alt; event.key.alt = keyReleased->alt;
event->key.control = keyReleased->control; event.key.control = keyReleased->control;
event->key.shift = keyReleased->shift; event.key.shift = keyReleased->shift;
event->key.system = keyReleased->system; event.key.system = keyReleased->system;
} }
else if (const auto* keyPressed = sfmlEvent->getIf<sf::Event::KeyPressed>()) else if (const auto* keyPressed = sfmlEvent->getIf<sf::Event::KeyPressed>())
{ {
event->type = sfEvtKeyPressed; event.type = sfEvtKeyPressed;
event->key.code = static_cast<sfKeyCode>(keyPressed->code); event.key.code = static_cast<sfKeyCode>(keyPressed->code);
event->key.scancode = static_cast<sfScancode>(keyPressed->scancode); event.key.scancode = static_cast<sfScancode>(keyPressed->scancode);
event->key.alt = keyPressed->alt; event.key.alt = keyPressed->alt;
event->key.control = keyPressed->control; event.key.control = keyPressed->control;
event->key.shift = keyPressed->shift; event.key.shift = keyPressed->shift;
event->key.system = keyPressed->system; event.key.system = keyPressed->system;
} }
else if (const auto* mouseWheelScrolled = sfmlEvent->getIf<sf::Event::MouseWheelScrolled>()) else if (const auto* mouseWheelScrolled = sfmlEvent->getIf<sf::Event::MouseWheelScrolled>())
{ {
event->type = sfEvtMouseWheelScrolled; event.type = sfEvtMouseWheelScrolled;
event->mouseWheelScroll.wheel = static_cast<sfMouseWheel>(mouseWheelScrolled->wheel); event.mouseWheelScroll.wheel = static_cast<sfMouseWheel>(mouseWheelScrolled->wheel);
event->mouseWheelScroll.delta = mouseWheelScrolled->delta; event.mouseWheelScroll.delta = mouseWheelScrolled->delta;
event->mouseWheelScroll.position = convertVector2(mouseWheelScrolled->position); event.mouseWheelScroll.position = convertVector2(mouseWheelScrolled->position);
} }
else if (const auto* mouseButtonPressed = sfmlEvent->getIf<sf::Event::MouseButtonPressed>()) else if (const auto* mouseButtonPressed = sfmlEvent->getIf<sf::Event::MouseButtonPressed>())
{ {
event->type = sfEvtMouseButtonPressed; event.type = sfEvtMouseButtonPressed;
event->mouseButton.button = static_cast<sfMouseButton>(mouseButtonPressed->button); event.mouseButton.button = static_cast<sfMouseButton>(mouseButtonPressed->button);
event->mouseButton.position = convertVector2(mouseButtonPressed->position); event.mouseButton.position = convertVector2(mouseButtonPressed->position);
} }
else if (const auto* mouseButtonReleased = sfmlEvent->getIf<sf::Event::MouseButtonReleased>()) else if (const auto* mouseButtonReleased = sfmlEvent->getIf<sf::Event::MouseButtonReleased>())
{ {
event->type = sfEvtMouseButtonReleased; event.type = sfEvtMouseButtonReleased;
event->mouseButton.button = static_cast<sfMouseButton>(mouseButtonReleased->button); event.mouseButton.button = static_cast<sfMouseButton>(mouseButtonReleased->button);
event->mouseButton.position = convertVector2(mouseButtonReleased->position); event.mouseButton.position = convertVector2(mouseButtonReleased->position);
} }
else if (const auto* mouseMoved = sfmlEvent->getIf<sf::Event::MouseMoved>()) else if (const auto* mouseMoved = sfmlEvent->getIf<sf::Event::MouseMoved>())
{ {
event->type = sfEvtMouseMoved; event.type = sfEvtMouseMoved;
event->mouseMove.position = convertVector2(mouseMoved->position); event.mouseMove.position = convertVector2(mouseMoved->position);
} }
else if (const auto* mouseMovedRaw = sfmlEvent->getIf<sf::Event::MouseMovedRaw>()) else if (const auto* mouseMovedRaw = sfmlEvent->getIf<sf::Event::MouseMovedRaw>())
{ {
event->type = sfEvtMouseMovedRaw; event.type = sfEvtMouseMovedRaw;
event->mouseMoveRaw.delta = convertVector2(mouseMovedRaw->delta); event.mouseMoveRaw.delta = convertVector2(mouseMovedRaw->delta);
} }
else if (sfmlEvent->is<sf::Event::MouseEntered>()) else if (sfmlEvent->is<sf::Event::MouseEntered>())
{ {
event->type = sfEvtMouseEntered; event.type = sfEvtMouseEntered;
} }
else if (sfmlEvent->is<sf::Event::MouseLeft>()) else if (sfmlEvent->is<sf::Event::MouseLeft>())
{ {
event->type = sfEvtMouseLeft; event.type = sfEvtMouseLeft;
} }
else if (const auto* joystickButtonPressed = sfmlEvent->getIf<sf::Event::JoystickButtonPressed>()) else if (const auto* joystickButtonPressed = sfmlEvent->getIf<sf::Event::JoystickButtonPressed>())
{ {
event->type = sfEvtJoystickButtonPressed; event.type = sfEvtJoystickButtonPressed;
event->joystickButton.joystickId = joystickButtonPressed->joystickId; event.joystickButton.joystickId = joystickButtonPressed->joystickId;
event->joystickButton.button = joystickButtonPressed->button; event.joystickButton.button = joystickButtonPressed->button;
} }
else if (const auto* joystickButtonReleased = sfmlEvent->getIf<sf::Event::JoystickButtonReleased>()) else if (const auto* joystickButtonReleased = sfmlEvent->getIf<sf::Event::JoystickButtonReleased>())
{ {
event->type = sfEvtJoystickButtonReleased; event.type = sfEvtJoystickButtonReleased;
event->joystickButton.joystickId = joystickButtonReleased->joystickId; event.joystickButton.joystickId = joystickButtonReleased->joystickId;
event->joystickButton.button = joystickButtonReleased->button; event.joystickButton.button = joystickButtonReleased->button;
} }
else if (const auto* joystickMoved = sfmlEvent->getIf<sf::Event::JoystickMoved>()) else if (const auto* joystickMoved = sfmlEvent->getIf<sf::Event::JoystickMoved>())
{ {
event->type = sfEvtJoystickMoved; event.type = sfEvtJoystickMoved;
event->joystickMove.joystickId = joystickMoved->joystickId; event.joystickMove.joystickId = joystickMoved->joystickId;
event->joystickMove.axis = static_cast<sfJoystickAxis>(joystickMoved->axis); event.joystickMove.axis = static_cast<sfJoystickAxis>(joystickMoved->axis);
event->joystickMove.position = joystickMoved->position; event.joystickMove.position = joystickMoved->position;
} }
else if (const auto* joystickConnected = sfmlEvent->getIf<sf::Event::JoystickConnected>()) else if (const auto* joystickConnected = sfmlEvent->getIf<sf::Event::JoystickConnected>())
{ {
event->type = sfEvtJoystickConnected; event.type = sfEvtJoystickConnected;
event->joystickConnect.joystickId = joystickConnected->joystickId; event.joystickConnect.joystickId = joystickConnected->joystickId;
} }
else if (const auto* joystickDisconnected = sfmlEvent->getIf<sf::Event::JoystickDisconnected>()) else if (const auto* joystickDisconnected = sfmlEvent->getIf<sf::Event::JoystickDisconnected>())
{ {
event->type = sfEvtJoystickDisconnected; event.type = sfEvtJoystickDisconnected;
event->joystickConnect.joystickId = joystickDisconnected->joystickId; event.joystickConnect.joystickId = joystickDisconnected->joystickId;
} }
else if (const auto* touchBegan = sfmlEvent->getIf<sf::Event::TouchBegan>()) else if (const auto* touchBegan = sfmlEvent->getIf<sf::Event::TouchBegan>())
{ {
event->type = sfEvtTouchBegan; event.type = sfEvtTouchBegan;
event->touch.finger = touchBegan->finger; event.touch.finger = touchBegan->finger;
event->touch.position = convertVector2(touchBegan->position); event.touch.position = convertVector2(touchBegan->position);
} }
else if (const auto* touchMoved = sfmlEvent->getIf<sf::Event::TouchMoved>()) else if (const auto* touchMoved = sfmlEvent->getIf<sf::Event::TouchMoved>())
{ {
event->type = sfEvtTouchMoved; event.type = sfEvtTouchMoved;
event->touch.finger = touchMoved->finger; event.touch.finger = touchMoved->finger;
event->touch.position = convertVector2(touchMoved->position); event.touch.position = convertVector2(touchMoved->position);
} }
else if (const auto* touchEnded = sfmlEvent->getIf<sf::Event::TouchEnded>()) else if (const auto* touchEnded = sfmlEvent->getIf<sf::Event::TouchEnded>())
{ {
event->type = sfEvtTouchEnded; event.type = sfEvtTouchEnded;
event->touch.finger = touchEnded->finger; event.touch.finger = touchEnded->finger;
event->touch.position = convertVector2(touchEnded->position); event.touch.position = convertVector2(touchEnded->position);
} }
else if (const auto* sensorChanged = sfmlEvent->getIf<sf::Event::SensorChanged>()) else if (const auto* sensorChanged = sfmlEvent->getIf<sf::Event::SensorChanged>())
{ {
event->type = sfEvtSensorChanged; event.type = sfEvtSensorChanged;
event->sensor.sensorType = static_cast<sfSensorType>(sensorChanged->type); event.sensor.sensorType = static_cast<sfSensorType>(sensorChanged->type);
event->sensor.value = convertVector3(sensorChanged->value); event.sensor.value = convertVector3(sensorChanged->value);
} }
return true; return true;
src/CSFML/Window/Window.cpp
+2 -2
View File
@@ -114,7 +114,7 @@ bool sfWindow_pollEvent(sfWindow* window, sfEvent* event)
{ {
assert(window); assert(window);
assert(event); assert(event);
return convertEvent(window->pollEvent(), event); return convertEvent(window->pollEvent(), *event);
} }
@@ -123,7 +123,7 @@ bool sfWindow_waitEvent(sfWindow* window, sfTime timeout, sfEvent* event)
{ {
assert(window); assert(window);
assert(event); assert(event);
return convertEvent(window->waitEvent(sf::microseconds(timeout.microseconds)), event); return convertEvent(window->waitEvent(sf::microseconds(timeout.microseconds)), *event);
} }
src/CSFML/Window/WindowBase.cpp
+2 -2
View File
@@ -96,7 +96,7 @@ bool sfWindowBase_pollEvent(sfWindowBase* windowBase, sfEvent* event)
{ {
assert(windowBase); assert(windowBase);
assert(event); assert(event);
return convertEvent(windowBase->pollEvent(), event); return convertEvent(windowBase->pollEvent(), *event);
} }
@@ -105,7 +105,7 @@ bool sfWindowBase_waitEvent(sfWindowBase* windowBase, sfTime timeout, sfEvent* e
{ {
assert(windowBase); assert(windowBase);
assert(event); assert(event);
return convertEvent(windowBase->waitEvent(sf::microseconds(timeout.microseconds)), event); return convertEvent(windowBase->waitEvent(sf::microseconds(timeout.microseconds)), *event);
} }