Reformat + Basic animation system

General fixes
This commit is contained in:
Bram Verhulst
2024-04-01 10:27:37 +02:00
parent 3b9c96ea8d
commit 0f9bb76973
28 changed files with 918 additions and 546 deletions

View File

@@ -1,43 +1,42 @@
#pragma once
#include "Level.h"
#include "Texture.h"
#include "WorldLevel.h"
#include "WorldTile.h"
#include <array>
#include "Collision.h"
#include "Level.h"
#include "Player.h"
#include "utils.h"
#include "WorldGridManager.h"
#include "WorldLevel.h"
#include "GridSystem/WorldGridManager.h"
class WorldLevel : public Level {
class WorldLevel : public Level
{
public:
WorldLevel(Camera* camera, Rectf viewport);
~WorldLevel() override;
WorldLevel(const WorldLevel& other) = default;
WorldLevel(WorldLevel&& other) = default;
void Update(float elapsedSec) override;
void Draw() const override;
void MouseMove(const Point2f& mousePos) override;
void ProcessImGui() override;
WorldGridManager& GetGridManager() { return m_gridManager; }
WorldGridManager& GetGridManager() {
return m_gridManager;
}
std::vector<Collision::CollisionRect> m_Rects;
private:
WorldGridManager m_gridManager{};
WorldGridManager m_gridManager {};
Player m_player;
Point2f m_mousePos{};
Point2f m_mousePos {};
Rectf m_viewport;
// ImGui Vars
bool m_ShowTextureManagerWindow{ false };
bool m_ShowCameraWindow{ false };
bool m_ShowPlayerInfo{ true };
bool m_ShowTextureManagerWindow { false };
bool m_ShowCameraWindow { false };
bool m_ShowPlayerInfo { true };
};