Refactoring and optimizations

BloomFramework/BloomFramework.vcxproj

@@ -95,7 +95,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
-      <AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\include\;$(ProjectDir)\..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DiagnosticsFormat>Caret</DiagnosticsFormat>
@@ -113,7 +113,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\include\;$(ProjectDir)\..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DiagnosticsFormat>Caret</DiagnosticsFormat>
@@ -134,7 +134,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\include\;$(ProjectDir)\..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DiagnosticsFormat>Caret</DiagnosticsFormat>
@@ -155,7 +155,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>BLOOMFRAMEWORK_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(ProjectDir)\include\;..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)\include\;$(ProjectDir)\..\entt\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <DiagnosticsFormat>Caret</DiagnosticsFormat>
@@ -215,7 +215,6 @@
     <ClCompile Include="src\Audio\MusicStore.cpp" />
     <ClCompile Include="src\Game.cpp" />
     <ClCompile Include="src\Audio\SoundChunk.cpp" />
-    <ClCompile Include="src\GameObject.cpp" />
     <ClCompile Include="src\Graphics\Animation.cpp" />
     <ClCompile Include="src\Graphics\AnimationSet.cpp" />
     <ClCompile Include="src\Graphics\Drawable.cpp" />
@@ -224,14 +223,13 @@
     <ClCompile Include="src\Graphics\SpriteText.cpp" />
     <ClCompile Include="src\Graphics\Texture.cpp" />
     <ClCompile Include="src\Graphics\TextureStore.cpp" />
-    <ClCompile Include="src\Timer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets')" />
-    <Import Project="$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets')" />
-    <Import Project="$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets')" />
-    <Import Project="$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets')" />
+    <Import Project="$(SolutionDir)\packages\sdl2.nuget.redist.2.0.10\build\native\sdl2.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2.nuget.redist.2.0.10\build\native\sdl2.nuget.redist.targets')" />
+    <Import Project="$(SolutionDir)\packages\sdl2.nuget.2.0.10\build\native\sdl2.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2.nuget.2.0.10\build\native\sdl2.nuget.targets')" />
+    <Import Project="$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.5\build\native\sdl2_image.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.5\build\native\sdl2_image.nuget.redist.targets')" />
+    <Import Project="$(SolutionDir)\packages\sdl2_image.nuget.2.0.5\build\native\sdl2_image.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_image.nuget.2.0.5\build\native\sdl2_image.nuget.targets')" />
     <Import Project="$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets')" />
     <Import Project="$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets')" />
     <Import Project="$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets" Condition="Exists('$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets')" />
@@ -241,10 +239,10 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2.nuget.redist.2.0.9\build\native\sdl2.nuget.redist.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2.nuget.2.0.9\build\native\sdl2.nuget.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.4\build\native\sdl2_image.nuget.redist.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_image.nuget.2.0.4\build\native\sdl2_image.nuget.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2.nuget.redist.2.0.10\build\native\sdl2.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2.nuget.redist.2.0.10\build\native\sdl2.nuget.redist.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2.nuget.2.0.10\build\native\sdl2.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2.nuget.2.0.10\build\native\sdl2.nuget.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.5\build\native\sdl2_image.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_image.nuget.redist.2.0.5\build\native\sdl2_image.nuget.redist.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_image.nuget.2.0.5\build\native\sdl2_image.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_image.nuget.2.0.5\build\native\sdl2_image.nuget.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_mixer.nuget.redist.2.0.4\build\native\sdl2_mixer.nuget.redist.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_mixer.nuget.2.0.4\build\native\sdl2_mixer.nuget.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\sdl2_ttf.nuget.redist.2.0.15\build\native\sdl2_ttf.nuget.redist.targets'))" />

BloomFramework/BloomFramework.vcxproj.filters

@@ -33,9 +33,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Audio\MusicQueue.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
@@ -54,9 +51,6 @@
     <ClCompile Include="src\Game.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\GameObject.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Audio\MusicTrack.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>

BloomFramework/include/Audio/Audio.h

@@ -1,20 +1,16 @@
 #pragma once
-
-#include "Exception.h"
 #include "MusicStore.h"
 #include "MusicQueue.h"
-#include "SoundChunk.h"
 #include "SoundStore.h"
 #include "SoundPlayer.h"
 #include "SoundChannel.h"
-#include "AudioDefine.h"
 
 namespace bloom::audio {
 	class Music {
 	public:
-		static Music & instance();
+		static Music& instance();
 
-		void push(const std::filesystem::path & filePath, int plays = 1, bool ignoreInfinitePlayback = false, int fadeInMs = 0) {
+		void push(const std::filesystem::path& filePath, int plays = 1, bool ignoreInfinitePlayback = false, int fadeInMs = 0) {
 			queue.add(store.load(filePath), plays, ignoreInfinitePlayback, fadeInMs);
 		}
 
@@ -37,40 +33,40 @@ namespace bloom::audio {
 	private:
 		Music() = default;
 		~Music() = default;
-		Music(const Music &) = delete;
-		Music(Music &&) = delete;
-		Music& operator=(const Music &) = delete;
+		Music(const Music&) = delete;
+		Music(Music&&) = delete;
+		Music& operator=(const Music&) = delete;
 	};
 
-	Music & Music::instance() {
+	Music& Music::instance() {
 		static Music music_instance;
 		return music_instance;
 	}
 
 
 	class Sounds {
 	public:
-		static Sounds & instance();
+		static Sounds& instance();
 
-		int add(const std::filesystem::path & filePath) {
+		int add(const std::filesystem::path& filePath) {
 			players.emplace_back(std::make_unique<SoundPlayer>(store.load(filePath)));
 			return (static_cast<int>(players.size()) - 1);
 		}
 
 		void stopAll() {
-			for (auto & p : players) {
+			for (auto& p : players) {
 				p->stop();
 			}
 		}
 
 		void pauseAll() {
-			for (auto & p : players) {
+			for (auto& p : players) {
 				p->pause();
 			}
 		}
 
 		void resumeAll() {
-			for (auto & p : players) {
+			for (auto& p : players) {
 				p->resume();
 			}
 		}
@@ -85,7 +81,7 @@ namespace bloom::audio {
 			SoundChannel::optimize();
 		}
 
-		SoundPlayerPtr & operator[](size_t off) {
+		SoundPlayerPtr& operator[](size_t off) {
 			return players[off];
 		}
 
@@ -95,18 +91,18 @@ namespace bloom::audio {
 	private:
 		Sounds() = default;
 		~Sounds() = default;
-		Sounds(const Sounds &) = delete;
-		Sounds(Sounds &&) = delete;
-		Sounds& operator=(const Sounds &) = delete;
+		Sounds(const Sounds&) = delete;
+		Sounds(Sounds&&) = delete;
+		Sounds& operator=(const Sounds&) = delete;
 	};
 
-	Sounds & Sounds::instance() {
+	Sounds& Sounds::instance() {
 		static Sounds sounds_instance;
 		return sounds_instance;
 	}
 
-	Music & music = Music::instance();
-	Sounds & sounds = Sounds::instance();
+	Music& music = Music::instance();
+	Sounds& sounds = Sounds::instance();
 
 	using MusicFull = Music;
 	using SoundFull = Sounds;

BloomFramework/include/Audio/AudioDefine.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define BLOOM_AUDIO_INFINITE_REPEAT -1
+constexpr auto BLOOM_AUDIO_INFINITE_REPEAT = -1;

BloomFramework/include/Audio/MusicQueue.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <queue>
 #include "MusicTrack.h"
 
@@ -36,6 +35,6 @@ namespace bloom::audio {
 		bool m_infinitePlayback = true;
 
 		static void next_track();
-		static MusicQueue * s_currentQueuePtr;
+		static MusicQueue* s_currentQueuePtr;
 	};
 }

BloomFramework/include/Audio/MusicStore.h

@@ -1,16 +1,15 @@
 #pragma once
-
 #include <unordered_map>
 #include "stdIncludes.h"
 #include "MusicTrack.h"
 
 namespace bloom::audio {
 	class BLOOMFRAMEWORK_API MusicStore {
 	public:
-		TrackPtr load(const std::filesystem::path & filePath);
-		TrackPtr find(const std::filesystem::path & filePath);
-		TrackPtr find(std::nothrow_t, const std::filesystem::path & filePath) noexcept;
-		void unload(const std::filesystem::path & filePath);
+		TrackPtr load(const std::filesystem::path& filePath);
+		TrackPtr find(const std::filesystem::path& filePath);
+		TrackPtr find(std::nothrow_t, const std::filesystem::path& filePath) noexcept;
+		void unload(const std::filesystem::path& filePath);
 		void unloadAll();
 
 	private:

BloomFramework/include/Audio/MusicTrack.h

@@ -1,15 +1,14 @@
 #pragma once
-
 #include "stdIncludes.h"
 
 namespace bloom::audio {
 	class BLOOMFRAMEWORK_API MusicTrack {
 	public:
 		MusicTrack() {}
-		MusicTrack(const std::filesystem::path & filePath);
+		MusicTrack(const std::filesystem::path& filePath);
 		~MusicTrack();
 
-		void load(const std::filesystem::path & filePath);
+		void load(const std::filesystem::path& filePath);
 		void play(int plays = 1, int fadeIn = 0);
 		bool tryPlay(int plays = 1, int fadeIn = 0);
 		void pause();
@@ -21,7 +20,7 @@ namespace bloom::audio {
 		static bool isPaused();
 
 	private:
-		Mix_Music * m_track = nullptr;
+		Mix_Music* m_track = nullptr;
 	};
 
 	using Track = MusicTrack;

BloomFramework/include/Audio/SoundChannel.h

@@ -1,13 +1,12 @@
 #pragma once
-
 #include <vector>
 #include <stack>
 #include "stdIncludes.h"
 
 namespace bloom::audio {
 	class BLOOMFRAMEWORK_API SoundChannel {
 	public:
-		SoundChannel(SoundChannel * objThisPtr);
+		SoundChannel(SoundChannel* objThisPtr);
 		~SoundChannel();
 
 		static void optimize();

BloomFramework/include/Audio/SoundChunk.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "stdIncludes.h"
 
 namespace bloom::audio {
@@ -9,11 +8,11 @@ namespace bloom::audio {
 		friend class SoundPlayer;
 
 	public:
-		SoundChunk(const std::filesystem::path & filePath, bool ignoreChecks = false);
+		SoundChunk(const std::filesystem::path& filePath, bool ignoreChecks = false);
 		~SoundChunk();
 
 	private:
-		Mix_Chunk * m_chunk = nullptr;
+		Mix_Chunk* m_chunk = nullptr;
 	};
 
 	using SoundChunkPtr = std::shared_ptr<SoundChunk>;

BloomFramework/include/Audio/SoundPlayer.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <vector>
 #include <stack>
 #include "stdIncludes.h"

BloomFramework/include/Audio/SoundStore.h

@@ -1,16 +1,15 @@
 #pragma once
-
 #include <unordered_map>
 #include "stdIncludes.h"
 #include "SoundChunk.h"
 
 namespace bloom::audio {
 	class BLOOMFRAMEWORK_API SoundStore {
 	public:
-		SoundChunkPtr load(const std::filesystem::path & filePath);
-		SoundChunkPtr find(const std::filesystem::path & filePath);
-		SoundChunkPtr find(std::nothrow_t, const std::filesystem::path & filePath) noexcept;
-		void unload(const std::filesystem::path & filePath);
+		SoundChunkPtr load(const std::filesystem::path& filePath);
+		SoundChunkPtr find(const std::filesystem::path& filePath);
+		SoundChunkPtr find(std::nothrow_t, const std::filesystem::path& filePath) noexcept;
+		void unload(const std::filesystem::path& filePath);
 		void unloadAll();
 
 	private:

BloomFramework/include/Components/Components.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "Position.h"
 #include "Size.h"
 #include "Sprite.h"

BloomFramework/include/Components/Position.h

@@ -2,7 +2,8 @@
 
 namespace bloom::components {
 	struct Position {
-		Position(int x = 0, int y = 0) : x(x), y(y) {}
+		Position() : x(0), y(0) {}
+		Position(int x, int y) : x(x), y(y) {}
 
 		int x, y;
 	};

BloomFramework/include/Components/Size.h

@@ -2,8 +2,9 @@
 
 namespace bloom::components {
 	struct Size {
-		Size(int w = 1, int h = 1) : w(w), h(h) {}
+		Size() : w(0), h(0) {}
+		Size(int w, int h) : w(w), h(h) {}
 
 		int w, h;
 	};
-}
+}

BloomFramework/include/Exception.h

@@ -1,7 +1,5 @@
 #pragma once
-
 #include <exception>
-#include <string_view>
 #include <iostream>
 
 namespace bloom {

BloomFramework/include/Framework.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include "stdIncludes.h"
 #include "Audio/Audio.h"
 #include "Exception.h"
@@ -11,4 +10,4 @@
 #include "Systems/Systems.h"
 #include "Graphics/Font.h"
 #include "Graphics/FontStore.h"
-#include "Graphics/SpriteText.h"
+#include "Graphics/SpriteText.h"