Skip to content

Refactoring and optimizations #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LumpBloom7 wants to merge 32 commits into
base: master
Choose a base branch
from
Open

Refactoring and optimizations #35

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f682465
Make both projects submodule friendly
LumpBloom7 Mar 30, 2019
d436a2b
Minor adjustment to BF include path
LumpBloom7 Mar 30, 2019
5cefea6
Optimize components
Apr 4, 2019
1a015dd
Move GameObject's funcs definitions to the header file
Apr 5, 2019
732fbd6
Optimize graphics
Apr 5, 2019
c9e77cd
Remove rounding in animation
LumpBloom7 Apr 6, 2019
bf99113
Optimize Systems
Apr 10, 2019
d1cd94b
Use RandomPos instead of NoRandomPos
Apr 10, 2019
262ceb0
Optimize RandomizerSystem even more
LumpBloom7 Apr 10, 2019
c1317da
Optimize RandomizerSystem even even more
Apr 11, 2019
7ec0143
Optimize Game
Apr 13, 2019
4c94688
Make Drawable's ctor protected instead of using pseudo pure-virtual dtor
Apr 14, 2019
f7f98ce
Small optimizations to Timer and deltaTime
Apr 14, 2019
88342db
Correctly set all build configurations' subsystem
LumpBloom7 Jun 7, 2019
46a4421
Avoid undefining SDL_Main
LumpBloom7 Jun 7, 2019
563472c
Release builds now use the Windows subsystem
LumpBloom7 Jun 7, 2019
cce415b
Make Game::delay static
Jul 23, 2019
956fd81
Rework Font's constructors
Jul 23, 2019
8deb732
Update sdl2_image to 2.0.5
Jul 23, 2019
df6aaf2
Fix solution projects not being able to load when packages are missing
LumpBloom7 Aug 16, 2019
9d7225f
Merge branch 'Improvements/vcxproj' into refactoring
LumpBloom7 Aug 16, 2019
06b8f54
Update SDL to 2.0.10
LumpBloom7 Aug 16, 2019
ac9377a
Make sure entity is still valid before destroying in GameObject dtor
LumpBloom7 Aug 16, 2019
28dc4e3
Merge branch 'master' into refactoring
LumpBloom7 Aug 16, 2019
0a780d3
Revert Timer time format back to double
LumpBloom7 Aug 16, 2019
5f9e731
Update entt to 3.0.0
LumpBloom7 Aug 26, 2019
4ddc2d8
Use absolute reference when including entt
LumpBloom7 Aug 26, 2019
0a1834d
Add back missing .0s
LumpBloom7 Oct 2, 2019
80469d1
Merge branch 'master' into refactoring
Oct 5, 2019
95bbe2a
Minor fixes and improvements
Oct 5, 2019
392fd7d
Remove unnecessary comment
LumpBloom7 Oct 5, 2019
eaa7fd2
Change isFixedWidth to isMonospaced
LumpBloom7 Oct 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions BloomFramework/BloomFramework.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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" />
Expand All @@ -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')" />
Expand All @@ -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'))" />
Expand Down
6 changes: 0 additions & 6 deletions BloomFramework/BloomFramework.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
36 changes: 18 additions & 18 deletions BloomFramework/include/Audio/Audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
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);
}

Expand All @@ -37,40 +37,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();
}
}
Expand All @@ -85,7 +85,7 @@ namespace bloom::audio {
SoundChannel::optimize();
}

SoundPlayerPtr & operator[](size_t off) {
SoundPlayerPtr& operator[](size_t off) {
return players[off];
}

Expand All @@ -95,18 +95,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;
Expand Down
2 changes: 1 addition & 1 deletion BloomFramework/include/Audio/MusicQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ namespace bloom::audio {
bool m_infinitePlayback = true;

static void next_track();
static MusicQueue * s_currentQueuePtr;
static MusicQueue* s_currentQueuePtr;
};
}
8 changes: 4 additions & 4 deletions BloomFramework/include/Audio/MusicStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
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:
Expand Down
6 changes: 3 additions & 3 deletions BloomFramework/include/Audio/MusicTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ 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();
Expand All @@ -21,7 +21,7 @@ namespace bloom::audio {
static bool isPaused();

private:
Mix_Music * m_track = nullptr;
Mix_Music* m_track = nullptr;
};

using Track = MusicTrack;
Expand Down
2 changes: 1 addition & 1 deletion BloomFramework/include/Audio/SoundChannel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace bloom::audio {
class BLOOMFRAMEWORK_API SoundChannel {
public:
SoundChannel(SoundChannel * objThisPtr);
SoundChannel(SoundChannel* objThisPtr);
~SoundChannel();

static void optimize();
Expand Down
4 changes: 2 additions & 2 deletions BloomFramework/include/Audio/SoundChunk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,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>;
Expand Down
8 changes: 4 additions & 4 deletions BloomFramework/include/Audio/SoundStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
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:
Expand Down
3 changes: 2 additions & 1 deletion BloomFramework/include/Components/Position.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
3 changes: 2 additions & 1 deletion BloomFramework/include/Components/Size.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

namespace bloom::components {
struct Size {
Size(int w = 1, int h = 1) : w(w), h(h) {}
Size() : w(0), h(0) {} // or -1?
Copy link
Copy Markdown
Collaborator

@kasmacioma kasmacioma Oct 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, use {0;0} here

Size(int w, int h) : w(w), h(h) {}

int w, h;
};
Expand Down
Loading