fsylvain/SFMLplayground
1
0
Fork 0
mirror of https://github.com/Floriansylvain/SFMLplayground.git synced 2026-08-19 19:53:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

refac: moved draw & input code out of game class

Browse Source
This commit is contained in:
Florian Sylvain
2025-05-11 01:01:18 +02:00
parent 874b54cf36
commit 885ed1ec4b
9 changed files with 217 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game.cpp
+15 -55
View File
@@ -4,9 +4,13 @@
#include <cmath>
#include "Constants.hpp"
#include "DebugDraw.hpp"
#include "VectorMath.hpp"
Game::Game() {
Game::Game()
: m_inputManager(
std::bind(&Game::processKeyPressed, this, std::placeholders::_1),
std::bind(&Game::processMousePressed, this, std::placeholders::_1)) {
m_window.create(sf::VideoMode({Constants::WIDTH, Constants::HEIGHT}),
"SFML Playground");
m_window.setVerticalSyncEnabled(true);
@@ -18,7 +22,7 @@ Game::Game() {
sf::Vector2f(400.f, 0.f)));
}
void Game::processKeyPressed(const sf::Event::KeyPressed& kP) {
void Game::processKeyPressed(const sf::Event::KeyPressed &kP) {
if (kP.code == sf::Keyboard::Key::Equal) {
m_timeScale *= 1.1f;
} else if (kP.code == sf::Keyboard::Key::Hyphen) {
@@ -27,26 +31,13 @@ void Game::processKeyPressed(const sf::Event::KeyPressed& kP) {
}
}
void Game::processMousePressed(const sf::Event::MouseButtonPressed& mP) {
void Game::processMousePressed(const sf::Event::MouseButtonPressed &mP) {
if (mP.button != sf::Mouse::Button::Left) return;
handleMouseClick(sf::Vector2i(mP.position.x, mP.position.y));
}
void Game::processEvents() {
while (const std::optional event = m_window.pollEvent()) {
if (event->is<sf::Event::Closed>()) {
m_window.close();
return;
}
if (auto kP = event->getIf<sf::Event::KeyPressed>())
processKeyPressed(*kP);
if (auto mP = event->getIf<sf::Event::MouseButtonPressed>())
processMousePressed(*mP);
}
}
void Game::handleMouseClick(const sf::Vector2i& mousePos) {
auto* ball = dynamic_cast<Ball*>(m_objects[0].get());
void Game::handleMouseClick(const sf::Vector2i &mousePos) {
auto *ball = dynamic_cast<Ball *>(m_objects[0].get());
if (!ball) return;
sf::Vector2f mouseWorld(static_cast<float>(mousePos.x),
@@ -58,48 +49,17 @@ void Game::handleMouseClick(const sf::Vector2i& mousePos) {
void Game::update() {
float dt = m_clock.restart().asSeconds() * m_timeScale;
for (auto& object : m_objects) object->update(dt);
}
void Game::drawLine(const sf::Vector2f& start, const sf::Vector2f& direction,
float length, const sf::Color& color) {
float dirLength =
std::sqrt(direction.x * direction.x + direction.y * direction.y);
sf::Vector2f dirNorm =
(dirLength != 0.f) ? direction / dirLength : sf::Vector2f(1.f, 0.f);
sf::Vector2f endPoint = start + dirNorm * length;
sf::Vertex line[] = {{start, color}, {endPoint, color}};
m_window.draw(line, 2, sf::PrimitiveType::Lines);
}
void Game::drawDirectionLine(const Ball* ball) {
sf::Vector2f ballCenter = ball->getPosition();
sf::Vector2i mousePixel = sf::Mouse::getPosition(m_window);
sf::Vector2f mouseWorld(static_cast<float>(mousePixel.x),
static_cast<float>(mousePixel.y));
sf::Vector2f dir = mouseWorld - ballCenter;
drawLine(ballCenter, dir, 100.f, sf::Color::Green);
}
void Game::drawVelocityLine(const Ball* ball) {
if (ball->isAtRest()) return;
sf::Vector2f ballCenter = ball->getPosition();
sf::Vector2f velocity = ball->getVelocity();
float velLength =
std::sqrt(velocity.x * velocity.x + velocity.y * velocity.y);
float clampedLength = std::min(100.f, std::max(0.f, velLength));
drawLine(ballCenter, velocity, clampedLength, sf::Color::Blue);
for (auto &object : m_objects) object->update(dt);
}
void Game::render() {
m_window.clear(sf::Color::Black);
for (auto& object : m_objects) object->draw(m_window);
for (auto &object : m_objects) object->draw(m_window);
auto* ball = dynamic_cast<Ball*>(m_objects[0].get());
auto *ball = dynamic_cast<Ball *>(m_objects[0].get());
if (ball) {
drawDirectionLine(ball);
drawVelocityLine(ball);
DebugDraw::drawDirectionLine(m_window, ball);
DebugDraw::drawVelocityLine(m_window, ball);
}
m_window.display();
@@ -107,7 +67,7 @@ void Game::render() {
void Game::run() {
while (m_window.isOpen()) {
processEvents();
m_inputManager.processEvents(m_window);
update();
render();
}