From f48af51dc76090b05f955f634892982168dcde6a Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Sun, 21 Nov 2021 17:02:42 +0100 Subject: [PATCH] refactor: format project --- include/game/Mobs.h | 6 +- include/game/Player.h | 4 +- include/misc/Platform.h | 8 +-- include/misc/Random.h | 4 +- include/misc/Time.h | 2 +- include/misc/Updater.h | 4 +- include/render/WorldRenderer.h | 2 +- include/render/gui/GuiManager.h | 6 +- include/render/gui/MobTooltip.h | 2 +- include/render/gui/SummonMenu.h | 2 +- include/render/gui/TowerGui.h | 4 +- src/game/Mobs.cpp | 92 ++++++++++++++-------------- src/game/Towers.cpp | 40 ++++++------ src/game/World.cpp | 2 +- src/game/client/Client.cpp | 4 +- src/game/client/WorldClient.cpp | 2 +- src/game/server/Server.cpp | 8 +-- src/game/server/ServerConnexion.cpp | 4 +- src/game/server/ServerGame.cpp | 8 +-- src/misc/Time.cpp | 2 +- src/misc/Updater.cpp | 2 +- src/protocol/PacketFactory.cpp | 2 +- src/protocol/Protocol.cpp | 4 +- src/render/Renderer.cpp | 4 +- src/render/WorldRenderer.cpp | 14 ++--- src/render/gui/FrameMenu.cpp | 4 +- src/render/gui/GameMenu.cpp | 2 +- src/render/gui/MainMenu.cpp | 8 +-- src/render/gui/MobTooltip.cpp | 32 +++++----- src/render/gui/SummonMenu.cpp | 10 +-- src/render/gui/TowerGui.cpp | 4 +- src/render/gui/TowerPlacePopup.cpp | 2 +- src/render/gui/UpdateMenu.cpp | 18 +++--- src/render/shaders/EntityShader.cpp | 4 +- src/render/shaders/ShaderProgram.cpp | 4 +- src/render/shaders/WorldShader.cpp | 4 +- 36 files changed, 162 insertions(+), 162 deletions(-) diff --git a/include/game/Mobs.h b/include/game/Mobs.h index 27f33ad..edd0928 100644 --- a/include/game/Mobs.h +++ b/include/game/Mobs.h @@ -61,7 +61,7 @@ public: std::uint16_t getMaxLife() const { return m_MaxLife; } }; -struct EffectDuration{ +struct EffectDuration { EffectType type; float duration; // in seconds const Tower* tower; // the tower that gived the effect @@ -88,7 +88,7 @@ private: float m_X = 0, m_Y = 0; public: - Mob(MobID id, MobLevel level, PlayerID sender) : m_Sender(sender), m_Level(level), + Mob(MobID id, MobLevel level, PlayerID sender) : m_Sender(sender), m_Level(level), m_EffectFireTimer(1000), m_EffectPoisonTimer(1000), m_EffectHealTimer(1000) { } @@ -97,7 +97,7 @@ public: virtual void tick(std::uint64_t delta); - virtual void OnDeath(World* world){} + virtual void OnDeath(World* world) {} const TowerImmunities& getTowerImmunities() const { return getMobTowerImmunities(getType(), m_Level); } const EffectImmunities& getEffectImmunities() const { return getMobEffectImmunities(getType(), m_Level); } diff --git a/include/game/Player.h b/include/game/Player.h index c59e550..ab583d4 100644 --- a/include/game/Player.h +++ b/include/game/Player.h @@ -22,7 +22,7 @@ private: bool m_GoldChanged; bool m_ExpChanged; public: - Player(std::uint8_t id = 0) : m_TeamColor(game::TeamColor::None), m_Gold(0), m_Exp(0), m_ID(id), m_GoldPerSecond(5), + Player(std::uint8_t id = 0) : m_TeamColor(game::TeamColor::None), m_Gold(0), m_Exp(0), m_ID(id), m_GoldPerSecond(5), m_GoldChanged(false), m_ExpChanged(false) {} const std::string& getName() const { return m_Name; } @@ -34,7 +34,7 @@ public: std::uint8_t getGoldPerSecond() const { return m_GoldPerSecond; } void setGoldPerSecond(std::uint8_t goldPerSecond) { m_GoldPerSecond = goldPerSecond; } - std::uint32_t getGold() const { return m_Gold;} + std::uint32_t getGold() const { return m_Gold; } void setGold(std::uint32_t gold) { m_GoldChanged = true; m_Gold = gold; } void addGold(std::uint32_t gold) { m_GoldChanged = true; m_Gold += gold; } void removeGold(std::uint32_t gold) { m_GoldChanged = true; m_Gold -= gold; } diff --git a/include/misc/Platform.h b/include/misc/Platform.h index 11d7725..d4e2ca9 100644 --- a/include/misc/Platform.h +++ b/include/misc/Platform.h @@ -18,7 +18,7 @@ enum class Architecture { Unknown, }; -inline Os getSystemOs(){ +inline Os getSystemOs() { #if defined(_WIN32) || defined(_WIN64) return Os::Windows; #elif defined(__ANDROID__) @@ -26,12 +26,12 @@ inline Os getSystemOs(){ #elif defined(__unix__) return Os::Linux; #else - #pragma message ("Target OS unknown or unsupported !") +#pragma message ("Target OS unknown or unsupported !") return Os::Unknown; #endif } -inline Architecture getSystemArchitecture(){ +inline Architecture getSystemArchitecture() { #if defined(_WIN64) return Architecture::x86_64; #elif defined(_WIN32) @@ -45,7 +45,7 @@ inline Architecture getSystemArchitecture(){ #elif defined(__arm__) || defined(_M_ARM) return Architecture::Armhf; #else - #pragma message ("Target CPU architecture unknown or unsupported !") +#pragma message ("Target CPU architecture unknown or unsupported !") return Architecture::Unknown; #endif } diff --git a/include/misc/Random.h b/include/misc/Random.h index 2c8f2ac..ac1044b 100644 --- a/include/misc/Random.h +++ b/include/misc/Random.h @@ -6,7 +6,7 @@ namespace td { namespace utils { template -NumberType getRandomInt(NumberType min, NumberType max){ +NumberType getRandomInt(NumberType min, NumberType max) { std::random_device randomDevice; std::mt19937 generator(randomDevice()); std::uniform_int_distribution distrib(min, max); @@ -14,7 +14,7 @@ NumberType getRandomInt(NumberType min, NumberType max){ } template -NumberType getRandomReal(NumberType min, NumberType max){ +NumberType getRandomReal(NumberType min, NumberType max) { std::random_device randomDevice; std::mt19937 generator(randomDevice()); std::uniform_real_distribution distrib(min, max); diff --git a/include/misc/Time.h b/include/misc/Time.h index 0d27874..37b4341 100644 --- a/include/misc/Time.h +++ b/include/misc/Time.h @@ -64,7 +64,7 @@ public: bool update(std::uint64_t delta); - void applyCooldown(); + void applyCooldown(); void reset(); diff --git a/include/misc/Updater.h b/include/misc/Updater.h index 77d53d2..d9ca746 100644 --- a/include/misc/Updater.h +++ b/include/misc/Updater.h @@ -30,11 +30,11 @@ public: float getDownloadProgress() { return m_Progress; } bool isDownloadComplete() { return m_DownloadComplete; } bool isFileWrited() { return m_FileWrited; } - + static std::string getLocalFilePath(); static void removeOldFile(); - static std::string getCurrentVersion(){ return TD_VERSION; } + static std::string getCurrentVersion() { return TD_VERSION; } std::string getLastVersion() { return m_LastVersion; } bool canUpdate(); diff --git a/include/render/WorldRenderer.h b/include/render/WorldRenderer.h index 0f111c8..ba918ec 100644 --- a/include/render/WorldRenderer.h +++ b/include/render/WorldRenderer.h @@ -37,7 +37,7 @@ private: float m_CamSensibility = 1; bool m_PopupOpened = false; VertexCache m_TowersCache; - + std::unique_ptr m_TowerPlacePopup; std::unique_ptr m_MobTooltip; public: diff --git a/include/render/gui/GuiManager.h b/include/render/gui/GuiManager.h index 4aad19b..a4409ca 100644 --- a/include/render/gui/GuiManager.h +++ b/include/render/gui/GuiManager.h @@ -12,13 +12,13 @@ class GuiManager { private: std::vector> m_Widgets; public: - void renderWidgets(){ - for(auto widget : m_Widgets){ + void renderWidgets() { + for (auto widget : m_Widgets) { widget->render(); } } - void addWidgets(const std::shared_ptr& widget){ + void addWidgets(const std::shared_ptr& widget) { m_Widgets.push_back(std::move(widget)); } }; diff --git a/include/render/gui/MobTooltip.h b/include/render/gui/MobTooltip.h index e0c9de4..91fc30d 100644 --- a/include/render/gui/MobTooltip.h +++ b/include/render/gui/MobTooltip.h @@ -7,7 +7,7 @@ namespace td { namespace game { class Mob; - + } // namespace game namespace gui { diff --git a/include/render/gui/SummonMenu.h b/include/render/gui/SummonMenu.h index 01c3dbc..4d4dad0 100644 --- a/include/render/gui/SummonMenu.h +++ b/include/render/gui/SummonMenu.h @@ -8,7 +8,7 @@ namespace td { namespace gui { -class SummonMenu : public GuiWidget{ +class SummonMenu : public GuiWidget { private: bool m_MenuOpened; int m_ImageWidth = 100; diff --git a/include/render/gui/TowerGui.h b/include/render/gui/TowerGui.h index e4c7448..142cd3e 100644 --- a/include/render/gui/TowerGui.h +++ b/include/render/gui/TowerGui.h @@ -10,7 +10,7 @@ #include struct SDL_Window; -typedef void *SDL_GLContext; +typedef void* SDL_GLContext; namespace td { @@ -26,7 +26,7 @@ class MainMenu; class GameMenu; class FrameMenu; class UpdateMenu; - + } // namespace gui namespace render { diff --git a/src/game/Mobs.cpp b/src/game/Mobs.cpp index e5f3679..1bceb57 100644 --- a/src/game/Mobs.cpp +++ b/src/game/Mobs.cpp @@ -14,7 +14,7 @@ bool Mob::isImmuneTo(EffectType type) { return std::find(getEffectImmunities().begin(), getEffectImmunities().end(), type) != getEffectImmunities().end(); } -EffectDuration& Mob::getEffect(EffectType effectType){ +EffectDuration& Mob::getEffect(EffectType effectType) { return *std::find_if(m_Effects.begin(), m_Effects.end(), [&effectType](EffectDuration effect) { return effect.type == effectType;}); } @@ -39,40 +39,40 @@ void Mob::updateEffects(std::uint64_t delta) { for (std::size_t i = 0; i < m_Effects.size(); i++) { EffectDuration& effect = m_Effects[i]; effect.duration -= deltaSec; - if (effect.duration < 0){ // effect has gone + if (effect.duration < 0) { // effect has gone m_Effects.erase(m_Effects.begin() + i); - switch(effect.type){ - case EffectType::Fire:{ - m_EffectFireTimer.reset(); - break; - } + switch (effect.type) { + case EffectType::Fire: { + m_EffectFireTimer.reset(); + break; + } - case EffectType::Poison:{ - m_EffectPoisonTimer.reset(); - break; - } + case EffectType::Poison: { + m_EffectPoisonTimer.reset(); + break; + } - case EffectType::Heal:{ - m_EffectHealTimer.reset(); - } + case EffectType::Heal: { + m_EffectHealTimer.reset(); + } - default: - break; + default: + break; } } } - if(hasEffect(EffectType::Fire)){ - if(m_EffectFireTimer.update(delta)){ + if (hasEffect(EffectType::Fire)) { + if (m_EffectFireTimer.update(delta)) { damage(3, getEffect(EffectType::Fire).tower); } } - if(hasEffect(EffectType::Poison)){ - if(m_EffectPoisonTimer.update(delta)){ + if (hasEffect(EffectType::Poison)) { + if (m_EffectPoisonTimer.update(delta)) { damage(1, getEffect(EffectType::Poison).tower); } } - if(hasEffect(EffectType::Heal)){ - if(m_EffectFireTimer.update(delta)){ + if (hasEffect(EffectType::Heal)) { + if (m_EffectFireTimer.update(delta)) { heal(10); } } @@ -305,30 +305,30 @@ MobPtr MobFactory::createMob(MobID id, MobType type, std::uint8_t level, PlayerI return mobFactory[type](id, level, sender); } -std::string MobFactory::getMobName(MobType type){ - switch(type){ - case MobType::Zombie: - return "Zombie"; - case MobType::Spider: - return "Spider"; - case MobType::Skeleton: - return "Skeleton"; - case MobType::Pigman: - return "Pigman"; - case MobType::Creeper: - return "Creeper"; - case MobType::Silverfish: - return "Silverfish"; - case MobType::Blaze: - return "Blaze"; - case MobType::Witch: - return "Witch"; - case MobType::Slime: - return "Slime"; - case MobType::Giant: - return "Giant"; - default: - return "Unknow"; +std::string MobFactory::getMobName(MobType type) { + switch (type) { + case MobType::Zombie: + return "Zombie"; + case MobType::Spider: + return "Spider"; + case MobType::Skeleton: + return "Skeleton"; + case MobType::Pigman: + return "Pigman"; + case MobType::Creeper: + return "Creeper"; + case MobType::Silverfish: + return "Silverfish"; + case MobType::Blaze: + return "Blaze"; + case MobType::Witch: + return "Witch"; + case MobType::Slime: + return "Slime"; + case MobType::Giant: + return "Giant"; + default: + return "Unknow"; } } diff --git a/src/game/Towers.cpp b/src/game/Towers.cpp index a8ce995..4cf411c 100644 --- a/src/game/Towers.cpp +++ b/src/game/Towers.cpp @@ -116,8 +116,8 @@ const std::map, TowerStats> TowerConstants = { }; const TowerStats* getTowerStats(TowerType type, TowerLevel level) { - auto it = TowerConstants.find({type, level}); - if(it == TowerConstants.end()) return nullptr; + auto it = TowerConstants.find({ type, level }); + if (it == TowerConstants.end()) return nullptr; return &it->second; } @@ -251,30 +251,30 @@ void PoisonTower::tick(std::uint64_t delta, World* world) { if (m_Timer.update(delta)) { for (MobPtr mob : world->getMobList()) { if (isMobInRange(mob)) { - if(getLevel().getPath() == TowerPath::Bottom){ + if (getLevel().getPath() == TowerPath::Bottom) { mob->damage(getStats()->getDamage(), this); - }else{ + } else { float durationSec; - switch(getLevel().getLevel()){ - case 1: - durationSec = 5; - break; + switch (getLevel().getLevel()) { + case 1: + durationSec = 5; + break; - case 2: - durationSec = 15; - break; + case 2: + durationSec = 15; + break; - case 3: - durationSec = 30; - break; + case 3: + durationSec = 30; + break; - case 4: - durationSec = 1e10; // about 3 million hours. It should be enough - break; + case 4: + durationSec = 1e10; // about 3 million hours. It should be enough + break; - default: - durationSec = 0; // how did we get there ? - break; + default: + durationSec = 0; // how did we get there ? + break; } mob->addEffect(EffectType::Poison, durationSec, this); } diff --git a/src/game/World.cpp b/src/game/World.cpp index 781e300..5ab7433 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -278,7 +278,7 @@ TowerPtr World::getTower(const glm::vec2& position) const { TowerPtr World::getTowerById(TowerID towerID) { auto it = std::find_if(m_Towers.begin(), m_Towers.end(), [towerID](TowerPtr tower) { return tower->getID() == towerID;}); - if(it == m_Towers.end()) return nullptr; + if (it == m_Towers.end()) return nullptr; return *it; } diff --git a/src/game/client/Client.cpp b/src/game/client/Client.cpp index 2c44cf3..8d7d88d 100644 --- a/src/game/client/Client.cpp +++ b/src/game/client/Client.cpp @@ -49,7 +49,7 @@ void Client::render() { m_Game.renderWorld(); } -void Client::sendMobs(const std::vector& mobSends){ +void Client::sendMobs(const std::vector& mobSends) { protocol::SendMobsPacket packet(mobSends); m_Connexion.sendPacket(&packet); } @@ -59,7 +59,7 @@ void Client::placeTower(game::TowerType type, const glm::vec2& position) { m_Connexion.sendPacket(&packet); } -void Client::upgradeTower(game::TowerID tower, game::TowerLevel level){ +void Client::upgradeTower(game::TowerID tower, game::TowerLevel level) { protocol::UpgradeTowerPacket packet(tower, level); m_Connexion.sendPacket(&packet); } diff --git a/src/game/client/WorldClient.cpp b/src/game/client/WorldClient.cpp index 660c775..9cdf705 100644 --- a/src/game/client/WorldClient.cpp +++ b/src/game/client/WorldClient.cpp @@ -28,7 +28,7 @@ void WorldClient::HandlePacket(const protocol::SpawnMobPacket* packet) { void WorldClient::HandlePacket(const protocol::UpgradeTowerPacket* packet) { game::TowerPtr tower = getTowerById(packet->getTowerID()); - if(tower == nullptr) return; // this should not happen but who knows ? + if (tower == nullptr) return; // this should not happen but who knows ? tower->upgrade(packet->getTowerLevel().getLevel(), packet->getTowerLevel().getPath()); } diff --git a/src/game/server/Server.cpp b/src/game/server/Server.cpp index 31f7ce8..d5762ef 100644 --- a/src/game/server/Server.cpp +++ b/src/game/server/Server.cpp @@ -29,12 +29,12 @@ void Server::startThread() { } } - }); + }); } -void Server::stopThread(){ +void Server::stopThread() { m_ServerRunning = false; - if(m_Thread.joinable()) + if (m_Thread.joinable()) m_Thread.join(); } @@ -55,7 +55,7 @@ bool Server::start(std::uint16_t port) { } void Server::stop() { - if(!m_ServerRunning) + if (!m_ServerRunning) return; stopThread(); diff --git a/src/game/server/ServerConnexion.cpp b/src/game/server/ServerConnexion.cpp index 336d4d9..b5e1b87 100644 --- a/src/game/server/ServerConnexion.cpp +++ b/src/game/server/ServerConnexion.cpp @@ -168,12 +168,12 @@ void ServerConnexion::HandlePacket(const protocol::SendMobsPacket* packet) { //TODO: verify the packet - for(protocol::MobSend mobSend : mobSent){ + for (protocol::MobSend mobSend : mobSent) { m_Server->getGame().getServerWorld()->spawnMobs(mobSend.mobType, mobSend.mobLevel, m_ID, mobSend.mobCount); } } -void ServerConnexion::HandlePacket(const protocol::UpgradeTowerPacket* packet){ +void ServerConnexion::HandlePacket(const protocol::UpgradeTowerPacket* packet) { //TODO: verify the packet m_Server->broadcastPacket(packet); diff --git a/src/game/server/ServerGame.cpp b/src/game/server/ServerGame.cpp index e3eb19e..9f52a39 100644 --- a/src/game/server/ServerGame.cpp +++ b/src/game/server/ServerGame.cpp @@ -9,7 +9,7 @@ ServerGame::ServerGame(server::Server* server) : game::Game(&m_ServerWorld), m_S } void ServerGame::tick(std::uint64_t delta) { - if(m_GameState == game::GameState::Game){ + if (m_GameState == game::GameState::Game) { Game::tick(delta); updatePlayerStats(); } @@ -27,16 +27,16 @@ void ServerGame::startGame() { m_GameState = game::GameState::Game; } -void ServerGame::updatePlayerStats(){ +void ServerGame::updatePlayerStats() { m_GoldMineTimer.update(); for (auto& pair : m_Server->getPlayers()) { game::Player& player = pair.second; - if(player.hasGoldChanged()){ + if (player.hasGoldChanged()) { protocol::UpdateMoneyPacket packet(player.getGold()); m_Server->getConnexions()[player.getID()].sendPacket(&packet); player.updateGold(); } - if(player.hasExpChanged()){ + if (player.hasExpChanged()) { protocol::UpdateExpPacket packet(player.getExp()); m_Server->getConnexions()[player.getID()].sendPacket(&packet); player.updateExp(); diff --git a/src/misc/Time.cpp b/src/misc/Time.cpp index f9e139a..899b8de 100644 --- a/src/misc/Time.cpp +++ b/src/misc/Time.cpp @@ -55,7 +55,7 @@ void CooldownTimer::reset() { m_Cooldown = 0; // let the timer active once at the beginning } -void CooldownTimer::applyCooldown(){ +void CooldownTimer::applyCooldown() { m_Cooldown = m_CooldownTime; } diff --git a/src/misc/Updater.cpp b/src/misc/Updater.cpp index 049220b..f4f07de 100644 --- a/src/misc/Updater.cpp +++ b/src/misc/Updater.cpp @@ -24,7 +24,7 @@ bool Updater::checkUpdate() { m_LastVersion = m_LastVersion.substr(0, m_LastVersion.find('\n')); std::cout << "Current version : [" << getCurrentVersion() << "]\n"; - std::cout << "Last version : [" << m_LastVersion << "]\n"; + std::cout << "Last version : [" << m_LastVersion << "]\n"; if (currentVersion != m_LastVersion) { return true; diff --git a/src/protocol/PacketFactory.cpp b/src/protocol/PacketFactory.cpp index 610ba42..fc40089 100644 --- a/src/protocol/PacketFactory.cpp +++ b/src/protocol/PacketFactory.cpp @@ -6,7 +6,7 @@ namespace td { namespace protocol { namespace PacketFactory { -using PacketCreator = std::function; +using PacketCreator = std::function; static std::map packets = { {PacketType::PlayerLogin, []() -> PacketPtr {return std::make_unique();} }, diff --git a/src/protocol/Protocol.cpp b/src/protocol/Protocol.cpp index 27558bd..507dab4 100644 --- a/src/protocol/Protocol.cpp +++ b/src/protocol/Protocol.cpp @@ -498,7 +498,7 @@ void WorldRemoveTowerPacket::Deserialize(DataBuffer& data) { DataBuffer SendMobsPacket::Serialize() const { DataBuffer data; data << getID() << static_cast(m_MobSends.size()); - for(const MobSend& mobSend : m_MobSends){ + for (const MobSend& mobSend : m_MobSends) { data << mobSend; } return data; @@ -508,7 +508,7 @@ void SendMobsPacket::Deserialize(DataBuffer& data) { std::uint8_t mobSendCount; data >> mobSendCount; protocol::MobSend mobSend; - for(int i = 0; i < mobSendCount; i++){ + for (int i = 0; i < mobSendCount; i++) { data >> mobSend; m_MobSends.push_back(mobSend); } diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 0edb79e..23f6930 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -43,9 +43,9 @@ void Renderer::initShader() { } bool Renderer::init() { - #ifndef ANDROID +#ifndef ANDROID glbinding::Binding::initialize(); - #endif +#endif glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/render/WorldRenderer.cpp b/src/render/WorldRenderer.cpp index 1daa87e..48cc247 100644 --- a/src/render/WorldRenderer.cpp +++ b/src/render/WorldRenderer.cpp @@ -85,7 +85,7 @@ void WorldRenderer::renderTowers() const { } void WorldRenderer::renderTileSelect() const { - if(ImGui::IsAnyItemHovered()) return; + if (ImGui::IsAnyItemHovered()) return; Renderer::Model tileSelectModel; tileSelectModel.vao = m_SelectTileVao.get(); @@ -180,8 +180,8 @@ void WorldRenderer::renderTowerUpgradePopup() { bool alreadyUpgraded = currentLevel <= towerLevel; bool canUpgrade = (towerLevel + 1) == currentLevel; - if(canUpgrade && towerPath != game::TowerPath::Base){ - if(currentPath != towerPath){ + if (canUpgrade && towerPath != game::TowerPath::Base) { + if (currentPath != towerPath) { canUpgrade = false; } } @@ -199,7 +199,7 @@ void WorldRenderer::renderTowerUpgradePopup() { ImGui::EndDisabled(); } else if (canUpgrade) { if (ImGui::Button("Upgrade", ImVec2(100, 100))) { - m_Client->getClient()->upgradeTower(tower->getID(), {currentLevel, currentPath}); + m_Client->getClient()->upgradeTower(tower->getID(), { currentLevel, currentPath }); } } else { ImGui::BeginDisabled(); @@ -226,8 +226,8 @@ void WorldRenderer::detectClick() { } void WorldRenderer::renderMobTooltip() const { - if(ImGui::IsAnyItemHovered()) return; - + if (ImGui::IsAnyItemHovered()) return; + detectMobHovering(); m_MobTooltip->render(); } @@ -240,7 +240,7 @@ void WorldRenderer::detectMobHovering() const { float mobCenterY = mob->getY(); if (cursorWorldPos.x > mobCenterX - 0.5f && cursorWorldPos.x < mobCenterX + 0.5f && cursorWorldPos.y > mobCenterY - 0.5f && cursorWorldPos.y < mobCenterY + 0.5f) { - m_MobTooltip->setMob(mob.get()); + m_MobTooltip->setMob(mob.get()); return; } } diff --git a/src/render/gui/FrameMenu.cpp b/src/render/gui/FrameMenu.cpp index cab0299..cb23403 100644 --- a/src/render/gui/FrameMenu.cpp +++ b/src/render/gui/FrameMenu.cpp @@ -8,7 +8,7 @@ namespace td { namespace gui { -FrameMenu::FrameMenu(client::Client* client) : GuiWidget(client), m_VSync(true), m_IsometricView(true), m_ShowDemoWindow(false){ +FrameMenu::FrameMenu(client::Client* client) : GuiWidget(client), m_VSync(true), m_IsometricView(true), m_ShowDemoWindow(false) { } @@ -24,7 +24,7 @@ void FrameMenu::render() { ImGui::Checkbox("Demo Window", &m_ShowDemoWindow); ImGui::End(); - if(m_ShowDemoWindow) + if (m_ShowDemoWindow) ImGui::ShowDemoWindow(&m_ShowDemoWindow); } diff --git a/src/render/gui/GameMenu.cpp b/src/render/gui/GameMenu.cpp index 572de79..5cdd13f 100644 --- a/src/render/gui/GameMenu.cpp +++ b/src/render/gui/GameMenu.cpp @@ -13,7 +13,7 @@ GameMenu::GameMenu(client::Client* client) : GuiWidget(client), m_SummonMenu(std } -void GameMenu::render(){ +void GameMenu::render() { if (getClient()->getGame().getGameState() == td::game::GameState::Lobby) { ImGui::Begin("Lobby"); diff --git a/src/render/gui/MainMenu.cpp b/src/render/gui/MainMenu.cpp index 5b57dd8..1e5e4d0 100644 --- a/src/render/gui/MainMenu.cpp +++ b/src/render/gui/MainMenu.cpp @@ -12,8 +12,8 @@ MainMenu::MainMenu(client::Client* client) : GuiWidget(client), m_ConnectPort(25 m_ConnectAddress.reserve(256); } -MainMenu::~MainMenu(){ - if(m_Server != nullptr) +MainMenu::~MainMenu() { + if (m_Server != nullptr) m_Server->stop(); } @@ -28,7 +28,7 @@ void MainMenu::render() { if (ImGui::Button("Options")) { // TODO: add settings } - + if (ImGui::BeginPopup("Rejoindre une partie##join_popup")) { ImGui::InputText("Server Adress", &m_ConnectAddress.front(), m_ConnectAddress.capacity()); ImGui::InputInt("Port", &m_ConnectPort, -1); @@ -71,7 +71,7 @@ void MainMenu::render() { ImGui::End(); } -bool MainMenu::startServer(){ +bool MainMenu::startServer() { if (m_WorldFilePath.empty()) return false; m_Server = std::make_unique(m_WorldFilePath); diff --git a/src/render/gui/MobTooltip.cpp b/src/render/gui/MobTooltip.cpp index f594011..fd3ea0b 100644 --- a/src/render/gui/MobTooltip.cpp +++ b/src/render/gui/MobTooltip.cpp @@ -19,22 +19,22 @@ void MobTooltip::render() { const game::Player& sender = getClient()->getGame().getPlayerById(m_Mob->getSender()); ImGui::BeginTooltip(); - ImGui::Text("Sender :"); - ImGui::SameLine(); - ImGui::PushStyleColor(ImGuiCol_Text, render::WorldRenderer::getImGuiTeamColor(sender.getTeamColor())); - ImGui::Text("%s", sender.getName().c_str()); - ImGui::PopStyleColor(); - ImGui::Text("Mob HP : %.1f/%i", m_Mob->getHealth(), m_Mob->getStats()->getMaxLife()); - ImGui::Text("Mob Type : %s", game::MobFactory::getMobName(m_Mob->getType()).c_str()); - ImGui::Text("Mob Level : %i", m_Mob->getLevel()); - ImGui::NewLine(); - ImGui::Text("Mob Stats :"); - ImGui::Text("\tMax health : %i", m_Mob->getStats()->getMaxLife()); - ImGui::Text("\tSpeed : %.1f", m_Mob->getStats()->getMovementSpeed()); - ImGui::Text("\tDamage : %.1f", m_Mob->getStats()->getDamage()); - ImGui::Text("\tMoney cost : %i", m_Mob->getStats()->getMoneyCost()); - ImGui::Text("\tEXP cost : %i", m_Mob->getStats()->getExpCost()); - ImGui::Text("\tEXP reward : %i", m_Mob->getStats()->getExpReward()); + ImGui::Text("Sender :"); + ImGui::SameLine(); + ImGui::PushStyleColor(ImGuiCol_Text, render::WorldRenderer::getImGuiTeamColor(sender.getTeamColor())); + ImGui::Text("%s", sender.getName().c_str()); + ImGui::PopStyleColor(); + ImGui::Text("Mob HP : %.1f/%i", m_Mob->getHealth(), m_Mob->getStats()->getMaxLife()); + ImGui::Text("Mob Type : %s", game::MobFactory::getMobName(m_Mob->getType()).c_str()); + ImGui::Text("Mob Level : %i", m_Mob->getLevel()); + ImGui::NewLine(); + ImGui::Text("Mob Stats :"); + ImGui::Text("\tMax health : %i", m_Mob->getStats()->getMaxLife()); + ImGui::Text("\tSpeed : %.1f", m_Mob->getStats()->getMovementSpeed()); + ImGui::Text("\tDamage : %.1f", m_Mob->getStats()->getDamage()); + ImGui::Text("\tMoney cost : %i", m_Mob->getStats()->getMoneyCost()); + ImGui::Text("\tEXP cost : %i", m_Mob->getStats()->getExpCost()); + ImGui::Text("\tEXP reward : %i", m_Mob->getStats()->getExpReward()); ImGui::EndTooltip(); } diff --git a/src/render/gui/SummonMenu.cpp b/src/render/gui/SummonMenu.cpp index b464f21..5c3ff7e 100644 --- a/src/render/gui/SummonMenu.cpp +++ b/src/render/gui/SummonMenu.cpp @@ -5,11 +5,11 @@ namespace td { namespace gui { -SummonMenu::SummonMenu(client::Client* client) : GuiWidget(client), m_MenuOpened(true){ +SummonMenu::SummonMenu(client::Client* client) : GuiWidget(client), m_MenuOpened(true) { m_Values.fill(0); } -void SummonMenu::render(){ +void SummonMenu::render() { if (m_MenuOpened) { ImGui::Begin("Summon", &m_MenuOpened); ImTextureID my_tex_id = ImGui::GetIO().Fonts->TexID; @@ -51,8 +51,8 @@ void SummonMenu::render(){ if (ImGui::Button("Send")) { std::vector mobSent; protocol::MobSend mobSend; - for(int i = 0; i < m_MobTypeCount; i++){ - if(m_Values[i] != 0){ + for (int i = 0; i < m_MobTypeCount; i++) { + if (m_Values[i] != 0) { mobSend.mobCount = m_Values[i]; mobSend.mobLevel = 1; // TODO: add mob levels mobSend.mobType = td::game::MobType(i); @@ -66,7 +66,7 @@ void SummonMenu::render(){ } } -void SummonMenu::setSummonMax(int valueIndex){ +void SummonMenu::setSummonMax(int valueIndex) { int& value = m_Values[valueIndex]; value = std::max(0, value); value = std::min(12, value); diff --git a/src/render/gui/TowerGui.cpp b/src/render/gui/TowerGui.cpp index ce4f45a..d1cd41a 100644 --- a/src/render/gui/TowerGui.cpp +++ b/src/render/gui/TowerGui.cpp @@ -28,8 +28,8 @@ void TowerGui::initWidgets() { m_UpdateMenu = std::make_unique(m_Client.get()); } -TowerGui::TowerGui(SDL_Window* sdl_window, SDL_GLContext glContext, td::render::Renderer* renderer) : m_Window(sdl_window), - m_GlContext(glContext), m_Renderer(renderer), m_Client(std::make_unique(m_Renderer)) { +TowerGui::TowerGui(SDL_Window* sdl_window, SDL_GLContext glContext, td::render::Renderer* renderer) : m_Window(sdl_window), +m_GlContext(glContext), m_Renderer(renderer), m_Client(std::make_unique(m_Renderer)) { IMGUI_CHECKVERSION(); ImGui::CreateContext(); ImGui::StyleColorsDark(); diff --git a/src/render/gui/TowerPlacePopup.cpp b/src/render/gui/TowerPlacePopup.cpp index 3fb6683..d2f962e 100644 --- a/src/render/gui/TowerPlacePopup.cpp +++ b/src/render/gui/TowerPlacePopup.cpp @@ -44,7 +44,7 @@ void TowerPlacePopup::render() { ImGui::SetCursorPosY(m_TowerPopupTileHeight - m_PlaceTowerButtonHeight - 10); ImGui::SetCursorPosX(m_TowerPopupTileWidth / 2.0f - m_PlaceTowerButtonWidth / 2.0f); - if(ImGui::Button(buyText.c_str(), ImVec2(m_PlaceTowerButtonWidth, m_PlaceTowerButtonHeight))){ + if (ImGui::Button(buyText.c_str(), ImVec2(m_PlaceTowerButtonWidth, m_PlaceTowerButtonHeight))) { getClient()->placeTower(towerType, m_ClickWorldPos); ImGui::CloseCurrentPopup(); } diff --git a/src/render/gui/UpdateMenu.cpp b/src/render/gui/UpdateMenu.cpp index c5b5390..2539a69 100644 --- a/src/render/gui/UpdateMenu.cpp +++ b/src/render/gui/UpdateMenu.cpp @@ -20,18 +20,18 @@ void UpdateMenu::render() { bool updateAvailable = m_UpdateAvailable.get(); if (updateAvailable) { - if(m_Updater.isFileWrited()){ + if (m_Updater.isFileWrited()) { ImGui::Text("The update is now installed"); ImGui::Text("The game needs to be restarted"); - }else if (m_Updater.isDownloadComplete()) { + } else if (m_Updater.isDownloadComplete()) { ImGui::Text("Download done!"); - if(ImGui::Button("Install")){ - if(!m_Updater.writeFile()){ + if (ImGui::Button("Install")) { + if (!m_Updater.writeFile()) { m_Error = "Failed to write file !\n"; ImGui::OpenPopup("UpdateError"); } } - if(ImGui::Button("Cancel")){ + if (ImGui::Button("Cancel")) { m_Updater.cancelDownload(); m_Updater.clearCache(); } @@ -50,13 +50,13 @@ void UpdateMenu::render() { bool canDownloadFile = m_Updater.canUpdate(); - if(!canDownloadFile) ImGui::BeginDisabled(); + if (!canDownloadFile) ImGui::BeginDisabled(); if (ImGui::Button("Download")) { m_Updater.downloadUpdate(); } - if(!canDownloadFile) ImGui::EndDisabled(); + if (!canDownloadFile) ImGui::EndDisabled(); ImGui::SameLine(); if (ImGui::Button("Cancel")) { @@ -77,8 +77,8 @@ void UpdateMenu::render() { } } -void UpdateMenu::renderErrorPopup(){ - if(ImGui::BeginPopup("UpdateError")){ +void UpdateMenu::renderErrorPopup() { + if (ImGui::BeginPopup("UpdateError")) { ImGui::Text("Error : %s", m_Error.c_str()); ImGui::EndPopup(); } diff --git a/src/render/shaders/EntityShader.cpp b/src/render/shaders/EntityShader.cpp index 841ec1f..b017b27 100644 --- a/src/render/shaders/EntityShader.cpp +++ b/src/render/shaders/EntityShader.cpp @@ -8,7 +8,7 @@ #include "render/shaders/EntityShader.h" #ifdef __ANDROID__ -static const char vertexSource[] = +static const char vertexSource[] = R"(#version 300 es precision mediump float; @@ -34,7 +34,7 @@ void main(void){ } )"; -static const char fragmentSource[] = +static const char fragmentSource[] = R"(#version 300 es precision mediump float; diff --git a/src/render/shaders/ShaderProgram.cpp b/src/render/shaders/ShaderProgram.cpp index 255eb8d..496b0aa 100755 --- a/src/render/shaders/ShaderProgram.cpp +++ b/src/render/shaders/ShaderProgram.cpp @@ -116,9 +116,9 @@ int ShaderProgram::loadShader(const std::string& source, GLenum type) { char error[size]; glGetShaderInfoLog(shaderID, size, &size, error); std::cout << error << std::endl; - #ifdef __ANDROID__ +#ifdef __ANDROID__ __android_log_print(ANDROID_LOG_ERROR, "TRACKERS", "Could not compile shader !\n %s", error); - #endif +#endif } return shaderID; } diff --git a/src/render/shaders/WorldShader.cpp b/src/render/shaders/WorldShader.cpp index 25d6f50..6079fe6 100644 --- a/src/render/shaders/WorldShader.cpp +++ b/src/render/shaders/WorldShader.cpp @@ -8,7 +8,7 @@ #include "render/shaders/WorldShader.h" #ifdef __ANDROID__ -static const char vertexSource[] = +static const char vertexSource[] = R"(#version 300 es precision mediump float; @@ -31,7 +31,7 @@ void main(void){ } )"; -static const char fragmentSource[] = +static const char fragmentSource[] = R"(#version 300 es precision mediump float;