added simple scene manager and classes Scene and SceneNode

CMakeLists.txt

@@ -7,7 +7,7 @@ else(WIN32)
 	set(SYSTEM_LIB_PATH "linux")
 endif(WIN32)
 
-set(LIB_SRC_LIST engine.cpp)
+set(LIB_SRC_LIST engine.cpp	scenemanager.cpp scene.cpp)
 
 set(LIBRARY_NAME ${PROJECT_NAME})
 set(EXECUTABLE_NAME "test${PROJECT_NAME}")

engine.cpp

@@ -1,41 +1,41 @@
  
 #include "engine.h"
+
+#include "scenemanager.h"
+
 //#include "bullet/btBulletCollisionCommon.h"
 //#include "bullet/btBulletDynamicsCommon.h"
 
-Engine::Engine(Input* _input): input(_input)
+Engine::Engine(Input* input): m_input(input)
 {
-
+    m_clock.restart();
 }
 
 void Engine::update()
 {
     //update time variable
-    lastTimeStamp = timeStamp;
+    m_lastTimeStamp = m_timeStamp;
-    timeStamp = (unsigned int) clock.getElapsedTime().asMilliseconds();
+    m_timeStamp = (unsigned int) m_clock.getElapsedTime().asMilliseconds();
     //update Events
-    input->updateEvents();
+    m_input->updateEvents();
-
-    render();
-    updatePhysics();
 }
 
 void Engine::render()
 {
-    //call to SparrowRenderer
+    // work for SparrowRenderer
 }
 
 void Engine::updatePhysics()
 {
-    //update world
+    // work for Bullet
 }
 
 unsigned int Engine::getTime()
 {
-    return timeStamp;
+    return m_timeStamp;
 }
 
 unsigned int Engine::getDeltaTime()
 {
-    return timeStamp - lastTimeStamp;
+    return m_timeStamp - m_lastTimeStamp;
 }

engine.h

@@ -5,7 +5,7 @@
 
 class Engine{
 public:
-    Engine(Input* _input);
+    Engine(Input* input);
     //main function
     void update();
     void render();
@@ -16,10 +16,10 @@ public:
     unsigned int getDeltaTime();
 
 private:
-    Input* input;
+    Input* m_input;
-    sf::Clock clock;
+    sf::Clock m_clock;
-    unsigned int timeStamp = 0;
+    unsigned int m_timeStamp = 0;
-    unsigned int lastTimeStamp = 0;
+    unsigned int m_lastTimeStamp = 0;
 };
 
 #endif

main.cpp

@@ -6,5 +6,8 @@ int main(){
     Engine engine = Engine(input);
     while(!input->isCloseRequested()){
         engine.update();
+        // game content
+        engine.updatePhysics();
+        engine.render();
     }
 }

scene.cpp

@@ -0,0 +1,16 @@
+#include "scene.h"
+
+Scene::Scene()
+{
+
+}
+
+void Scene::update()
+{
+    //update call for all nodes
+}
+
+void Scene::render()
+{
+    //render call for all nodes
+}

scene.h

@@ -0,0 +1,26 @@
+#ifndef SCENE_H
+#define SCENE_H
+
+class SceneNode;
+
+class Scene
+{
+public:
+    Scene();
+    void update();
+    void render();
+private:
+    SceneNode* m_sceneNodeTree;
+};
+
+
+class SceneNode
+{
+public:
+    SceneNode();
+    virtual void update();
+private:
+    SceneNode* m_parentNode;
+};
+
+#endif // SCENE_H

scenemanager.cpp

@@ -0,0 +1,27 @@
+#include "scenemanager.h"
+#include "scene.h"
+
+SceneManager::SceneManager()
+{
+
+}
+
+void SceneManager::addScene(std::string scene_name, Scene *p_scene)
+{
+    scenes[scene_name] = p_scene;
+}
+
+void SceneManager::setCurrentScene(std::string scene)
+{
+    if(scenes.count(scene)) p_currentScene = scenes[scene];
+}
+
+void SceneManager::update()
+{
+    p_currentScene->update();
+}
+
+void SceneManager::render()
+{
+    p_currentScene->render();
+}

scenemanager.h

@@ -0,0 +1,25 @@
+#ifndef SCENEMANAGER_H
+#define SCENEMANAGER_H
+
+#include <string>
+#include <unordered_map>
+
+//define macro similar to the one in SparrowResource ?
+
+class Scene;
+
+class SceneManager
+{
+public:
+    SceneManager();
+    void addScene(std::string scene_name, Scene* p_scene);
+    void setCurrentScene(std::string scene);
+    void update();
+    void render();
+
+private:
+    Scene* p_currentScene;
+    std::unordered_map<std::string, Scene*> scenes;
+};
+
+#endif // SCENEMANAGER_H