Improving entity manager and entity support for a simpler version, made some cleanup on the road to support serialization of world
This commit is contained in:
+11
-9
@@ -1,13 +1,15 @@
|
||||
#pragma once
|
||||
#pragma once
|
||||
|
||||
#include <Core/Memory/MemoryArena.h>
|
||||
#include <Data/World.h>
|
||||
|
||||
struct EntityManager;
|
||||
|
||||
struct World
|
||||
struct SerializedEntityTest
|
||||
{
|
||||
Arena* WorldArena;
|
||||
EntityManager* EntityManager;
|
||||
DECLARE_ENTITY()
|
||||
|
||||
int A = 0;
|
||||
};
|
||||
|
||||
enum class GameMode
|
||||
@@ -19,14 +21,14 @@ enum class GameMode
|
||||
|
||||
struct GameState
|
||||
{
|
||||
Arena* TotalArena;
|
||||
Arena* TotalArena = nullptr;
|
||||
|
||||
World* World;
|
||||
World* World = nullptr;
|
||||
|
||||
GameMode Mode = GameMode::Editor;
|
||||
|
||||
float TotalTime;
|
||||
int Score;
|
||||
float TotalTime = 0.0f;
|
||||
int Score = 0;
|
||||
};
|
||||
|
||||
extern GameState* GetGameState();
|
||||
[[nodiscard]] extern GameState* GetGameState();
|
||||
|
||||
Reference in New Issue
Block a user