checkpoint

Engine-Core/include/Math/Rect.h

@@ -0,0 +1,12 @@
+#pragma once
+
+namespace math
+{
+
+template<typename T>
+class Rect
+{
+
+};
+
+}

Engine-Core/include/Math/Vec2.h

@@ -0,0 +1,18 @@
+#pragma once 
+
+namespace math
+{
+template<typename T>
+class Vec2
+{
+public:
+
+private:
+	T x;
+	T y;
+};
+
+using Vec2f = Vec2<float>;
+using Vec2i = Vec2<int>;
+
+}//namespace

Game/include/GameEngine.h

@@ -1,37 +1,42 @@
 #pragma once
 
+#include "Scenes/MainMenu.h"
 #include <ConstGlobals.h>
 #include <SFML/Graphics.hpp>
 #include <Scenes.h>
+
 #include <utility.h>
 
 #include <tuple>
 
+enum class Scenes : int
+{
+	Play,
+	MainMenu,
+	SceneCount
+};
+
+inline constexpr int SCENE_COUNT {(int)Scenes::SceneCount};
 
 using SceneContainer = std::tuple
 <
-	Play_s
+	Play_s,
+	MainMenu_s
 >;
 
 class GameEngine 
 {
-public:
+private:
-	void changeScene(Scene* scene_in)
+	void changeScene(Scenes scene_in);
-	{
-		m_previousScene = m_currentScene;
-		m_currentScene = scene_in;
-	}
 
-	Scene* getCurrentScene()
+public:
-	{
+	void run();
-		return m_currentScene;
-	}
 
 private:
 	sf::RenderWindow m_window;
 	SceneContainer m_scenes;
-	Scene* m_currentScene;
+	Scenes m_currentScene;
-	Scene* m_previousScene;
+	Scenes m_previousScene;
 	bool m_running;
 
 };

Game/include/Scenes.h

@@ -1,4 +1,5 @@
 #pragma once
 
 #include <Scenes/Scene.h>
-#include <Scenes/Play.h>
+#include <Scenes/Play.h>
+#include <Scenes/MainMenu.h>

Game/include/Scenes/MainMenu.h

@@ -0,0 +1,6 @@
+#pragma once 
+
+class MainMenu_s
+{
+
+};