From 430da9babbc3ab6d9ad0225e9bb1698db3f28ced Mon Sep 17 00:00:00 2001 From: Jean Tampon Date: Mon, 9 Aug 2021 16:44:37 +0200 Subject: [PATCH] Add comments in main --- include/render/colony_renderer.hpp | 2 +- include/simulation/colony/colony.hpp | 2 +- src/main.cpp | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/render/colony_renderer.hpp b/include/render/colony_renderer.hpp index 131fde65..a3168859 100644 --- a/include/render/colony_renderer.hpp +++ b/include/render/colony_renderer.hpp @@ -130,7 +130,7 @@ struct ColonyRenderer const float margin = 10.0f; const sf::Vector2f size(400.0f, 100.0f); - const float colonies_count = 4.0f; + const float colonies_count = 2.0f; const float start_x = (Conf::WIN_WIDTH - size.x * colonies_count - (colonies_count - 1.0f) * margin) * 0.5f; population.configure({start_x + (size.x + margin) * colony.id, margin}, size); population.population.color = colony.ants_color; diff --git a/include/simulation/colony/colony.hpp b/include/simulation/colony/colony.hpp index 99aa8a93..923caf58 100644 --- a/include/simulation/colony/colony.hpp +++ b/include/simulation/colony/colony.hpp @@ -36,7 +36,7 @@ struct Colony , id(col_id) { base.food = 0.0f; - uint32_t ants_count = 2000; + uint32_t ants_count = 16; for (uint32_t i(ants_count); i--;) { createWorker(); } diff --git a/src/main.cpp b/src/main.cpp index 4360f709..feac20e2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,6 +21,7 @@ int main() simulation.createColony(margin, margin); simulation.createColony(Conf::WORLD_WIDTH - margin, Conf::WORLD_HEIGHT - margin); simulation.loadMap("res/map.png"); + simulation.renderer.vp_handler.reset(); sf::Clock clock; RMean fps(100); @@ -31,24 +32,22 @@ int main() fps_text.setCharacterSize(32); fps_text.setFillColor(sf::Color::White); fps_text.setPosition(10.0f, 10.0f); + const float dt = 0.016f; - while (window.isOpen()) - { + while (window.isOpen()) { + // Update simulation simulation.processEvents(); - - const float dt = 0.016f; simulation.update(dt); - + // Update FPS metric fps_text.setString(toStr(fps.get())); - + // Render simulation window.clear(sf::Color(94, 87, 87)); simulation.render(window); window.draw(fps_text); window.display(); - + // Add render time to the counter fps.addValue(1.0f / clock.restart().asSeconds()); } - // Free textures Conf::freeTextures();