Large refactoring. Also, reimplemented resource manager to use parsers. Changed from json to xml (it allows comments!!!).

This commit is contained in:
2016-12-01 21:08:28 +02:00
parent 9c8cbf8518
commit 0b6a988184
71 changed files with 1608 additions and 923 deletions

View File

@ -10,8 +10,7 @@
#include <base/GameObject.h>
#include <base/RenderContext.h>
#include <model/Level.h>
#include <model/Player.h>
#include <base/Scene.h>
#include <model/Configuration.h>
#include <resources/ResourceManager.h>
@ -19,30 +18,20 @@
namespace farmlands {
struct GuiState
{
};
class GameState
{
public:
GameState();
~GameState();
static GameState& current();
static void setCurrent(GameState& state);
// Render context
base::RenderContext renderContext;
base::Scene* scene;
model::Configuration* config;
// Gui
GuiState gui;
// Settings
model::Configuration config;
// Current game
model::Player player;
model::Level* currentLevel;
base::GameObject root;
// Misc
float elapsedTime;
private: