brammie15/dae16-VerhulstBram-GameProject
1
0
Fork 0
mirror of https://github.com/HowestDAE/dae16-VerhulstBram.git synced 2025-12-16 21:01:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Started on GuiIcon, General fixes

Browse Source
This commit is contained in:
Bram Verhulst
2024-05-09 00:46:05 +02:00
parent d3b932df22
commit 8c3a485c2d
22 changed files with 231 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Game/Levels/World/WorldLevel.h
View File

@@ -6,6 +6,7 @@
#include "GridSystem/WorldGridManager.h"
#include "Gui/Screens/ScreenManager.h"
#include "Camera.h"
#include "Gui/GuiMeter.h"
class WorldLevel : public Level
{
@@ -22,29 +23,29 @@ public:
void MouseMove(const Vector2f& mousePos) override;
void ProcessImGui() override;
WorldGridManager& GetGridManager() {
return m_gridManager;
}
WorldGridManager& GetGridManager();
std::vector<Collision::CollisionRect> m_Rects;
private:
double m_fps{ 0.0f };
double m_Fps{ 0.0f };
WorldGridManager m_gridManager {};
Player m_player;
Vector2f m_mousePos {};
WorldGridManager m_GridManager;
Player m_Player;
Vector2f m_MousePos {};
Rectf m_viewport;
Rectf m_Viewport;
ScreenManager* m_screenManager;
ScreenManager* m_ScreenManager;
WorldTile* m_pSelectedTile { nullptr };
Building* m_refeulBuilding;
Building* m_mineralBuilding;
Building* m_junkBuilding;
Building* m_repairBuilding;
Building* m_RefeulBuilding;
Building* m_MineralBuilding;
Building* m_JunkBuilding;
Building* m_RepairBuilding;
GuiMeter* m_Meter{ nullptr };
// ImGui Vars