Skip to content
Snippets Groups Projects
Commit 8add3c96 authored by Alfred Burgess's avatar Alfred Burgess
Browse files

Expanded game engine and created scene

parent 5dde87a2
No related merge requests found
#ifndef __GAME_H__ #ifndef __GAME_H__
#define __GAME_H__ #define __GAME_H__
#include <map>
#include <string>
#include <vector>
#include "logger.h" #include "logger.h"
#include "entity-manager.h" #include "entity-manager.h"
#include "scene.h"
class GameEngine class GameEngine
{ {
...@@ -10,15 +15,28 @@ class GameEngine ...@@ -10,15 +15,28 @@ class GameEngine
GameEngine(); GameEngine();
~GameEngine(); ~GameEngine();
void init(); void init();
void run();
void update(); void update();
void close();
Scene currentScene();
void changeScene( Scene scene );
// std::vector< Asset& > getAssets();
// Window& getWindow();
bool isRunning;
private: private:
EntityManager _entityManager; EntityManager _entityManager;
Logger& _logger; Logger& _logger;
std::string _currScene;
void changeScene( Scene scene );
// Window* _window; // Window* _window;
// std::vector<Asset> _assets;
std::map< std::string, Scene > _scenes;
// Systems /* Systems */
// sUserInput
}; };
#endif // __GAME_H__ #endif // __GAME_H__
#ifndef __SCENE_H__
#define __SCENE_H__
#include "logger.h"
class Scene{
public:
Scene();
~Scene();
private:
Logger& _logger;
};
#endif // __SCENE_H__
#include "scene.h"
Scene::Scene()
: _logger( Logger::instance() )
{ this->_logger.info( "Creating new Scene" ); }
Scene::~Scene()
{ this->_logger.info( "Deleting Scene" ); }
...@@ -10,7 +10,21 @@ GameEngine::~GameEngine() ...@@ -10,7 +10,21 @@ GameEngine::~GameEngine()
{ {
this->_logger.info( "Cleaning GameEngine Object" ); this->_logger.info( "Cleaning GameEngine Object" );
} }
void GameEngine::init(){} void GameEngine::close(){}
void GameEngine::init()
{
this->isRunning = false;
this->_currScene = "";
}
void GameEngine::changeScene( Scene scene ){}
Scene* GameEngine::currentScene()
{
return nullptr;
}
void GameEngine::run()
{
this->isRunning = true;
}
void GameEngine::update() void GameEngine::update()
{ {
this->_entityManager.update(); this->_entityManager.update();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment