Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

refactor: format project

Browse Source
This commit is contained in:
Simon Pribylski
2021-11-21 17:02:42 +01:00
parent 0f328e6f81
commit f48af51dc7
36 changed files with 162 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/game/Mobs.h
View File

@@ -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
@@ -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); }

2
include/game/Player.h
View File

@@ -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; }

8
include/misc/Platform.h
View File

@@ -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
}

4
include/misc/Random.h
View File

@@ -6,7 +6,7 @@ namespace td {
namespace utils {
template<typename NumberType>
NumberType getRandomInt(NumberType min, NumberType max){
NumberType getRandomInt(NumberType min, NumberType max) {
std::random_device randomDevice;
std::mt19937 generator(randomDevice());
std::uniform_int_distribution<NumberType> distrib(min, max);
@@ -14,7 +14,7 @@ NumberType getRandomInt(NumberType min, NumberType max){
}
template<typename NumberType>
NumberType getRandomReal(NumberType min, NumberType max){
NumberType getRandomReal(NumberType min, NumberType max) {
std::random_device randomDevice;
std::mt19937 generator(randomDevice());
std::uniform_real_distribution<NumberType> distrib(min, max);

2
include/misc/Updater.h
View File

@@ -34,7 +34,7 @@ public:
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();

6
include/render/gui/GuiManager.h
View File

@@ -12,13 +12,13 @@ class GuiManager {
private:
std::vector<std::shared_ptr<GuiWidget>> 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<GuiWidget>& widget){
void addWidgets(const std::shared_ptr<GuiWidget>& widget) {
m_Widgets.push_back(std::move(widget));
}
};

2
include/render/gui/SummonMenu.h
View File

@@ -8,7 +8,7 @@
namespace td {
namespace gui {
class SummonMenu : public GuiWidget{
class SummonMenu : public GuiWidget {
private:
bool m_MenuOpened;
int m_ImageWidth = 100;

2
include/render/gui/TowerGui.h
View File

@@ -10,7 +10,7 @@
#include <memory>
struct SDL_Window;
typedef void *SDL_GLContext;
typedef void* SDL_GLContext;
namespace td {

28
src/game/Mobs.cpp
View File

@@ -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,20 +39,20 @@ 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:{
switch (effect.type) {
case EffectType::Fire: {
m_EffectFireTimer.reset();
break;
}
case EffectType::Poison:{
case EffectType::Poison: {
m_EffectPoisonTimer.reset();
break;
}
case EffectType::Heal:{
case EffectType::Heal: {
m_EffectHealTimer.reset();
}
@@ -61,18 +61,18 @@ void Mob::updateEffects(std::uint64_t delta) {
}
}
}
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,8 +305,8 @@ 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){
std::string MobFactory::getMobName(MobType type) {
switch (type) {
case MobType::Zombie:
return "Zombie";
case MobType::Spider:

10
src/game/Towers.cpp
View File

@@ -116,8 +116,8 @@ const std::map<std::pair<TowerType, TowerLevel>, 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,11 +251,11 @@ 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()){
switch (getLevel().getLevel()) {
case 1:
durationSec = 5;
break;

2
src/game/World.cpp
View File

@@ -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;
}

4
src/game/client/Client.cpp
View File

@@ -49,7 +49,7 @@ void Client::render() {
m_Game.renderWorld();
}
void Client::sendMobs(const std::vector<protocol::MobSend>& mobSends){
void Client::sendMobs(const std::vector<protocol::MobSend>& 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);
}

2
src/game/client/WorldClient.cpp
View File

@@ -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());
}

6
src/game/server/Server.cpp
View File

@@ -32,9 +32,9 @@ 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();

4
src/game/server/ServerConnexion.cpp
View File

@@ -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);

8
src/game/server/ServerGame.cpp
View File

@@ -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();

2
src/misc/Time.cpp
View File

@@ -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;
}

2
src/protocol/PacketFactory.cpp
View File

@@ -6,7 +6,7 @@ namespace td {
namespace protocol {
namespace PacketFactory {
using PacketCreator = std::function<PacketPtr ()>;
using PacketCreator = std::function<PacketPtr()>;
static std::map<PacketType, PacketCreator> packets = {
{PacketType::PlayerLogin, []() -> PacketPtr {return std::make_unique<PlayerLoginPacket>();} },

4
src/protocol/Protocol.cpp
View File

@@ -498,7 +498,7 @@ void WorldRemoveTowerPacket::Deserialize(DataBuffer& data) {
DataBuffer SendMobsPacket::Serialize() const {
DataBuffer data;
data << getID() << static_cast<std::uint8_t>(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);
}

4
src/render/Renderer.cpp
View File

@@ -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);

10
src/render/WorldRenderer.cpp
View File

@@ -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,7 +226,7 @@ void WorldRenderer::detectClick() {
}
void WorldRenderer::renderMobTooltip() const {
if(ImGui::IsAnyItemHovered()) return;
if (ImGui::IsAnyItemHovered()) return;
detectMobHovering();
m_MobTooltip->render();

4
src/render/gui/FrameMenu.cpp
View File

@@ -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);
}

2
src/render/gui/GameMenu.cpp
View File

@@ -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");

6
src/render/gui/MainMenu.cpp
View File

@@ -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();
}
@@ -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<td::server::Server>(m_WorldFilePath);

10
src/render/gui/SummonMenu.cpp
View File

@@ -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<protocol::MobSend> 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);

2
src/render/gui/TowerGui.cpp
View File

@@ -29,7 +29,7 @@ void TowerGui::initWidgets() {
}
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<client::Client>(m_Renderer)) {
m_GlContext(glContext), m_Renderer(renderer), m_Client(std::make_unique<client::Client>(m_Renderer)) {
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGui::StyleColorsDark();

2
src/render/gui/TowerPlacePopup.cpp
View File

@@ -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();
}

18
src/render/gui/UpdateMenu.cpp
View File

@@ -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();
}

4
src/render/shaders/ShaderProgram.cpp
View File

@@ -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;
}