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

feat: add basic towers rendering

Browse Source
This commit is contained in:
Simon Pribylski
2021-09-26 18:19:00 +02:00
parent 2ece5bc9b5
commit fe7cfdec72
22 changed files with 230 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/game/Player.h
View File

@@ -10,7 +10,7 @@ namespace game {
class Player {
private:
game::TeamColor m_TeamColor = game::TeamColor::None;
game::TeamColor m_TeamColor;
std::uint32_t m_Gold = 0;
std::int32_t m_EXP = 0;
@@ -19,7 +19,7 @@ private:
std::uint8_t m_GoldPerSecond = 5;
public:
Player(std::uint8_t id = 0) : m_ID(id) {}
Player(std::uint8_t id = 0) : m_TeamColor(game::TeamColor::None), m_ID(id) {}
const std::string& getName() const { return m_Name; }
void setName(const std::string& name) { m_Name = name; }

42
include/game/Towers.h
View File

@@ -77,8 +77,11 @@ public:
const TowerStats* getTowerStats(TowerType type, TowerLevel level);
typedef std::uint16_t TowerID;
class Tower {
private:
TowerID m_ID;
TowerType m_Type;
std::uint16_t m_X, m_Y;
TowerLevel m_Level{};
@@ -86,9 +89,9 @@ private:
protected:
utils::Timer m_Timer;
public: // converting seconds to millis
Tower(TowerType type, std::uint16_t x, std::uint16_t y, PlayerID builder) : m_Type(type), m_X(x), m_Y(y), m_Builder(builder),
m_Timer(getStats()->getDamageRate()) {
Tower(TowerID id, TowerType type, std::uint16_t x, std::uint16_t y, PlayerID builder) : m_ID(id), m_Type(type), m_X(x), m_Y(y), m_Builder(builder),
m_Timer(getStats()->getDamageRate()) {
}
virtual TowerType getType() const = 0;
@@ -100,6 +103,7 @@ public: // conve
m_Level.setPath(path);
}
std::uint16_t getID() const { return m_ID; }
std::uint16_t getX() const { return m_X; }
std::uint16_t getY() const { return m_Y; }
const TowerLevel& getLevel() const { return m_Level; }
@@ -109,10 +113,10 @@ public: // conve
typedef std::shared_ptr<Tower> TowerPtr;
namespace TowerFactory{
namespace TowerFactory {
TowerPtr createTower(TowerType type, TowerID id, std::int32_t x, std::int32_t y, PlayerID builder);
TowerPtr createTower(TowerType type, std::int32_t x, std::int32_t y, PlayerID builder);
} // namespace TowerFactory
@@ -136,7 +140,7 @@ const TowerInfo& getTowerInfo(TowerType type);
class LittleTower : public Tower {
public:
LittleTower(TowerType type, std::uint16_t x, std::uint16_t y, PlayerID builder) : Tower(type, x, y, builder) {}
LittleTower(TowerID id, TowerType type, std::uint16_t x, std::uint16_t y, PlayerID builder) : Tower(id, type, x, y, builder) {}
virtual TowerSize getSize() const { return TowerSize::Little; }
@@ -146,7 +150,7 @@ public:
class ArcherTower : public LittleTower {
public:
ArcherTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
ArcherTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Archer; }
virtual void tick(std::uint64_t delta);
@@ -154,7 +158,7 @@ public:
class IceTower : public LittleTower {
public:
IceTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
IceTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Ice; }
virtual void tick(std::uint64_t delta);
@@ -162,7 +166,7 @@ public:
class MageTower : public LittleTower {
public:
MageTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
MageTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Mage; }
virtual void tick(std::uint64_t delta);
@@ -170,7 +174,7 @@ public:
class PoisonTower : public LittleTower {
public:
PoisonTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
PoisonTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Poison; }
virtual void tick(std::uint64_t delta);
@@ -178,7 +182,7 @@ public:
class QuakeTower : public LittleTower {
public:
QuakeTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
QuakeTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Quake; }
virtual void tick(std::uint64_t delta);
@@ -186,7 +190,7 @@ public:
class ArtilleryTower : public LittleTower {
public:
ArtilleryTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
ArtilleryTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Artillery; }
virtual void tick(std::uint64_t delta);
@@ -194,7 +198,7 @@ public:
class SorcererTower : public LittleTower {
public:
SorcererTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
SorcererTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Sorcerer; }
virtual void tick(std::uint64_t delta);
@@ -202,7 +206,7 @@ public:
class ZeusTower : public LittleTower {
public:
ZeusTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(getType(), x, y, builder) {}
ZeusTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : LittleTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Zeus; }
virtual void tick(std::uint64_t delta);
@@ -212,7 +216,7 @@ public:
class BigTower : public Tower {
public:
BigTower(TowerType type, std::uint16_t x, std::uint16_t y, PlayerID builder) : Tower(type, x, y, builder) {}
BigTower(TowerID id, TowerType type, std::uint16_t x, std::uint16_t y, PlayerID builder) : Tower(id, type, x, y, builder) {}
virtual TowerSize getSize() const { return TowerSize::Big; }
@@ -222,7 +226,7 @@ public:
class TurretTower : public BigTower {
public:
TurretTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : BigTower(getType(), x, y, builder) {}
TurretTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : BigTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Turret; }
virtual void tick(std::uint64_t delta);
@@ -230,7 +234,7 @@ public:
class NecromancerTower : public BigTower {
public:
NecromancerTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : BigTower(getType(), x, y, builder) {}
NecromancerTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : BigTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Necromancer; }
virtual void tick(std::uint64_t delta);
@@ -238,7 +242,7 @@ public:
class LeachTower : public BigTower {
public:
LeachTower(std::uint16_t x, std::uint16_t y, PlayerID builder) : BigTower(getType(), x, y, builder) {}
LeachTower(TowerID id, std::uint16_t x, std::uint16_t y, PlayerID builder) : BigTower(id, getType(), x, y, builder) {}
virtual TowerType getType() const { return TowerType::Leach; }
virtual void tick(std::uint64_t delta);

8
include/game/World.h
View File

@@ -111,6 +111,8 @@ typedef std::vector<MobPtr> MobList;
typedef std::array<Color, 2> SpawnColorPalette;
typedef std::vector<TowerPtr> TowerList;
class World {
protected:
TowerTileColorPalette m_TowerPlacePalette;
@@ -125,7 +127,7 @@ protected:
MobList m_Mobs;
std::vector<TowerPtr> m_Towers;
TowerList m_Towers;
Game* m_Game;
public:
@@ -141,7 +143,7 @@ public:
void spawnMobAt(MobID id, MobType type, std::uint8_t level, PlayerID sender, float x, float y, Direction dir);
void placeTowerAt(TowerType type, std::int32_t x, std::int32_t y, PlayerID builder);
TowerPtr placeTowerAt(TowerID id, TowerType type, std::int32_t x, std::int32_t y, PlayerID builder);
TilePtr getTile(std::int32_t x, std::int32_t y) const;
@@ -178,6 +180,8 @@ public:
Team& getTeam(TeamColor team);
const Team& getTeam(TeamColor team) const;
const TowerList& getTowers() const { return m_Towers; };
private:
void moveMobs(std::uint64_t delta);
};

1
include/game/client/ClientGame.h
View File

@@ -49,6 +49,7 @@ public:
virtual void HandlePacket(protocol::UpdateMoneyPacket* packet);
virtual void HandlePacket(protocol::DisconnectPacket* packet);
virtual void HandlePacket(protocol::WorldDataPacket* packet);
virtual void HandlePacket(protocol::WorldAddTowerPacket* packet);
};
} // namespace client

1
include/game/client/WorldClient.h
View File

@@ -16,7 +16,6 @@ public:
virtual void HandlePacket(protocol::WorldBeginDataPacket* packet);
virtual void HandlePacket(protocol::WorldDataPacket* packet);
virtual void HandlePacket(protocol::WorldAddTowerPacket* packet);
virtual void HandlePacket(protocol::SpawnMobPacket* packet);
};

2
include/game/server/ServerGame.h
View File

@@ -18,6 +18,8 @@ public:
ServerGame(Server* server);
~ServerGame() {}
ServerWorld* getServerWorld() { return &m_ServerWorld; }
virtual void tick(std::uint64_t delta);
void startGame();
private:

3
include/game/server/ServerWorld.h
View File

@@ -11,10 +11,13 @@ class ServerGame;
class ServerWorld : public game::World {
private:
game::MobID m_CurrentMobID;
game::TowerID m_CurrentTowerID;
Server* m_Server;
public:
ServerWorld(Server* server, ServerGame* game);
void spawnMobs(game::MobType type, std::uint8_t level, game::PlayerID sender, std::uint8_t count);
game::TowerPtr placeTowerAt(game::TowerType type, std::int32_t x, std::int32_t y, game::PlayerID builder);
};
} // namespace server

6
include/protocol/Protocol.h
View File

@@ -405,19 +405,21 @@ public:
class WorldAddTowerPacket : public Packet {
private:
game::TowerID m_TowerID;
std::int32_t m_TowerX, m_TowerY;
game::TowerType m_TowerType;
game::PlayerID m_Builder;
public:
WorldAddTowerPacket() {}
WorldAddTowerPacket(std::int32_t x, std::int32_t y, game::TowerType type, game::PlayerID player) :
m_TowerX(x), m_TowerY(y), m_TowerType(type), m_Builder(player) {}
WorldAddTowerPacket(game::TowerID id, std::int32_t x, std::int32_t y, game::TowerType type, game::PlayerID player) :
m_TowerID(id), m_TowerX(x), m_TowerY(y), m_TowerType(type), m_Builder(player) {}
virtual ~WorldAddTowerPacket() {}
virtual DataBuffer Serialize() const;
virtual void Deserialize(DataBuffer& data);
virtual void Dispatch(PacketHandler* handler);
game::TowerID getTowerID() const { return m_TowerID; }
std::int32_t getTowerX() const { return m_TowerX; }
std::int32_t getTowerY() const { return m_TowerY; }
game::TowerType getTowerType() const { return m_TowerType; }

34
include/render/VertexCache.h Normal file
View File

@@ -0,0 +1,34 @@
#include <unordered_map>
#include <cstdint>
#include <memory>
#include "render/loader/GLLoader.h"
namespace td {
namespace render {
class VertexCache {
typedef std::vector<float> Vector;
typedef std::pair<Vector::iterator, Vector::iterator> ElementsIndex;
typedef std::pair<ElementsIndex, ElementsIndex> DataIndex;
private:
Vector m_Positions;
Vector m_Colors;
std::unordered_map<std::uint64_t, DataIndex> m_Indexes;
std::unique_ptr<GL::VertexArray> m_VertexArray;
public:
void addData(std::uint64_t index, std::vector<float> positions, std::vector<float> colors);
void removeData(std::uint64_t index);
void clear();
void updateVertexArray();
const GL::VertexArray& getVertexArray() const { return *m_VertexArray; }
bool isEmpty() const { return m_VertexArray == nullptr; }
};
} // namespace render
} // namespace td

6
include/render/WorldRenderer.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "game/World.h"
#include "render/loader/GLLoader.h"
#include "render/Renderer.h"
#include "render/VertexCache.h"
#include <glm/glm.hpp>
@@ -29,12 +29,16 @@ private:
float m_Zoom = 1;
float m_CamSensibility = 1;
bool m_TowerPlacePopupOpened = false;
VertexCache m_TowersCache;
public:
WorldRenderer(game::World* world, client::ClientGame* client);
~WorldRenderer();
void loadModels();
void addTower(game::TowerPtr tower);
void removeTower(game::TowerPtr tower);
void update();
void render();

6
include/render/loader/WorldLoader.h
View File

@@ -8,9 +8,15 @@ namespace render {
namespace WorldLoader {
struct RenderData{
std::vector<float> positions;
std::vector<float> colors;
};
GL::VertexArray loadMobModel();
GL::VertexArray loadWorldModel(const td::game::World* world);
GL::VertexArray loadTileSelectModel();
RenderData loadTowerModel(game::TowerPtr tower);
} // namespace WorldLoader