Main menu

include/client_entity_manager.hpp

@@ -102,7 +102,10 @@ class C_EntityManager : public InContext, public sf::Drawable
     bool renderingEntityData;
 #endif
 
-    bool renderingEntitiesUI;
+    mutable bool renderingEntitiesUI;
+
+    static void loadEntityData(const Context& context);
+	static C_Entity* getEntityData(u8 entityType);
 
 private:
     void draw(sf::RenderTarget& target, sf::RenderStates states) const;
@@ -112,8 +115,6 @@ class C_EntityManager : public InContext, public sf::Drawable
 
     static bool m_entitiesJsonLoaded;
     static std::unique_ptr<C_Entity> m_entityData[ENTITY_MAX_TYPES];
-
-    static void loadEntityData(const Context& context);
 
     u32 m_controlledEntityUniqueId;
     u8 m_controlledEntityTeamId;

include/entity.hpp

@@ -133,6 +133,11 @@ class C_Entity : public BaseEntityComponent
 
     virtual void insertRenderNode(const C_ManagersContext& managersContext, const Context& context);
 
+	u16 getTextureId() const;
+	float getScale() const;
+	bool getUseSubTextureRect() const;
+	sf::IntRect getSubTextureRect() const;
+
 protected:
     u16 m_textureId;
     float m_scale;

include/game_client.hpp

@@ -28,11 +28,18 @@ struct GameClientCallbacks : public ISteamNetworkingSocketsCallbacks
     GameClient* parent;
 };
 
-class GameClient : public InContext, public NetPeer
+class GameClient : public InContext, public NetPeer, public sf::Drawable
 {
 public:
     friend struct GameClientCallbacks;
 
+	struct ConfigData {
+		SteamNetworkingIPAddr endpoint;
+		sf::Time inputRate;
+		std::string displayName;
+		u8 pickedHero;
+	};
+
     struct Snapshot {
         C_EntityManager entityManager;
         u32 id = 0;
@@ -52,13 +59,12 @@ class GameClient : public InContext, public NetPeer
     };
 
 public:
-    GameClient(const Context& context);
+    GameClient(const Context& context, const ConfigData& configData);
     ~GameClient();
 
-    void mainLoop(bool& running);
-
     void receiveLoop();
     void update(sf::Time eTime);
+	void updateWorldTime(sf::Time eTime);
 
     void renderUpdate(sf::Time eTime);
 
@@ -83,12 +89,10 @@ class GameClient : public InContext, public NetPeer
 
     Snapshot* findSnapshotById(u32 snapshotId);
 
-    void loadFromJson(const rapidjson::Document& doc);
-
 private:
+	void draw(sf::RenderTarget& target, sf::RenderStates states) const;
+
     void loadMap(const std::string& filename);
-    void readDisplayName(const std::string& filename);
-	void readSelectedHero(const std::string& filename);
 
 private:
     GameClientCallbacks m_gameClientCallbacks;
@@ -98,16 +102,9 @@ class GameClient : public InContext, public NetPeer
     bool m_connected;
     sf::Time m_infoTimer;
 
-    Vector2u m_screenSize;
-    u32 m_screenStyle;
-
-    sf::RenderTexture m_canvas;
+    mutable sf::RenderTexture m_canvas;
     bool m_canvasCreated;
 
-    sf::Time m_updateRate;
-    sf::Time m_inputRate;
-    sf::Time m_renderRate;
-
     C_EntityManager m_entityManager;
     std::list<Snapshot> m_snapshots;
 
@@ -116,6 +113,7 @@ class GameClient : public InContext, public NetPeer
 
     sf::Time m_worldTime;
     sf::Time m_interElapsed;
+	sf::Time m_inputRate;
 
     //Number of snapshots required to start rendering
     int m_requiredSnapshotsToRender;
@@ -137,15 +135,15 @@ class GameClient : public InContext, public NetPeer
     float m_smoothUnitRadius;
     Vector2 m_smoothUnitPos;
 
-    std::unique_ptr<ClientCaster> m_clientCaster;
+    ClientCaster m_clientCaster;
 
     bool m_forceFullSnapshotUpdate;
     bool m_fullUpdateReceived;
 
     std::string m_displayName;
-	int m_selectedHero;
+	u8 m_pickedHero;
 
     sf::Sprite m_mouseSprite;
 
-    std::unique_ptr<ConnectionStatusRender> m_connectionStatusRender;
+	ConnectionStatusRender m_connectionStatusRender;
 };

include/game_mode.hpp

@@ -43,7 +43,7 @@ class GameMode
     virtual void draw(sf::RenderTexture& renderTexture, const TextureLoader* textures);
 
     //we don't use drawable since this class is shared by client and server
-    virtual void drawGameEndInfo(sf::RenderWindow& window, const FontLoader* fonts);
+    virtual void drawGameEndInfo(sf::RenderTarget& target, const FontLoader* fonts);
 
     //creates chests and other game mode specific entities
     //(called after heroes are created)

include/game_modes/battle_royale_mode.hpp

@@ -18,7 +18,7 @@ class BattleRoyaleMode : public GameMode
     //@storm_remove: remove this when the storm gets implemented with tiles
     virtual void draw(sf::RenderTexture& renderTexture, const TextureLoader* textures);
 
-    virtual void drawGameEndInfo(sf::RenderWindow& window, const FontLoader* fonts);
+    virtual void drawGameEndInfo(sf::RenderTarget& target, const FontLoader* fonts);
 
     virtual void onGameStarted(u8 numberOfPlayers, const ManagersContext& context);
     virtual void C_onGameStarted();

include/game_server.hpp

@@ -57,7 +57,7 @@ class GameServer : public InContext, public NetPeer
         bool heroDead = true;
 
         //EntityType of hero selected (before/after matchmaking)
-        u8 selectedHeroType = ENTITY_MAX_TYPES;
+        u8 pickedHeroType = ENTITY_MAX_TYPES;
 
         int ping = -1;
     };
@@ -66,7 +66,7 @@ class GameServer : public InContext, public NetPeer
     //@TODO: Should we use this??
     struct ClientInfo_cold {
         //display name
-        //selectedHeroType
+        //pickedHeroType
         //cosmetics??
     };
 

include/hero.hpp

@@ -3,6 +3,10 @@
 #include "unit.hpp"
 #include "hero_ui.hpp"
 
+//@TODO: Automate this for new heroes
+constexpr u8 g_numberOfHeroes = 3;
+constexpr u8 g_heroTypes[g_numberOfHeroes] = {ENTITY_RED_DEMON, ENTITY_BLONDIE, ENTITY_FISH_OGRE};
+
 class HeroBase
 {
 public:

include/main_menu.hpp

@@ -0,0 +1,60 @@
+#pragma once
+
+#include <SFML/Graphics/Drawable.hpp>
+
+#include "context.hpp"
+#include "game_client.hpp"
+#include "hero.hpp"
+
+class MainMenu : public InContext, public sf::Drawable
+{
+public:
+	MainMenu(const Context& context);
+
+	void mainLoop(bool& running);
+
+	void startGame();
+	void stopGame();
+
+	void update(sf::Time eTime);
+	void handleInput(const sf::Event& event, bool focused);
+
+	void loadFromJson(const rapidjson::Document& doc);
+
+	void readDisplayName();
+
+private:
+	void draw(sf::RenderTarget& target, sf::RenderStates tates) const;
+
+	void _doUpdate(sf::Time eTime);
+	void _doHandleInput(const sf::Event& event);
+	void _doDraw(sf::RenderTarget& target, sf::RenderStates states) const;
+
+	void resetHeroSelection();
+
+	std::unique_ptr<GameClient> m_gameClient;
+
+	std::unique_ptr<sf::RenderWindow> m_window;
+	sf::View m_view;
+
+	bool m_stopRunning;
+
+	SteamNetworkingIPAddr m_endpoint;
+
+	sf::Time m_updateRate;
+	sf::Time m_renderRate;
+	sf::Time m_inputRate;
+	Vector2u m_screenSize;
+	u32      m_screenStyle;
+
+	std::string m_displayName;
+
+	bool m_selectedHeroes[g_numberOfHeroes];
+	sf::FloatRect m_heroButtons[g_numberOfHeroes];
+	sf::FloatRect m_playButton;
+
+	static const sf::Color m_backgroundColor;
+	static const sf::Color m_buttonColor;
+	static const sf::Color m_hoveringColor;
+	static const sf::Color m_selectedColor;
+};

include/network_commands.hpp

@@ -20,5 +20,5 @@ enum class ServerCommand {
     ChangeInputRate,
     ChangeSnapshotRate,
     DisplayName,
-	SelectedHero
+	PickedHero
 };

include/tilemap_renderer.hpp

@@ -28,8 +28,8 @@ class TileMapRenderer : public InContext
     void generateLayers();
     void updateLayers();
 
-    void renderBeforeEntities(sf::RenderTexture& window);
-    void renderAfterEntities(sf::RenderTexture& window);
+    void renderBeforeEntities(sf::RenderTexture& window) const;
+    void renderAfterEntities(sf::RenderTexture& window) const;
 
 private:
     Vector2u _getTextureCoords(TileType tile);

include/unit.hpp

@@ -23,6 +23,8 @@ class _UnitBase
     Status& getStatus();
     const Status& getStatus() const;
 
+	u8 getWeaponId() const;
+
     static Vector2 moveCollidingTilemap_impl(const Vector2& oldPos, Vector2 newPos, float collisionRadius, TileMap* map);
 
 protected:

src/camera.cpp

@@ -141,4 +141,4 @@ Vector2 Camera::_clamp(const Vector2& pos) const
     }
 
     return newPos;
-}
+}

src/client_entity_manager.cpp

@@ -420,6 +420,27 @@ std::vector<RenderNode>& C_EntityManager::getUIRenderNodes()
     return m_uiRenderNodes;
 }
 
+void C_EntityManager::loadEntityData(const Context& context)
+{
+    if (m_entitiesJsonLoaded) return;
+
+    #define DoEntity(class_name, type, json_id) \
+        m_entityData[ENTITY_##type] = std::unique_ptr<C_Entity>(new C_##class_name()); \
+        m_entityData[ENTITY_##type]->setEntityType(ENTITY_##type); \
+        m_entityData[ENTITY_##type]->loadFromJson(*(context.jsonParser->getDocument(json_id)), TextureId::type, context);
+    #include "entities.inc"
+    #undef DoEntity
+
+    m_entitiesJsonLoaded = true;
+}
+
+C_Entity* C_EntityManager::getEntityData(u8 entityType)
+{
+	if (entityType >= ENTITY_MAX_TYPES) return nullptr;
+
+	return m_entityData[entityType].get();
+}
+
 void C_EntityManager::draw(sf::RenderTarget& target, sf::RenderStates states) const
 {
     if (renderingEntitiesUI) {
@@ -478,16 +499,4 @@ void C_EntityManager::draw(sf::RenderTarget& target, sf::RenderStates states) co
 bool C_EntityManager::m_entitiesJsonLoaded = false;
 std::unique_ptr<C_Entity> C_EntityManager::m_entityData[ENTITY_MAX_TYPES];
 
-void C_EntityManager::loadEntityData(const Context& context)
-{
-    if (m_entitiesJsonLoaded) return;
 
-    #define DoEntity(class_name, type, json_id) \
-        m_entityData[ENTITY_##type] = std::unique_ptr<C_Entity>(new C_##class_name()); \
-        m_entityData[ENTITY_##type]->setEntityType(ENTITY_##type); \
-        m_entityData[ENTITY_##type]->loadFromJson(*(context.jsonParser->getDocument(json_id)), TextureId::type, context);
-    #include "entities.inc"
-    #undef DoEntity
-
-    m_entitiesJsonLoaded = true;
-}

src/entity.cpp

@@ -242,6 +242,26 @@ void C_Entity::insertRenderNode(const C_ManagersContext& managersContext, const
 #endif
 }
 
+u16 C_Entity::getTextureId() const
+{
+	return m_textureId;
+}
+
+float C_Entity::getScale() const
+{
+	return m_scale;
+}
+
+bool C_Entity::getUseSubTextureRect() const
+{
+	return m_useSubTextureRect;
+}
+
+sf::IntRect C_Entity::getSubTextureRect() const
+{
+	return m_subTextureRect;
+}
+
 void HealthComponent::takeDamage(u16 damage, Entity* source, u32 uniqueId, u8 teamId)
 {
     m_health = std::max((int) m_health - (int) damage, 0);