Skip to content

add ball keybind #15

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

Open
whyvn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add ball keybind #15

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The following keyboard shortcuts are available
* <kbd>E</kbd> toggle v-sync. V-sync limits the number of frames per second, so disabling it speeds up the simulation.
* <kbd>A</kbd> toggle the visibility of the traces.
* <kbd>space</kbd> toggle slow-motion.
* <kbd>D</kbd> spawn a ball.
* <kbd>R</kbd> reset the view.
* <kbd>esc</kbd> close the application.

Expand Down
51 changes: 29 additions & 22 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ struct Ball
}
};

void spawn(std::vector<Ball>& balls, int minSize, int maxSize) {
const float angle = RNGf::getUnder(2.0f * 3.141592653f);
const float radius = 350.0f;

const float start_x = radius * cos(angle);
const float start_y = radius * sin(angle);

balls.push_back(Ball(start_x + WIN_WIDTH * 0.5f, start_y + WIN_HEIGHT * 0.5f,
RNGf::getRange(static_cast<float>(minSize), static_cast<float>(maxSize))));
}

bool update(std::vector<Ball>& balls, float speed)
{
bool stable = true;
Expand Down Expand Up @@ -212,16 +223,8 @@ int main()

const float spawn_range_factor = 0.5f;
std::vector<Ball> balls;
for (int i(0); i < nBalls; i++) {
const float angle = RNGf::getUnder(2.0f * 3.141592653f);
const float radius = 350.0f;

const float start_x = radius * cos(angle);
const float start_y = radius * sin(angle);

balls.push_back(Ball(start_x + WIN_WIDTH * 0.5f, start_y + WIN_HEIGHT * 0.5f,
RNGf::getRange(static_cast<float>(minSize), static_cast<float>(maxSize))));
}
for (int i(0); i < nBalls; i++)
spawn(balls, minSize, maxSize);

sf::RenderTexture traces, blurTexture, renderer;
blurTexture.create(WIN_WIDTH, WIN_HEIGHT);
Expand All @@ -231,22 +234,26 @@ int main()
traces.clear(sf::Color::Black);
traces.display();

DisplayManager display_manager(window);
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::A, [&](sfev::CstEv) { drawTraces = !drawTraces; });
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::C, [&](sfev::CstEv) { traces.clear(); });
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::Space, [&](sfev::CstEv) {
speedDownFactorGoal = speedDownFactor == 1 ? 10.0f : 1.0f;
});
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::Escape, [&](sfev::CstEv) {window.close(); });
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::E, [&](sfev::CstEv) {
synccEnable = !synccEnable;
window.setVerticalSyncEnabled(synccEnable);
});
DisplayManager display_manager(window);
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::A, [&](sfev::CstEv) { drawTraces = !drawTraces; });
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::C, [&](sfev::CstEv) { traces.clear(); });
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::Space, [&](sfev::CstEv) {
speedDownFactorGoal = speedDownFactor == 1 ? 10.0f : 1.0f;
});
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::Escape, [&](sfev::CstEv) {window.close(); });
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::E, [&](sfev::CstEv) {
synccEnable = !synccEnable;
window.setVerticalSyncEnabled(synccEnable);
});
display_manager.event_manager.addKeyReleasedCallback(sf::Keyboard::D, [&](sfev::CstEv) {
nBalls++;
spawn(balls, minSize, maxSize);
});

const Ball* focus = nullptr;

uint32_t ok_count = 0;

while (window.isOpen()) {
sf::Vector2i mousePos = sf::Mouse::getPosition(window);

Expand Down