Add facilities to manage scenes

BloomFramework/BloomFramework.vcxproj

@@ -181,14 +181,21 @@
     <ClInclude Include="include\Components\Position.h" />
     <ClInclude Include="include\Components\Size.h" />
     <ClInclude Include="include\Components\Sprite.h" />
+    <ClInclude Include="include\Components\Tag.h" />
+    <ClInclude Include="include\Components\Transform.h" />
+    <ClInclude Include="include\Coord.h" />
+    <ClInclude Include="include\Components\LayerGroup.h" />
     <ClInclude Include="include\Graphics\AnimationSet.h" />
     <ClInclude Include="include\Graphics\Sprite.h" />
     <ClInclude Include="include\Exception.h" />
     <ClInclude Include="include\Framework.h" />
     <ClInclude Include="include\Game.h" />
     <ClInclude Include="include\Audio\SoundChunk.h" />
     <ClInclude Include="include\GameObject.h" />
+    <ClInclude Include="include\Scenes\Scene.h" />
+    <ClInclude Include="include\Scenes\SceneManager.h" />
     <ClInclude Include="include\Graphics\Animation.h" />
+    <ClInclude Include="include\StdStableSort.h" />
     <ClInclude Include="include\Systems\AnimationSystem.h" />
     <ClInclude Include="include\Graphics\Drawable.h" />
     <ClInclude Include="include\Graphics\Font.h" />
@@ -203,6 +210,7 @@
     <ClInclude Include="include\Timer.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="src\Coord.cpp" />
     <ClCompile Include="src\Audio\SoundChannel.cpp" />
     <ClCompile Include="src\Exception.cpp" />
     <ClCompile Include="src\Audio\SoundPlayer.cpp" />
@@ -213,6 +221,8 @@
     <ClCompile Include="src\Game.cpp" />
     <ClCompile Include="src\Audio\SoundChunk.cpp" />
     <ClCompile Include="src\GameObject.cpp" />
+    <ClCompile Include="src\Scenes\Scene.cpp" />
+    <ClCompile Include="src\Scenes\SceneManager.cpp" />
     <ClCompile Include="src\Graphics\Animation.cpp" />
     <ClCompile Include="src\Graphics\AnimationSet.cpp" />
     <ClCompile Include="src\Graphics\Drawable.cpp" />
@@ -221,6 +231,7 @@
     <ClCompile Include="src\Graphics\SpriteText.cpp" />
     <ClCompile Include="src\Graphics\Texture.cpp" />
     <ClCompile Include="src\Graphics\TextureStore.cpp" />
+    <ClCompile Include="src\Systems\DefaultSystem.cpp" />
     <ClCompile Include="src\Timer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

BloomFramework/BloomFramework.vcxproj.filters

@@ -31,6 +31,12 @@
     <Filter Include="Source Files\Audio">
       <UniqueIdentifier>{61128b5c-6d91-44f6-b147-79f56ad42451}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\Scenes">
+      <UniqueIdentifier>{88b678a9-afd8-4bf2-8497-4a206009a84c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Scenes">
+      <UniqueIdentifier>{dd833aec-1858-4a66-867e-60efaeeec2cb}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Timer.cpp">
@@ -90,6 +96,18 @@
     <ClCompile Include="src\Graphics\FontStore.cpp">
       <Filter>Source Files\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="src\Coord.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Systems\DefaultSystem.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scenes\Scene.cpp">
+      <Filter>Source Files\Scenes</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Scenes\SceneManager.cpp">
+      <Filter>Source Files\Scenes</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\Framework.h">
@@ -197,6 +215,30 @@
     <ClInclude Include="include\Graphics\FontStore.h">
       <Filter>Header Files\Graphics</Filter>
     </ClInclude>
+    <ClInclude Include="include\Coord.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Scenes\Scene.h">
+      <Filter>Header Files\Scenes</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Scenes\SceneManager.h">
+      <Filter>Header Files\Scenes</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Components\LayerGroup.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Components\Sprite.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Components\Transform.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Components\Tag.h">
+      <Filter>Header Files\Components</Filter>
+    </ClInclude>
+    <ClInclude Include="include\StdStableSort.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

BloomFramework/include/Components/Components.h

@@ -1,7 +1,8 @@
 #pragma once
 
-#include "Position.h"
-#include "Size.h"
+#include "Transform.h"
+#include "LayerGroup.h"
 #include "Sprite.h"
 #include "Animation.h"
-#include "AnimationSet.h"
+#include "AnimationSet.h"
+#include "Tag.h"

BloomFramework/include/Components/LayerGroup.h

@@ -0,0 +1,5 @@
+#pragma once
+
+namespace bloom::components {
+	using LayerGroup = Uint32;
+}

BloomFramework/include/Components/Tag.h

@@ -0,0 +1,9 @@
+#pragma once
+#include <string>
+#include "entt/entt.hpp"
+
+namespace bloom::components {
+	template<entt::HashedString::hash_type Value>
+	using Label = entt::label<Value>;
+
+}

BloomFramework/include/Components/Transform.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "Coord.h"
+
+namespace bloom::components {
+	using Position = bloom::Coord;
+	struct Size {
+		int w, h;
+	};
+
+	struct Transform {
+		Position position;
+
+		double rotation;
+
+		Size size;
+	};
+}

BloomFramework/include/Coord.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include "stdIncludes.h"
+namespace bloom {
+	enum CoordType {
+		absolute,
+		relative
+	};
+
+	enum Positions {
+		top = 1,
+		middle = 2,
+		bottom = 4,
+
+		left = 8,
+		center = 16,
+		right = 32
+	};
+
+	struct BLOOMFRAMEWORK_API Coord {
+	public:
+		int x, y;
+		int relativeTo;
+
+		Coord();
+		Coord(const Coord & other) = default;
+		Coord(int x, int y, CoordType type = absolute, int direction = top | left);
+		Coord(const SDL_Point & point);
+
+		Coord getSDLPos(SDL_Renderer * targetRenderer, int width, int height);
+		SDL_Point toSDLPoint(SDL_Renderer * targetRenderer);
+	};
+}

BloomFramework/include/Framework.h

@@ -12,3 +12,4 @@
 #include "Graphics/Font.h"
 #include "Graphics/FontStore.h"
 #include "Graphics/SpriteText.h"
+#include "Coord.h"

BloomFramework/include/Game.h

@@ -3,15 +3,17 @@
 #include "stdIncludes.h"
 #include "Graphics/TextureStore.h"
 #include "Timer.h"
+#include "Exception.h"
+#include "Scenes/SceneManager.h"
 
 namespace bloom {
 	class BLOOMFRAMEWORK_API Game {
 		using TextureStore = bloom::graphics::TextureStore;
 		friend TextureStore::TextureStore(Game & object);
 
 	public:
-		Game(int width, int height, int windowFlags = NULL, int rendererFlags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-		Game(std::nothrow_t, int width, int height, int windowFlags = NULL, int rendererFlags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+		Game(int width, int height, int windowFlags = NULL, int rendererFlags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE);
+		Game(std::nothrow_t, int width, int height, int windowFlags = NULL, int rendererFlags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE);
 		~Game();
 
 		static void initialize(Uint32 initFlags = SDL_INIT_EVERYTHING,
@@ -45,6 +47,8 @@ namespace bloom {
 		TextureStore	textures = TextureStore(m_renderer);
 		Timer			timer;
 
+		SceneManager sceneManager = SceneManager(*this);
+
 	protected:
 		SDL_Renderer *	m_renderer = nullptr;
 		SDL_Window *	m_window = nullptr;

BloomFramework/include/GameObject.h

@@ -2,33 +2,22 @@
 
 #include "stdIncludes.h"
 #include "Components/Components.h"
-#include "Game.h"
 
 namespace bloom {
+	class Game;
 	/*
 	* This class is used to make a sort of prefab object.
 	*
 	* This class by default will create an entity with the registry provided.
-	* The entity will be assigned with bloom::Position since it is expected that an entity would have position.
-	*
-	* Use the init() function to assign/replace/reset any Components required.
 	*
 	* The destructor will automatically destroy the entity from the registry when GameObject gets out of scope.
 	*/
-	class BLOOMFRAMEWORK_API GameObject {
-		using Position = bloom::components::Position;
+	struct BLOOMFRAMEWORK_API GameObject {
+		entt::DefaultRegistry& registry;
+		Game& gameInstance;
+		const entt::DefaultRegistry::entity_type entity;
 
-	public:
-		GameObject(entt::DefaultRegistry & registry, Game *& gameInstance);
+		GameObject(entt::DefaultRegistry& registry, Game& gameInstance);
 		~GameObject();
-
-		virtual void init() = 0;
-
-		uint32_t getEntityID();
-
-	protected:
-		entt::DefaultRegistry & m_registry;
-		Game *& m_gameInstance;
-		uint32_t m_entity;
 	};
 }

BloomFramework/include/Graphics/Drawable.h

@@ -9,7 +9,7 @@ namespace bloom::graphics {
 		Drawable(SDL_Renderer* targetRenderer);
 		virtual ~Drawable() = 0;
 
-		virtual void render(std::optional<SDL_Rect> srcRect, SDL_Rect destRect, SDL_RendererFlip flip = SDL_FLIP_NONE);
+		virtual void render(std::optional<SDL_Rect> srcRect, SDL_Rect destRect, double rotationAngle = 0.0, SDL_RendererFlip flip = SDL_FLIP_NONE);
 
 	protected:
 		SDL_Renderer* const c_renderer;

BloomFramework/include/Graphics/SpriteText.h

@@ -20,7 +20,7 @@ namespace bloom::graphics {
 		SpriteText(SDL_Renderer* targetRenderer, std::shared_ptr<Font> fontPtr, std::string_view text = std::string_view{}, TextStyle style = TextStyle{});
 		~SpriteText() = default;
 
-		void render(std::optional<SDL_Rect> srcRect, SDL_Point destPoint, SDL_RendererFlip flip = SDL_FLIP_NONE);
+		void render(std::optional<SDL_Rect> srcRect, SDL_Point destPoint, double rotationAngle = 0.0, SDL_RendererFlip flip = SDL_FLIP_NONE);
 
 		int getTextHeight() const { return m_height; }
 		int getTextWidth() const { return m_width; }