chore: bump version to alpha-0.0.2

include/game/Mobs.h

@@ -2,10 +2,13 @@
 
 #include "Towers.h"
 #include "Types.h"
+#include "Team.h"
 
 #include <vector>
 #include <memory>
 
+#include <glm/glm.hpp>
+
 namespace td {
 namespace game {
 
@@ -41,27 +44,29 @@ class MobStats {
 private:
     float m_Damage;
     float m_Speed;
+    glm::vec2 m_Size;
     std::uint16_t m_MoneyCost;
     std::uint16_t m_ExpCost;
     std::uint16_t m_MaxLife;
     std::uint16_t m_ExpReward;
 public:
-    MobStats(float damage, float speed, std::uint16_t moneyCost,
+    MobStats(float damage, float speed, glm::vec2 size, std::uint16_t moneyCost,
         std::uint16_t expCost, std::uint16_t expReward,
         std::uint16_t maxLife) : m_Damage(damage), m_Speed(speed),
-        m_MoneyCost(moneyCost), m_ExpCost(expCost), m_MaxLife(maxLife),
+        m_Size(size), m_MoneyCost(moneyCost), m_ExpCost(expCost),
-        m_ExpReward(expReward) {
+        m_MaxLife(maxLife), m_ExpReward(expReward) {
     }
 
     float getDamage() const { return m_Damage; }
     float getMovementSpeed() const { return m_Speed; }
+    const glm::vec2& getSize() const { return m_Size; }
     std::uint16_t getMoneyCost() const { return m_MoneyCost; }
     std::uint16_t getExpCost() const { return m_ExpCost; }
     std::uint16_t getExpReward() const { return m_ExpReward; }
     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
@@ -71,7 +76,7 @@ const MobStats* getMobStats(MobType type, std::uint8_t level);
 const TowerImmunities& getMobTowerImmunities(MobType type, std::uint8_t level);
 const EffectImmunities& getMobEffectImmunities(MobType type, std::uint8_t level);
 
-class Mob {
+class Mob : public utils::shape::Rectangle{
 protected:
     float m_Health;
 private:
@@ -80,15 +85,14 @@ private:
     MobLevel m_Level;
     Direction m_Direction;
     std::vector<EffectDuration> m_Effects;
-    const Tower* m_LastDamage;   // the tower that damaged the mob
+    const Tower* m_LastDamage;   // the last tower that damaged the mob
 
     utils::Timer m_EffectFireTimer;
     utils::Timer m_EffectPoisonTimer;
     utils::Timer m_EffectHealTimer;
 
-    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 +101,7 @@ public:
 
     virtual void tick(std::uint64_t delta);
 
-    virtual void OnDeath(World* world){}
+    virtual bool OnDeath(World* world) { return true; }
 
     const TowerImmunities& getTowerImmunities() const { return getMobTowerImmunities(getType(), m_Level); }
     const EffectImmunities& getEffectImmunities() const { return getMobEffectImmunities(getType(), m_Level); }
@@ -110,13 +114,7 @@ public:
     const Tower* getLastDamageTower() { return m_LastDamage; }
 
     void damage(float dmg, const Tower* damager) { m_Health = std::max(0.0f, m_Health - dmg); m_LastDamage = damager; }
-    void heal(float heal) { m_Health = std::min((float)getStats()->getMaxLife(), m_Health + heal); }
+    void heal(float heal) { m_Health = std::min(static_cast<float>(getStats()->getMaxLife()), m_Health + heal); }
-
-    float getX() const { return m_X; }
-    void setX(float x) { m_X = x; }
-
-    float getY() const { return m_Y; }
-    void setY(float y) { m_Y = y; }
 
     bool isImmuneTo(TowerType type);
 
@@ -128,7 +126,10 @@ public:
     Direction getDirection() const { return m_Direction; }
     void setDirection(Direction dir) { m_Direction = dir; }
 protected:
-    void initHealth() { m_Health = (float)getStats()->getMaxLife(); }
+    void initMob() { 
+        m_Health = static_cast<float>(getStats()->getMaxLife()); 
+        setSize(getStats()->getSize().x, getStats()->getSize().y);
+    }
 private:
     void updateEffects(std::uint64_t delta);
     EffectDuration& getEffect(EffectType type);
@@ -138,70 +139,70 @@ typedef std::shared_ptr<Mob> MobPtr;
 
 class Zombie : public Mob {
 public:
-    Zombie(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Zombie(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Zombie; }
 };
 
 class Spider : public Mob {
 public:
-    Spider(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Spider(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Spider; }
 };
 
 class Skeleton : public Mob {
 public:
-    Skeleton(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Skeleton(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Skeleton; }
 };
 
 class PigMan : public Mob {
 public:
-    PigMan(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    PigMan(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Pigman; }
 };
 
 class Creeper : public Mob {
 public:
-    Creeper(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Creeper(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Creeper; }
 };
 
 class Silverfish : public Mob {
 public:
-    Silverfish(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Silverfish(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Silverfish; }
 };
 
 class Blaze : public Mob {
 public:
-    Blaze(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Blaze(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Blaze; }
 };
 
 class Witch : public Mob {
 public:
-    Witch(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Witch(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Witch; }
 };
 
 class Slime : public Mob {
 public:
-    Slime(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Slime(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Slime; }
 };
 
 class Giant : public Mob {
 public:
-    Giant(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initHealth(); }
+    Giant(MobID id, std::uint8_t level, PlayerID sender) : Mob(id, level, sender) { initMob(); }
 
     virtual MobType getType() const { return MobType::Giant; }
 };

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

include/game/Team.h

@@ -2,9 +2,11 @@
 
 #include "Types.h"
 
+#include "misc/Shapes.h"
+
 #include <vector>
 #include <memory>
-#include <algorithm>
+#include <cmath>
 
 namespace td {
 namespace game {
@@ -17,14 +19,33 @@ enum class TeamColor : std::int8_t {
     Blue
 };
 
-struct Spawn {
+class Spawn : public utils::shape::Rectangle {
-    Direction direction;
+private:
-    std::int32_t x, y;
+    Direction m_Direction;
+public:
+    Spawn(){
+        setWidth(5);
+        setHeight(5);
+    }
+
+    Direction getDirection() const { return m_Direction; }
+
+    void setDirection(Direction direction) { m_Direction = direction; }
 };
 
-struct TeamCastle {
+struct TeamCastle : public utils::shape::Rectangle{
-    std::int32_t x, y;
+private:
-    std::uint16_t life = 1000;
+    float m_Life;
+public:
+    TeamCastle() : m_Life(1000) {
+        setWidth(5);
+        setHeight(5);
+    }
+
+    float getLife() const { return m_Life; }
+
+    void setLife(float life) { m_Life = life; }
+    void damage(float damage) { m_Life = std::max(0.0f, m_Life - damage); }
 };
 
 class Team {

include/game/Towers.h

@@ -5,6 +5,8 @@
 #include <memory>
 
 #include "misc/Time.h"
+#include "misc/Shapes.h"
+
 #include "game/Types.h"
 
 namespace td {
@@ -85,19 +87,18 @@ const TowerStats* getTowerStats(TowerType type, TowerLevel level);
 
 typedef std::uint16_t TowerID;
 
-class Tower {
+class Tower : public utils::shape::Circle {
 private:
     TowerID m_ID;
     TowerType m_Type;
-    std::int32_t m_X, m_Y;
     TowerLevel m_Level{};
     PlayerID m_Builder;
 protected:
     utils::CooldownTimer m_Timer;
 public:
-    Tower(TowerID id, TowerType type, std::int32_t x, std::int32_t y, PlayerID builder) : m_ID(id), m_Type(type), m_X(x), m_Y(y), m_Builder(builder),
+    Tower(TowerID id, TowerType type, std::int32_t x, std::int32_t y, PlayerID builder) : utils::shape::Circle(x + 0.5f, y + 0.5f, 0), m_ID(id), m_Type(type), m_Builder(builder),
         m_Timer(getStats()->getDamageRate() * 1000) { // converting seconds to millis
-
+        setRadius(getStats()->getRange());
     }
 
     virtual TowerType getType() const = 0;
@@ -109,11 +110,10 @@ public:
         m_Level.setPath(path);
         m_Timer.setCooldown(getStats()->getDamageRate() * 1000); // converting seconds to millis
         m_Timer.reset();
+        setRadius(getStats()->getRange());
     }
 
     std::uint16_t getID() const { return m_ID; }
-    std::int32_t getX() const { return m_X; }
-    std::int32_t getY() const { return m_Y; }
     const TowerLevel& getLevel() const { return m_Level; }
     const TowerStats* getStats() const { return getTowerStats(m_Type, m_Level); }
     PlayerID getBuilder() const { return m_Builder; }

include/game/World.h

@@ -134,6 +134,8 @@ protected:
 public:
     World(Game* game);
 
+    static constexpr std::uint8_t CastleWidth = 5, CastleHeight = 5;
+
     bool loadMap(const protocol::WorldBeginDataPacket* worldHeader);
     bool loadMap(const protocol::WorldDataPacket* worldData);
 
@@ -191,6 +193,9 @@ public:
     virtual void OnArrowShot(MobPtr target, Tower* shooter);
 private:
     void moveMobs(std::uint64_t delta);
+    void moveMob(MobPtr mob, std::uint64_t delta);
+    void moveBackMob(MobPtr mob, const TeamCastle& castle);
+    bool isMobTouchingCastle(MobPtr mob, const TeamCastle& castle) const;
     void tickMobs(std::uint64_t delta);
     void cleanDeadMobs();
 };

include/misc/Compression.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include "misc/DataBuffer.h"
+#include "DataBuffer.h"
 
 namespace td {
 namespace utils {

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
 }

include/misc/Random.h

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

include/misc/Shapes.h

@@ -0,0 +1,85 @@
+#pragma once
+
+#include <cstdint>
+
+namespace td {
+namespace utils {
+namespace shape {
+
+class Point {
+private:
+    float m_X, m_Y;
+public:
+    Point() : m_X(0), m_Y(0) {}
+    Point(float x, float y) : m_X(x), m_Y(y) {}
+
+    float getX() const { return m_X; }
+    float getY() const { return m_Y; }
+
+    void setX(float x) { m_X = x; }
+    void setY(float y) { m_Y = y; }
+
+    float distance(const Point& point) const;
+    float distanceSquared(const Point& point) const;
+};
+
+class Circle;
+
+class Rectangle {
+private:
+    Point m_Center;
+    float m_Width, m_Height;
+public:
+    Rectangle() {}
+
+    const Point& getCenter() const { return m_Center; }
+    float getCenterX() const { return m_Center.getX(); }
+    float getCenterY() const { return m_Center.getY(); }
+
+    float getWidth() const { return m_Width; }
+    float getHeight() const { return m_Height; }
+
+    Point getTopLeft() const { return { m_Center.getX() - (m_Width / 2.0f), m_Center.getY() - (m_Height / 2.0f) }; }
+    Point getBottomRight() const { return { m_Center.getX() + (m_Width / 2.0f), m_Center.getY() + (m_Height / 2.0f) }; }
+
+    void setCenter(const Point& center) { m_Center = center; }
+    void setCenterX(float x) { m_Center.setX(x); }
+    void setCenterY(float y) { m_Center.setY(y); }
+
+    void setSize(float width, float height) { setWidth(width); setHeight(height); }
+    void setWidth(float width) { m_Width = width; }
+    void setHeight(float height) { m_Height = height; }
+
+    bool collidesWith(const Point& point) const;
+    bool collidesWith(const Rectangle& rect) const;
+    bool collidesWith(const Circle& circle) const;
+};
+
+class Circle {
+private:
+    Point m_Center;
+    float m_Radius;
+public:
+    Circle(float x, float y, float radius) : m_Center(x, y), m_Radius(radius) {}
+    Circle() : m_Radius(0) {}
+
+    const Point& getCenter() const { return m_Center; }
+    float getCenterX() const { return m_Center.getX(); }
+    float getCenterY() const { return m_Center.getY(); }
+
+    float getRadius() const { return m_Radius; }
+
+    void setCenter(const Point& center) { m_Center = center; }
+    void setCenterX(float x) { m_Center.setX(x); }
+    void setCenterY(float y) { m_Center.setY(y); }
+
+    void setRadius(float radius) { m_Radius = radius; }
+
+    bool collidesWith(const Point& point) const;
+    bool collidesWith(const Rectangle& rect) const;
+    bool collidesWith(const Circle& circle) const;
+};
+
+} // namespace shape
+} // namespace utils 
+} // namespace td

include/misc/Time.h

@@ -64,7 +64,7 @@ public:
 
     bool update(std::uint64_t delta);
 
-    void applyCooldown(); 
+    void applyCooldown();
 
     void reset();
 

include/misc/Updater.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "misc/DataBuffer.h"
+#include "DataBuffer.h"
 
 #include <ctime>
 
-#define TD_VERSION "alpha-0.0.1"
+#define TD_VERSION "alpha-0.0.2"
 
 namespace td {
 namespace utils {
@@ -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();

include/render/WorldRenderer.h

@@ -37,7 +37,7 @@ private:
     float m_CamSensibility = 1;
     bool m_PopupOpened = false;
     VertexCache m_TowersCache;
-    
+
     std::unique_ptr<gui::TowerPlacePopup> m_TowerPlacePopup;
     std::unique_ptr<gui::MobTooltip> m_MobTooltip;
 public:

include/render/gui/GuiManager.h

@@ -12,13 +12,13 @@ class GuiManager {
 private:
     std::vector<std::shared_ptr<GuiWidget>> m_Widgets;
 public:
-    void renderWidgets(){
+    void renderWidgets() {
-        for(auto widget : m_Widgets){
+        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));
     }
 };

include/render/gui/MobTooltip.h

@@ -7,7 +7,7 @@ namespace td {
 namespace game {
 
 class Mob;
-    
+
 } // namespace game
 
 namespace gui {

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;

include/render/gui/TowerGui.h

@@ -10,7 +10,7 @@
 #include <memory>
 
 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 {

include/render/gui/TowerPlacePopup.h

@@ -17,11 +17,11 @@ public:
 
     void setClickPos(const glm::vec2& worldPos);
 private:
-    static constexpr float m_TowerPopupTileWidth = 250.0f;
+    static constexpr float m_TowerPopupTileWidth = 200.0f;
-    static constexpr float m_TowerPopupTileHeight = 250.0f;
+    static constexpr float m_TowerPopupTileHeight = 200.0f;
 
-    static constexpr float m_PlaceTowerButtonWidth = 200.0f;
+    static constexpr float m_PlaceTowerButtonWidth = 150.0f;
-    static constexpr float m_PlaceTowerButtonHeight = 45.0f;
+    static constexpr float m_PlaceTowerButtonHeight = 35.0f;
 };
 
 } // namespace gui

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){
+            switch (effect.type) {
-                case EffectType::Fire:{
+            case EffectType::Fire: {
-                    m_EffectFireTimer.reset();
+                m_EffectFireTimer.reset();
-                    break;
+                break;
-                }
+            }
 
-                case EffectType::Poison:{
+            case EffectType::Poison: {
-                    m_EffectPoisonTimer.reset();
+                m_EffectPoisonTimer.reset();
-                    break;
+                break;
-                }
+            }
 
-                case EffectType::Heal:{
+            case EffectType::Heal: {
-                    m_EffectHealTimer.reset();
+                m_EffectHealTimer.reset();
-                }
+            }
 
-                default:
+            default:
-                    break;
+                break;
             }
         }
     }
-    if(hasEffect(EffectType::Fire)){
+    if (hasEffect(EffectType::Fire)) {
-        if(m_EffectFireTimer.update(delta)){
+        if (m_EffectFireTimer.update(delta)) {
             damage(3, getEffect(EffectType::Fire).tower);
         }
     }
-    if(hasEffect(EffectType::Poison)){
+    if (hasEffect(EffectType::Poison)) {
-        if(m_EffectPoisonTimer.update(delta)){
+        if (m_EffectPoisonTimer.update(delta)) {
             damage(1, getEffect(EffectType::Poison).tower);
         }
     }
-    if(hasEffect(EffectType::Heal)){
+    if (hasEffect(EffectType::Heal)) {
-        if(m_EffectFireTimer.update(delta)){
+        if (m_EffectFireTimer.update(delta)) {
             heal(10);
         }
     }
@@ -88,66 +88,66 @@ bool Mob::hasEffect(EffectType type) {
 typedef std::pair<MobType, std::uint8_t> MobKey;
 
 const std::map<MobKey, MobStats> MobConstants = {
-    // damage  speed  money_cost  exp_cost  exp_reward  max_health
+    // damage  speed  size  money_cost  exp_cost  exp_reward  max_health
-    {{MobType::Zombie, 1},{MobStats{1, 1.6, 15, 0, 7, 40}}},
+    {{MobType::Zombie, 1},{MobStats{1, 1.6, {1, 1}, 15, 0, 7, 40}}},
-    {{MobType::Zombie, 2},{MobStats{1, 1.6, 18, 88, 9, 56}}},
+    {{MobType::Zombie, 2},{MobStats{1, 1.6, {1, 1}, 18, 88, 9, 56}}},
-    {{MobType::Zombie, 3},{MobStats{1, 1.6, 22, 153, 10, 78}}},
+    {{MobType::Zombie, 3},{MobStats{1, 1.6, {1, 1}, 22, 153, 10, 78}}},
-    {{MobType::Zombie, 4},{MobStats{1.5, 1.6, 26, 268, 13, 110}}},
+    {{MobType::Zombie, 4},{MobStats{1.5, 1.6, {1, 1}, 26, 268, 13, 110}}},
-    {{MobType::Zombie, 5},{MobStats{2, 1.6, 31, 469, 15, 154}}},
+    {{MobType::Zombie, 5},{MobStats{2, 1.6, {1, 1}, 31, 469, 15, 154}}},
 
-    {{MobType::Spider, 1},{MobStats{1, 1.6, 25, 100, 15, 80}}},
+    {{MobType::Spider, 1},{MobStats{1, 1.6, {1, 1}, 25, 100, 15, 80}}},
-    {{MobType::Spider, 2},{MobStats{1, 2, 30, 175, 16, 112}}},
+    {{MobType::Spider, 2},{MobStats{1, 2, {1, 1}, 30, 175, 16, 112}}},
-    {{MobType::Spider, 3},{MobStats{1.5, 2, 36, 306, 18, 157}}},
+    {{MobType::Spider, 3},{MobStats{1.5, 2, {1, 1}, 36, 306, 18, 157}}},
-    {{MobType::Spider, 4},{MobStats{2.5, 2, 43, 536, 19, 222}}},
+    {{MobType::Spider, 4},{MobStats{2.5, 2, {1, 1}, 43, 536, 19, 222}}},
-    {{MobType::Spider, 5},{MobStats{1.5, 2.5, 52, 938, 22, 307}}},
+    {{MobType::Spider, 5},{MobStats{1.5, 2.5, {1, 1}, 52, 938, 22, 307}}},
 
-    {{MobType::Skeleton, 1},{MobStats{1, 1.6, 120, 200, 30, 350}}},
+    {{MobType::Skeleton, 1},{MobStats{1, 1.6, {1, 1}, 120, 200, 30, 350}}},
-    {{MobType::Skeleton, 2},{MobStats{1, 1.6, 144, 350, 33, 490}}},
+    {{MobType::Skeleton, 2},{MobStats{1, 1.6, {1, 1}, 144, 350, 33, 490}}},
-    {{MobType::Skeleton, 3},{MobStats{1, 1.6, 173, 613, 36, 686}}},
+    {{MobType::Skeleton, 3},{MobStats{1, 1.6, {1, 1}, 173, 613, 36, 686}}},
-    {{MobType::Skeleton, 4},{MobStats{1.5, 1.6, 225, 1072, 40, 960}}},
+    {{MobType::Skeleton, 4},{MobStats{1.5, 1.6, {1, 1}, 225, 1072, 40, 960}}},
-    {{MobType::Skeleton, 5},{MobStats{2, 1.6, 255, 1876, 43, 1345}}},
+    {{MobType::Skeleton, 5},{MobStats{2, 1.6, {1, 1}, 255, 1876, 43, 1345}}},
 
-    {{MobType::Pigman, 1},{MobStats{1, 2, 100, 150, 22, 150}}},
+    {{MobType::Pigman, 1},{MobStats{1, 2, {1, 1}, 100, 150, 22, 150}}},
-    {{MobType::Pigman, 2},{MobStats{1, 2, 120, 263, 24, 210}}},
+    {{MobType::Pigman, 2},{MobStats{1, 2, {1, 1}, 120, 263, 24, 210}}},
-    {{MobType::Pigman, 3},{MobStats{1, 2, 144, 459, 25, 297}}},
+    {{MobType::Pigman, 3},{MobStats{1, 2, {1, 1}, 144, 459, 25, 297}}},
-    {{MobType::Pigman, 4},{MobStats{1, 2, 173, 804, 25, 412}}},
+    {{MobType::Pigman, 4},{MobStats{1, 2, {1, 1}, 173, 804, 25, 412}}},
-    {{MobType::Pigman, 5},{MobStats{1.5, 2, 207, 1407, 27, 576}}},
+    {{MobType::Pigman, 5},{MobStats{1.5, 2, {1, 1}, 207, 1407, 27, 576}}},
 
-    {{MobType::Creeper, 1},{MobStats{1, 2, 250, 325, 46, 350}}},
+    {{MobType::Creeper, 1},{MobStats{1, 2, {1, 1}, 250, 325, 46, 350}}},
-    {{MobType::Creeper, 2},{MobStats{1, 2, 290, 550, 49, 460}}},
+    {{MobType::Creeper, 2},{MobStats{1, 2, {1, 1}, 290, 550, 49, 460}}},
-    {{MobType::Creeper, 3},{MobStats{2, 2, 350, 800, 55, 630}}},
+    {{MobType::Creeper, 3},{MobStats{2, 2, {1, 1}, 350, 800, 55, 630}}},
-    {{MobType::Creeper, 4},{MobStats{3, 2, 420, 1300, 61, 900}}},
+    {{MobType::Creeper, 4},{MobStats{3, 2, {1, 1}, 420, 1300, 61, 900}}},
-    {{MobType::Creeper, 5},{MobStats{4, 2, 510, 1850, 67, 1250}}},
+    {{MobType::Creeper, 5},{MobStats{4, 2, {1, 1}, 510, 1850, 67, 1250}}},
 
-    {{MobType::Silverfish, 1},{MobStats{1, 1.6, 38, 125, 18, 120}}},
+    {{MobType::Silverfish, 1},{MobStats{1, 1.6, {1, 1}, 38, 125, 18, 120}}},
-    {{MobType::Silverfish, 2},{MobStats{1, 1.6, 50, 230, 19, 170}}},
+    {{MobType::Silverfish, 2},{MobStats{1, 1.6, {1, 1}, 50, 230, 19, 170}}},
-    {{MobType::Silverfish, 3},{MobStats{1, 1.6, 75, 340, 25, 225}}},
+    {{MobType::Silverfish, 3},{MobStats{1, 1.6, {1, 1}, 75, 340, 25, 225}}},
-    {{MobType::Silverfish, 4},{MobStats{1.5, 1.6, 170, 700, 33, 310}}},
+    {{MobType::Silverfish, 4},{MobStats{1.5, 1.6, {1, 1}, 170, 700, 33, 310}}},
-    {{MobType::Silverfish, 5},{MobStats{1.5, 1.6, 200, 1800, 36, 390}}},
+    {{MobType::Silverfish, 5},{MobStats{1.5, 1.6, {1, 1}, 200, 1800, 36, 390}}},
 
-    {{MobType::Blaze, 1},{MobStats{1, 1.6, 500, 500, 105, 410}}},
+    {{MobType::Blaze, 1},{MobStats{1, 1.6, {1, 1}, 500, 500, 105, 410}}},
-    {{MobType::Blaze, 2},{MobStats{1, 1.6, 600, 875, 111, 574}}},
+    {{MobType::Blaze, 2},{MobStats{1, 1.6, {1, 1}, 600, 875, 111, 574}}},
-    {{MobType::Blaze, 3},{MobStats{1, 1.6, 720, 1531, 115, 804}}},
+    {{MobType::Blaze, 3},{MobStats{1, 1.6, {1, 1}, 720, 1531, 115, 804}}},
-    {{MobType::Blaze, 4},{MobStats{1.5, 1.6, 864, 2680, 121, 1125}}},
+    {{MobType::Blaze, 4},{MobStats{1.5, 1.6, {1, 1}, 864, 2680, 121, 1125}}},
-    {{MobType::Blaze, 5},{MobStats{2, 1.6, 1037, 4689, 127, 1575}}},
+    {{MobType::Blaze, 5},{MobStats{2, 1.6, {1, 1}, 1037, 4689, 127, 1575}}},
 
-    {{MobType::Witch, 1},{MobStats{1, 1.6, 150, 300, 37, 300}}},
+    {{MobType::Witch, 1},{MobStats{1, 1.6, {1, 1}, 150, 300, 37, 300}}},
-    {{MobType::Witch, 2},{MobStats{1, 1.6, 165, 525, 39, 405}}},
+    {{MobType::Witch, 2},{MobStats{1, 1.6, {1, 1}, 165, 525, 39, 405}}},
-    {{MobType::Witch, 3},{MobStats{1, 1.6, 182, 918, 42, 547}}},
+    {{MobType::Witch, 3},{MobStats{1, 1.6, {1, 1}, 182, 918, 42, 547}}},
-    {{MobType::Witch, 4},{MobStats{1.5, 1.6, 200, 1606, 43, 738}}},
+    {{MobType::Witch, 4},{MobStats{1.5, 1.6, {1, 1}, 200, 1606, 43, 738}}},
-    {{MobType::Witch, 5},{MobStats{2, 1.6, 220, 2810, 45, 996}}},
+    {{MobType::Witch, 5},{MobStats{2, 1.6, {1, 1}, 220, 2810, 45, 996}}},
 
-    {{MobType::Slime, 1},{MobStats{1, 0.8, 1500, 1000, 300, 800}}},
+    {{MobType::Slime, 1},{MobStats{1, 0.8, {1, 1}, 1500, 1000, 300, 800}}},
-    {{MobType::Slime, 2},{MobStats{1.5, 0.8, 1800, 1750, 314, 880}}},
+    {{MobType::Slime, 2},{MobStats{1.5, 0.8, {1, 1}, 1800, 1750, 314, 880}}},
-    {{MobType::Slime, 3},{MobStats{2, 0.8, 2160, 3063, 330, 968}}},
+    {{MobType::Slime, 3},{MobStats{2, 0.8, {1, 1}, 2160, 3063, 330, 968}}},
-    {{MobType::Slime, 4},{MobStats{2.5, 0.8, 2592, 5359, 348, 1065}}},
+    {{MobType::Slime, 4},{MobStats{2.5, 0.8, {1, 1}, 2592, 5359, 348, 1065}}},
-    {{MobType::Slime, 5},{MobStats{3, 0.8, 3110, 9379, 366, 1171}}},
+    {{MobType::Slime, 5},{MobStats{3, 0.8, {1, 1}, 3110, 9379, 366, 1171}}},
 
-    {{MobType::Giant, 1},{MobStats{10, 0.8, 4000, 2250, 600, 6250}}},
+    {{MobType::Giant, 1},{MobStats{10, 0.8, {1, 1}, 4000, 2250, 600, 6250}}},
-    {{MobType::Giant, 2},{MobStats{20, 0.8, 4500, 4000, 612, 9375}}},
+    {{MobType::Giant, 2},{MobStats{20, 0.8, {1, 1}, 4500, 4000, 612, 9375}}},
-    {{MobType::Giant, 3},{MobStats{30, 0.8, 5062, 7250, 624, 14062}}},
+    {{MobType::Giant, 3},{MobStats{30, 0.8, {1, 1}, 5062, 7250, 624, 14062}}},
-    {{MobType::Giant, 4},{MobStats{40, 0.8, 5695, 12500, 636, 21093}}},
+    {{MobType::Giant, 4},{MobStats{40, 0.8, {1, 1}, 5695, 12500, 636, 21093}}},
-    {{MobType::Giant, 5},{MobStats{50, 0.8, 6407, 22000, 648, 31640}}},
+    {{MobType::Giant, 5},{MobStats{50, 0.8, {1, 1}, 6407, 22000, 648, 31640}}},
 };
 
 const MobStats* getMobStats(MobType type, std::uint8_t level) {
@@ -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){
+std::string MobFactory::getMobName(MobType type) {
-    switch(type){
+    switch (type) {
-        case MobType::Zombie:
+    case MobType::Zombie:
-            return "Zombie";
+        return "Zombie";
-        case MobType::Spider:
+    case MobType::Spider:
-            return "Spider";
+        return "Spider";
-        case MobType::Skeleton:
+    case MobType::Skeleton:
-            return "Skeleton";
+        return "Skeleton";
-        case MobType::Pigman:
+    case MobType::Pigman:
-            return "Pigman";
+        return "Pigman";
-        case MobType::Creeper:
+    case MobType::Creeper:
-            return "Creeper";
+        return "Creeper";
-        case MobType::Silverfish:
+    case MobType::Silverfish:
-            return "Silverfish";
+        return "Silverfish";
-        case MobType::Blaze:
+    case MobType::Blaze:
-            return "Blaze";
+        return "Blaze";
-        case MobType::Witch:
+    case MobType::Witch:
-            return "Witch";
+        return "Witch";
-        case MobType::Slime:
+    case MobType::Slime:
-            return "Slime";
+        return "Slime";
-        case MobType::Giant:
+    case MobType::Giant:
-            return "Giant";
+        return "Giant";
-        default:
+    default:
-            return "Unknow";
+        return "Unknow";
     }
 }
 

src/game/Team.cpp

@@ -1,5 +1,7 @@
 #include "game/Player.h"
 
+#include <algorithm>
+
 namespace td {
 namespace game {
 

src/game/Towers.cpp

@@ -9,7 +9,7 @@ namespace game {
 bool Tower::isMobInRange(MobPtr mob) {
     if (mob->isDead())
         return false;
-    return (m_X - mob->getX()) * (m_X - mob->getX()) + (m_Y - mob->getY()) * (m_Y - mob->getY()) < (getStats()->getRange() * getStats()->getRange());
+    return mob->collidesWith(*this);
 }
 
 const std::map<std::pair<TowerType, TowerLevel>, TowerStats> TowerConstants = {
@@ -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});
+    auto it = TowerConstants.find({ type, level });
-    if(it == TowerConstants.end()) return nullptr;
+    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()){
+                    switch (getLevel().getLevel()) {
-                        case 1:
+                    case 1:
-                            durationSec = 5;
+                        durationSec = 5;
-                            break;
+                        break;
 
-                        case 2:
+                    case 2:
-                            durationSec = 15;
+                        durationSec = 15;
-                            break;
+                        break;
 
-                        case 3:
+                    case 3:
-                            durationSec = 30;
+                        durationSec = 30;
-                            break;
+                        break;
 
-                        case 4:
+                    case 4:
-                            durationSec = 1e10; // about 3 million hours. It should be enough
+                        durationSec = 1e10; // about 3 million hours. It should be enough
-                            break;
+                        break;
 
-                        default:
+                    default:
-                            durationSec = 0; // how did we get there ?
+                        durationSec = 0; // how did we get there ?
-                            break;
+                        break;
                     }
                     mob->addEffect(EffectType::Poison, durationSec, this);
                 }

src/game/World.cpp

@@ -20,8 +20,8 @@ TilePtr World::getTile(std::int32_t x, std::int32_t y) const {
     std::int16_t chunkX = x / Chunk::ChunkWidth;
     std::int16_t chunkY = y / Chunk::ChunkHeight;
 
-    std::uint16_t subChunkX = x % Chunk::ChunkWidth;
+    std::uint16_t subChunkX = std::abs(x % Chunk::ChunkWidth);
-    std::uint16_t subChunkY = y % Chunk::ChunkHeight;
+    std::uint16_t subChunkY = std::abs(y % Chunk::ChunkHeight);
 
     auto chunkIt = m_Chunks.find({ chunkX, chunkY });
     if (chunkIt == m_Chunks.end())
@@ -111,8 +111,7 @@ void World::tick(std::uint64_t delta) {
 
 void World::spawnMobAt(MobID id, MobType type, std::uint8_t level, PlayerID sender, float x, float y, Direction dir) {
     MobPtr mob = MobFactory::createMob(id, type, level, sender);
-    mob->setX(x);
+    mob->setCenter({ x, y });
-    mob->setY(y);
     mob->setDirection(dir);
     m_Mobs.push_back(mob);
 }
@@ -131,41 +130,84 @@ void World::tickMobs(std::uint64_t delta) {
 
 void World::moveMobs(std::uint64_t delta) {
     for (MobPtr mob : m_Mobs) {
-        TilePtr tile = getTile(mob->getX(), mob->getY());
+        TilePtr tile = getTile(mob->getCenter().getX(), mob->getCenter().getY());
 
         if (tile != nullptr && tile->getType() == TileType::Walk) {
             WalkableTile* walkTile = dynamic_cast<WalkableTile*>(tile.get());
             mob->setDirection(walkTile->direction);
         }
 
-        float mobWalkSpeed = mob->getStats()->getMovementSpeed();
+        moveMob(mob, delta);
 
-        float walkAmount = mobWalkSpeed * ((float)delta / 1000.0f);
+        TeamColor mobTeam = m_Game->getPlayerById(mob->getSender()).getTeamColor();
 
-        if (mob->hasEffect(EffectType::Slowness))
+        const TeamCastle* enemyCastle;
-            walkAmount *= 0.70;
 
-        switch (mob->getDirection()) {
+        if (mobTeam == TeamColor::Red) {
-        case Direction::NegativeX: {
+            enemyCastle = &getBlueTeam().getCastle();
-            mob->setX(mob->getX() - walkAmount);
+        } else if (mobTeam == TeamColor::Blue) {
-            break;
+            enemyCastle = &getRedTeam().getCastle();
-        }
-        case Direction::PositiveX: {
-            mob->setX(mob->getX() + walkAmount);
-            break;
-        }
-        case Direction::NegativeY: {
-            mob->setY(mob->getY() - walkAmount);
-            break;
-        }
-        case Direction::PositiveY: {
-            mob->setY(mob->getY() + walkAmount);
-            break;
         }
+
+        if (isMobTouchingCastle(mob, *enemyCastle)) {
+            moveBackMob(mob, *enemyCastle);
         }
     }
 }
 
+void World::moveMob(MobPtr mob, std::uint64_t delta) {
+    float mobWalkSpeed = mob->getStats()->getMovementSpeed();
+
+    float walkAmount = mobWalkSpeed * ((float)delta / 1000.0f);
+
+    if (mob->hasEffect(EffectType::Slowness))
+        walkAmount *= 0.70; // walk 30% slower
+
+    switch (mob->getDirection()) {
+    case Direction::NegativeX: {
+        mob->setCenterX(mob->getCenterX() - walkAmount);
+        break;
+    }
+    case Direction::PositiveX: {
+        mob->setCenterX(mob->getCenterX() + walkAmount);
+        break;
+    }
+    case Direction::NegativeY: {
+        mob->setCenterY(mob->getCenterY() - walkAmount);
+        break;
+    }
+    case Direction::PositiveY: {
+        mob->setCenterY(mob->getCenterY() + walkAmount);
+        break;
+    }
+    }
+}
+
+bool World::isMobTouchingCastle(MobPtr mob, const TeamCastle& enemyCastle) const {
+    return enemyCastle.collidesWith(*mob);
+}
+
+void World::moveBackMob(MobPtr mob, const TeamCastle& enemyCastle) {
+    switch (mob->getDirection()) {
+    case Direction::NegativeX: {
+        mob->setCenterX(enemyCastle.getBottomRight().getX() + mob->getWidth() / 2.0f);
+        break;
+    }
+    case Direction::PositiveX: {
+        mob->setCenterX(enemyCastle.getTopLeft().getX() - mob->getWidth() / 2.0f);
+        break;
+    }
+    case Direction::NegativeY: {
+        mob->setCenterY(enemyCastle.getBottomRight().getY() + mob->getHeight() / 2.0f);
+        break;
+    }
+    case Direction::PositiveY: {
+        mob->setCenterY(enemyCastle.getTopLeft().getY() - mob->getHeight() / 2.0f);
+        break;
+    }
+    }
+}
+
 const Color* World::getTileColor(TilePtr tile) const {
     switch (tile->getType()) {
     case TileType::Tower: {
@@ -245,16 +287,16 @@ void World::cleanDeadMobs() {
     for (std::size_t i = 0; i < m_Mobs.size(); i++) {
         MobPtr mob = m_Mobs[i];
         if (mob->isDead()) {
-            mob->OnDeath(this);
+            if (mob->OnDeath(this)) {
+                //reward players
+                Player& sender = m_Game->getPlayerById(mob->getSender());
+                sender.addExp(mob->getStats()->getExpReward());
 
-            //reward players
+                Player& killer = m_Game->getPlayerById(mob->getLastDamageTower()->getBuilder());
-            Player& sender = m_Game->getPlayerById(mob->getSender());
+                killer.addGold(mob->getStats()->getMoneyCost());
-            sender.addExp(mob->getStats()->getExpReward());
 
-            Player& killer = m_Game->getPlayerById(mob->getLastDamageTower()->getBuilder());
+                m_Mobs.erase(m_Mobs.begin() + i);
-            killer.addGold(mob->getStats()->getMoneyCost());
+            }
-
-            m_Mobs.erase(m_Mobs.begin() + i);
         }
     }
 }
@@ -262,13 +304,13 @@ void World::cleanDeadMobs() {
 TowerPtr World::getTower(const glm::vec2& position) const {
     for (TowerPtr tower : m_Towers) {
         if (tower->getSize() == TowerSize::Big) {
-            if (tower->getX() - 2 <= static_cast<std::int32_t>(position.x) && tower->getX() + 2 >= static_cast<std::int32_t>(position.x) &&
+            if (tower->getCenterX() - 2.5f < position.x && tower->getCenterX() + 2.5f > position.x &&
-                tower->getY() - 2 <= static_cast<std::int32_t>(position.y) && tower->getY() + 2 >= static_cast<std::int32_t>(position.y)) {
+                tower->getCenterY() - 2.5f < position.y && tower->getCenterY() + 2.5f > position.y) {
                 return tower;
             }
-        } else {
+        } else { // little tower
-            if (tower->getX() - 1 <= static_cast<std::int32_t>(position.x) && tower->getX() + 1 >= static_cast<std::int32_t>(position.x) &&
+            if (tower->getCenterX() - 1.5f < position.x && tower->getCenterX() + 1.5f > position.x &&
-                tower->getY() - 1 <= static_cast<std::int32_t>(position.y) && tower->getY() + 1 >= static_cast<std::int32_t>(position.y)) {
+                tower->getCenterY() - 1.5f < position.y && tower->getCenterY() + 1.5f > position.y) {
                 return tower;
             }
         }
@@ -278,7 +320,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;
 }
 

src/game/client/Client.cpp

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

src/game/client/ClientGame.cpp

@@ -103,7 +103,7 @@ void ClientGame::HandlePacket(const protocol::WorldDataPacket* packet) {
     m_WorldRenderer.loadModels();
     // set cam pos to player spawn
     const game::Spawn& spawn = m_World->getTeam(m_Player->getTeamColor()).getSpawn();
-    m_WorldRenderer.setCamPos(spawn.x + 0.5, spawn.y + 0.5);
+    m_WorldRenderer.setCamPos(spawn.getCenterX(), spawn.getCenterY());
 }
 
 void ClientGame::renderWorld() {

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

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

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

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

src/game/server/ServerWorld.cpp

@@ -22,8 +22,8 @@ void ServerWorld::spawnMobs(game::MobType type, std::uint8_t level, game::Player
             enemyMobSpawn = &getTeam(game::TeamColor::Red).getSpawn();
         }
 
-        std::int32_t spawnCenterX = enemyMobSpawn->x;
+        std::int32_t spawnCenterX = enemyMobSpawn->getCenterX();
-        std::int32_t spawnCenterY = enemyMobSpawn->y;
+        std::int32_t spawnCenterY = enemyMobSpawn->getCenterY();
 
         std::int32_t minSpawnY = spawnCenterY - 2;
         std::int32_t maxSpawnY = spawnCenterY + 2;
@@ -34,9 +34,9 @@ void ServerWorld::spawnMobs(game::MobType type, std::uint8_t level, game::Player
         float mobX = utils::getRandomReal<float>(minSpawnX, maxSpawnX);
         float mobY = utils::getRandomReal<float>(minSpawnY, maxSpawnY);
 
-        spawnMobAt(m_CurrentMobID, type, level, sender, mobX, mobY, enemyMobSpawn->direction);
+        spawnMobAt(m_CurrentMobID, type, level, sender, mobX, mobY, enemyMobSpawn->getDirection());
 
-        protocol::SpawnMobPacket packet(m_CurrentMobID, type, level, sender, mobX, mobY, enemyMobSpawn->direction);
+        protocol::SpawnMobPacket packet(m_CurrentMobID, type, level, sender, mobX, mobY, enemyMobSpawn->getDirection());
         m_Server->broadcastPacket(&packet);
 
         m_CurrentMobID++;

src/misc/Shapes.cpp

@@ -0,0 +1,68 @@
+#include "misc/Shapes.h"
+
+#include <algorithm>
+#include <cmath>
+
+namespace td {
+namespace utils {
+namespace shape {
+
+float Point::distance(const Point& point) const {
+    return std::sqrt(distanceSquared(point));
+}
+
+float Point::distanceSquared(const Point& point) const {
+    return (m_X - point.getX()) * (m_X - point.getX()) + (m_Y - point.getY()) * (m_Y - point.getY());
+}
+
+
+bool Rectangle::collidesWith(const Point& point) const {
+    return point.getX() > getTopLeft().getX() && point.getX() < getBottomRight().getX() &&
+        point.getY() > getTopLeft().getY() && point.getY() < getBottomRight().getY();
+}
+
+bool Rectangle::collidesWith(const Rectangle& rect) const {
+    Point point1{ rect.getTopLeft().getX(), rect.getTopLeft().getY() };
+    Point point2{ rect.getTopLeft().getX(), rect.getBottomRight().getY() };
+    Point point3{ rect.getBottomRight().getX(), rect.getTopLeft().getY() };
+    Point point4{ rect.getBottomRight().getX(), rect.getBottomRight().getY() };
+
+    if (collidesWith(point1)) return true;
+    if (collidesWith(point2)) return true;
+    if (collidesWith(point3)) return true;
+    if (collidesWith(point4)) return true;
+
+    return false;
+}
+
+bool Rectangle::collidesWith(const Circle& circle) const {
+    return circle.collidesWith(*this);
+}
+
+
+
+
+
+bool Circle::collidesWith(const Point& point) const {
+    return m_Radius * m_Radius > m_Center.distanceSquared(point);
+}
+
+bool Circle::collidesWith(const Rectangle& rect) const {
+    float closestX = std::clamp(m_Center.getX(), rect.getTopLeft().getX(), rect.getBottomRight().getX());
+    float closestY = std::clamp(m_Center.getY(), rect.getTopLeft().getY(), rect.getBottomRight().getY());
+
+    float distanceX = m_Center.getX() - closestX;
+    float distanceY = m_Center.getY() - closestY;
+
+    float distanceSquared = (distanceX * distanceX) + (distanceY * distanceY);
+
+    return distanceSquared < m_Radius * m_Radius;
+}
+
+bool Circle::collidesWith(const Circle& circle) const {
+    return m_Radius + circle.getRadius() > m_Center.distanceSquared(circle.getCenter());
+}
+
+} // namespace shape
+} // namespace utils
+} // namespace td

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

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;

src/protocol/PacketFactory.cpp

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

src/protocol/Protocol.cpp

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

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

src/render/WorldRenderer.cpp

@@ -74,7 +74,7 @@ void WorldRenderer::renderMobs() const {
     for (game::MobPtr mob : m_World->getMobList()) {
         Renderer::Model model;
         model.vao = m_MobVao.get();
-        model.positon = { mob->getX(), mob->getY() };
+        model.positon = { mob->getCenterX(), mob->getCenterY() };
         m_Renderer->renderModel(model);
     }
 }
@@ -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 (canUpgrade && towerPath != game::TowerPath::Base) {
-                    if(currentPath != towerPath){
+                    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();
 }
@@ -235,12 +235,8 @@ void WorldRenderer::renderMobTooltip() const {
 void WorldRenderer::detectMobHovering() const {
     glm::vec2 cursorWorldPos = getCursorWorldPos();
     for (game::MobPtr mob : m_World->getMobList()) {
-        // mob size is currently 1x1 for all mobs
+        if(mob->collidesWith({cursorWorldPos.x, cursorWorldPos.y})){
-        float mobCenterX = mob->getX();
+            m_MobTooltip->setMob(mob.get());
-        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());
             return;
         }
     }

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

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

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(){
+MainMenu::~MainMenu() {
-    if(m_Server != nullptr)
+    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<td::server::Server>(m_WorldFilePath);

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::Text("Sender :");
-        ImGui::SameLine();
+    ImGui::SameLine();
-        ImGui::PushStyleColor(ImGuiCol_Text, render::WorldRenderer::getImGuiTeamColor(sender.getTeamColor()));
+    ImGui::PushStyleColor(ImGuiCol_Text, render::WorldRenderer::getImGuiTeamColor(sender.getTeamColor()));
-        ImGui::Text("%s", sender.getName().c_str());
+    ImGui::Text("%s", sender.getName().c_str());
-        ImGui::PopStyleColor();
+    ImGui::PopStyleColor();
-        ImGui::Text("Mob HP : %.1f/%i", m_Mob->getHealth(), m_Mob->getStats()->getMaxLife());
+    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 Type : %s", game::MobFactory::getMobName(m_Mob->getType()).c_str());
-        ImGui::Text("Mob Level : %i", m_Mob->getLevel());
+    ImGui::Text("Mob Level : %i", m_Mob->getLevel());
-        ImGui::NewLine();
+    ImGui::NewLine();
-        ImGui::Text("Mob Stats :");
+    ImGui::Text("Mob Stats :");
-        ImGui::Text("\tMax health : %i", m_Mob->getStats()->getMaxLife());
+    ImGui::Text("\tMax health : %i", m_Mob->getStats()->getMaxLife());
-        ImGui::Text("\tSpeed : %.1f", m_Mob->getStats()->getMovementSpeed());
+    ImGui::Text("\tSpeed : %.1f", m_Mob->getStats()->getMovementSpeed());
-        ImGui::Text("\tDamage : %.1f", m_Mob->getStats()->getDamage());
+    ImGui::Text("\tDamage : %.1f", m_Mob->getStats()->getDamage());
-        ImGui::Text("\tMoney cost : %i", m_Mob->getStats()->getMoneyCost());
+    ImGui::Text("\tMoney cost : %i", m_Mob->getStats()->getMoneyCost());
-        ImGui::Text("\tEXP cost : %i", m_Mob->getStats()->getExpCost());
+    ImGui::Text("\tEXP cost : %i", m_Mob->getStats()->getExpCost());
-        ImGui::Text("\tEXP reward : %i", m_Mob->getStats()->getExpReward());
+    ImGui::Text("\tEXP reward : %i", m_Mob->getStats()->getExpReward());
     ImGui::EndTooltip();
 }
 

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<protocol::MobSend> mobSent;
             protocol::MobSend mobSend;
-            for(int i = 0; i < m_MobTypeCount; i++){
+            for (int i = 0; i < m_MobTypeCount; i++) {
-                if(m_Values[i] != 0){
+                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);

src/render/gui/TowerGui.cpp

@@ -28,8 +28,8 @@ void TowerGui::initWidgets() {
     m_UpdateMenu = std::make_unique<td::gui::UpdateMenu>(m_Client.get());
 }
 
-TowerGui::TowerGui(SDL_Window* sdl_window, SDL_GLContext glContext, td::render::Renderer* renderer) : m_Window(sdl_window), 
+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();

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

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 (ImGui::Button("Install")) {
-                        if(!m_Updater.writeFile()){
+                        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(){
+void UpdateMenu::renderErrorPopup() {
-    if(ImGui::BeginPopup("UpdateError")){
+    if (ImGui::BeginPopup("UpdateError")) {
         ImGui::Text("Error : %s", m_Error.c_str());
         ImGui::EndPopup();
     }

src/render/loader/WorldLoader.cpp

@@ -97,8 +97,8 @@ GL::VertexArray loadWorldModel(const td::game::World* world) {
 
     for (int spawnColor = 0; spawnColor < 2; spawnColor++) {
         const game::Spawn& spawn = world->getTeam(game::TeamColor(spawnColor)).getSpawn();
-        float fromX = spawn.x - 2, toX = spawn.x + 3;
+        float fromX = spawn.getTopLeft().getX() , toX = spawn.getBottomRight().getX();
-        float fromY = spawn.y - 2, toY = spawn.y + 3;
+        float fromY = spawn.getTopLeft().getY() , toY = spawn.getBottomRight().getY();
 
         positions.insert(positions.end(), {
             fromX, fromY,
@@ -125,8 +125,8 @@ GL::VertexArray loadWorldModel(const td::game::World* world) {
 
     for (int castleColor = 0; castleColor < 2; castleColor++) {
         const game::TeamCastle& castle = world->getTeam(game::TeamColor(castleColor)).getCastle();
-        float fromX = castle.x - 2, toX = castle.x + 3;
+        float fromX = castle.getTopLeft().getX(), toX = castle.getBottomRight().getX();
-        float fromY = castle.y - 2, toY = castle.y + 3;
+        float fromY = castle.getTopLeft().getY(), toY = castle.getBottomRight().getY();
 
         positions.insert(positions.end(), {
             fromX, fromY,
@@ -203,17 +203,17 @@ RenderData loadTowerModel(game::TowerPtr tower) {
     float towerY, towerDY;
 
     if (tower->getSize() == game::TowerSize::Little) {
-        towerX = tower->getX() - 1;
+        towerX = tower->getCenterX() - 1.5f;
-        towerDX = tower->getX() + 2;
+        towerDX = tower->getCenterX() + 1.5f;
 
-        towerY = tower->getY() - 1;
+        towerY = tower->getCenterY() - 1.5f;
-        towerDY = tower->getY() + 2;
+        towerDY = tower->getCenterY() + 1.5f;
     } else {
-        towerX = tower->getX() - 2;
+        towerX = tower->getCenterX() - 2.5f;
-        towerDX = tower->getX() + 3;
+        towerDX = tower->getCenterX() + 2.5f;
 
-        towerY = tower->getY() - 2;
+        towerY = tower->getCenterY() - 2.5f;
-        towerDY = tower->getY() + 3;
+        towerDY = tower->getCenterY() + 2.5f;
     }
     std::vector<float> positions = {
         towerX, towerY,

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;

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

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;

xmake.lua

@@ -8,7 +8,7 @@ target("TowerDefense")
     add_files("src/*.cpp", "src/*/*.cpp", "src/*/*/*.cpp", "src/*/*/*/*.cpp")
     add_cxflags("-pthread")
 
-    set_languages("c++14")
+    set_languages("c++17")
 
     add_links("glbinding", "z", "SDL2")