brammie15/dae16-VerhulstBram-GameProject
1
0
Fork 0
mirror of https://github.com/HowestDAE/dae16-VerhulstBram.git synced 2026-02-04 09:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix precompiled headers

Browse Source 
Added edge detection (if it works :/)
This commit is contained in:
Bram Verhulst
2024-04-06 01:23:24 +02:00
parent 71d364d9d8
commit 9def986c83
25 changed files with 932 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
.idea/.idea.Motherload/.idea/workspace.xml generated
View File

@@ -10,24 +10,45 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="26a0623a-44d5-441c-8048-32ff1dab3479" name="Changes" comment="Update Screen system&#10;Added FuelScreen (Working buttons)&#10;Added SellScreen (Nothing working)"> <list default="true" id="26a0623a-44d5-441c-8048-32ff1dab3479" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/Engine/Text.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Engine/Text.h" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Game/Levels/MainMenu/MainMenuLevel.cpp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Game/Levels/MainMenu/MainMenuLevel.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.Motherload/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Motherload/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.Motherload/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Motherload/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Engine/Engine.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/Engine/Engine.vcxproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Animations/Animation.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Animations/Animation.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Game.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Game.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Game.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.vcxproj" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Game.vcxproj.filters" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Game.vcxproj.filters" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/GameManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GameManager.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldGridManager.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldTile.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldTile.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldTile.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldTile.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldTile.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldTile.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/GridSystem/WorldTile.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/GridSystem/WorldTile.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Gui/Button.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Button.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/Gui/Button.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Button.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Gui/Button.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Button.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/Gui/Screen.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Screen.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Gui/Screens/FuelScreen.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Screens/FuelScreen.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/Gui/Screens/FuelScreen.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Screens/FuelScreen.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Gui/Screens/ScreenManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Screens/ScreenManager.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/Gui/Screens/ScreenManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Gui/Screens/ScreenManager.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/WorldLevel.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/WorldLevel.cpp" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/Level.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Levels/Level.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/WorldLevel.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/WorldLevel.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Game/Level.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Levels/Level.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/Player.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Player.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/WorldLevel.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Levels/World/WorldLevel.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Game/WorldLevel.h" beforeDir="false" afterPath="$PROJECT_DIR$/Game/Levels/World/WorldLevel.h" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="71d364d9d8b80fad541dc883c727d8984c247f4b" />
</map>
</option>
</component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
@@ -79,7 +100,118 @@
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock://C:/Users/Bram/Desktop/Programming 2/Exam/dae16-VerhulstBram/Game/Gui/Button.cpp" root0="SKIP_HIGHLIGHTING" /> <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Game/Animations/Animation.h" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Game/Camera.cpp" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Game/pch.cpp" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Game/pch.h" root0="FORCE_HIGHLIGHTING" />
</component> </component>
<component name="MarkdownSettingsMigration"> <component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" /> <option name="stateVersion" value="1" />
@@ -108,7 +240,7 @@
"node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)", "node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm", "nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "CppClangTidyOptionsId", "settings.editor.selected.configurable": "editor.preferences.fonts.default",
"vue.rearranger.settings.migration": "true" "vue.rearranger.settings.migration": "true"
}, },
"keyToStringList": { "keyToStringList": {
@@ -203,6 +335,13 @@
<workItem from="1712157285165" duration="272000" /> <workItem from="1712157285165" duration="272000" />
<workItem from="1712159816145" duration="6176000" /> <workItem from="1712159816145" duration="6176000" />
<workItem from="1712174165252" duration="13683000" /> <workItem from="1712174165252" duration="13683000" />
<workItem from="1712238149774" duration="264000" />
<workItem from="1712247325954" duration="2736000" />
<workItem from="1712250445520" duration="721000" />
<workItem from="1712269212956" duration="5658000" />
<workItem from="1712313346695" duration="4041000" />
<workItem from="1712322453730" duration="533000" />
<workItem from="1712328371740" duration="10932000" />
</task> </task>
<task id="LOCAL-00001" summary="Rework Tile detection system"> <task id="LOCAL-00001" summary="Rework Tile detection system">
<option name="closed" value="true" /> <option name="closed" value="true" />

2
Engine/Engine.vcxproj
View File

@@ -34,6 +34,7 @@
<ClCompile Include="SoundStream.cpp" /> <ClCompile Include="SoundStream.cpp" />
<ClCompile Include="structs.cpp" /> <ClCompile Include="structs.cpp" />
<ClCompile Include="SVGParser.cpp" /> <ClCompile Include="SVGParser.cpp" />
<ClCompile Include="Text.cpp" />
<ClCompile Include="Texture.cpp" /> <ClCompile Include="Texture.cpp" />
<ClCompile Include="utils.cpp" /> <ClCompile Include="utils.cpp" />
<ClCompile Include="Vector2f.cpp" /> <ClCompile Include="Vector2f.cpp" />
@@ -58,6 +59,7 @@
<ClInclude Include="SoundStream.h" /> <ClInclude Include="SoundStream.h" />
<ClInclude Include="structs.h" /> <ClInclude Include="structs.h" />
<ClInclude Include="SVGParser.h" /> <ClInclude Include="SVGParser.h" />
<ClInclude Include="Text.h" />
<ClInclude Include="Texture.h" /> <ClInclude Include="Texture.h" />
<ClInclude Include="Transform.h" /> <ClInclude Include="Transform.h" />
<ClInclude Include="utils.h" /> <ClInclude Include="utils.h" />

17
Engine/Text.cpp Normal file
View File

@@ -0,0 +1,17 @@
#include "Text.h"
#include <iostream>
Text::Text(const std::string& text, const std::string& fontPath, int size, const Color4f& color): m_Text(text), m_FontPath(fontPath), m_Color(color) {
m_Texture = new Texture(text, fontPath, size, color);
m_IsCreatedOk = m_Texture->IsCreationOk();
if(!m_IsCreatedOk) {
std::cout << "Error creating text texture, Text: " << text << std::endl;
}
}
Text::~Text() {
if(m_IsCreatedOk && m_Texture->IsCreationOk()) {
}
}
void Text::Draw(const Point2f& pos) const {
m_Texture->Draw(pos);
}

24
Engine/Text.h Normal file
View File

@@ -0,0 +1,24 @@
#pragma once
#include <string>
#include "Texture.h"
#include "../Game/TextureManager.h"
class Text
{
public:
Text(const std::string& text, const std::string& fontPath, int size, const Color4f& color);
Text() = default;
~Text();
void Draw(const Point2f& pos) const;
private:
std::string m_Text;
std::string m_FontPath;
Color4f m_Color;
Texture* m_Texture;
bool m_IsCreatedOk{ false };
};

1
Game/Animations/Animation.cpp
View File

@@ -1,3 +1,4 @@
#include "pch.h"
#include "Animation.h" #include "Animation.h"
Animation::Animation(Texture* pTexture, int frames, float frameDuration, Rectf srcRect): m_pTexture(pTexture), m_SrcRect(srcRect), m_Frames(frames) { Animation::Animation(Texture* pTexture, int frames, float frameDuration, Rectf srcRect): m_pTexture(pTexture), m_SrcRect(srcRect), m_Frames(frames) {

14
Game/Game.cpp
View File

@@ -1,4 +1,3 @@
#include <imgui.h>
#include "pch.h" #include "pch.h"
#include "Game.h" #include "Game.h"
@@ -6,13 +5,14 @@
#include "colors.h" #include "colors.h"
#include "utils.h" #include "utils.h"
#include "WorldLevel.h" #include "Levels/World/WorldLevel.h"
Rectf Game::VIEWPORT {}; Rectf Game::VIEWPORT {};
Game::Game(const Window& window) Game::Game(const Window& window)
: BaseGame { window }, m_Camera(Camera()), m_WorldLevel(WorldLevel(&m_Camera, GetViewPort())) { : BaseGame { window }, m_Camera(Camera()), m_WorldLevel(WorldLevel(&m_Camera, GetViewPort())),
m_MainMenuLevel(MainMenuLevel(&m_Camera)), m_pCurrentLevel(&m_WorldLevel) {
Initialize(); Initialize();
Game::VIEWPORT = GetViewPort(); //TODO: See if this can be removed Game::VIEWPORT = GetViewPort(); //TODO: See if this can be removed
} }
@@ -39,13 +39,13 @@ void Game::Update(float elapsedSec) {
m_MouseOffset = m_Camera.GetPosition(); m_MouseOffset = m_Camera.GetPosition();
} }
m_WorldLevel.Update(elapsedSec); m_pCurrentLevel->Update(elapsedSec);
} }
void Game::Draw() const { void Game::Draw() const {
utils::ClearBackground(Color4f(0.0f, 0.0f, 0.3f, 1.0f)); utils::ClearBackground(Color4f(0.0f, 0.0f, 0.3f, 1.0f));
m_WorldLevel.Draw(); m_pCurrentLevel->Draw();
} }
void Game::ProcessKeyDownEvent(const SDL_KeyboardEvent& e) { void Game::ProcessKeyDownEvent(const SDL_KeyboardEvent& e) {
@@ -57,7 +57,7 @@ void Game::ProcessKeyUpEvent(const SDL_KeyboardEvent& e) {
void Game::ProcessMouseMotionEvent(const SDL_MouseMotionEvent& e) { void Game::ProcessMouseMotionEvent(const SDL_MouseMotionEvent& e) {
m_MousePos = Point2f { float(e.x), float(e.y) }; m_MousePos = Point2f { float(e.x), float(e.y) };
m_WorldLevel.MouseMove(Point2f { float(e.x), float(e.y) }); m_pCurrentLevel->MouseMove(Point2f { float(e.x), float(e.y) });
} }
void Game::ProcessMouseDownEvent(const SDL_MouseButtonEvent& e) { void Game::ProcessMouseDownEvent(const SDL_MouseButtonEvent& e) {
@@ -82,5 +82,5 @@ void Game::ProcessMouseUpEvent(const SDL_MouseButtonEvent& e) {
//} //}
} }
void Game::ProcessImGui() { void Game::ProcessImGui() {
m_WorldLevel.ProcessImGui(); m_pCurrentLevel->ProcessImGui();
} }

6
Game/Game.h
View File

@@ -2,7 +2,8 @@
#include "BaseGame.h" #include "BaseGame.h"
#include "Camera.h" #include "Camera.h"
#include "WorldLevel.h" #include "Levels/MainMenu/MainMenuLevel.h"
#include "Levels/World/WorldLevel.h"
class Game : public BaseGame class Game : public BaseGame
{ {
@@ -37,6 +38,9 @@ private:
Camera m_Camera; Camera m_Camera;
WorldLevel m_WorldLevel; WorldLevel m_WorldLevel;
MainMenuLevel m_MainMenuLevel;
Level* m_pCurrentLevel;
Point2f m_MousePos {}; Point2f m_MousePos {};
Point2f m_MouseOffset {}; Point2f m_MouseOffset {};

162
Game/Game.vcxproj
View File

@@ -71,7 +71,7 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Engine\imgui;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\include;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\include;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\include;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\include;$(SolutionDir)\Engine;$(IncludePath)</IncludePath> <IncludePath>C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Game;C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Engine\imgui;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\include;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\include;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\include;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\include;$(SolutionDir)\Engine;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\x64\Debug;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\lib\x64;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\lib\x64;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\lib\x64;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\lib\x64;$(LibraryPath)</LibraryPath> <LibraryPath>$(SolutionDir)\x64\Debug;$(SolutionDir)\Libraries\SDLTtf\SDL2_ttf-2.20.2\lib\x64;$(SolutionDir)\Libraries\SDLMixer\SDL2_mixer-2.6.3\lib\x64;$(SolutionDir)\Libraries\SDLImage\SDL2_image-2.6.3\lib\x64;$(SolutionDir)\Libraries\SDLMain\SDL2-2.26.3\lib\x64;$(LibraryPath)</LibraryPath>
<CustomBuildAfterTargets>BuildCompile</CustomBuildAfterTargets> <CustomBuildAfterTargets>BuildCompile</CustomBuildAfterTargets>
</PropertyGroup> </PropertyGroup>
@@ -109,7 +109,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -304,7 +304,82 @@
<ClCompile Include="Gui\Screen.cpp" /> <ClCompile Include="Gui\Screen.cpp" />
<ClCompile Include="Gui\Screens\FuelScreen.cpp" /> <ClCompile Include="Gui\Screens\FuelScreen.cpp" />
<ClCompile Include="Gui\Screens\ScreenManager.cpp" /> <ClCompile Include="Gui\Screens\ScreenManager.cpp" />
<ClCompile Include="Level.cpp"> <ClCompile Include="Levels\Level.cpp">
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<Optimization>Disabled</Optimization>
<SupportJustMyCode>true</SupportJustMyCode>
<AssemblerOutput>NoListing</AssemblerOutput>
<AssemblerListingLocation>x64\Debug\</AssemblerListingLocation>
<UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
<BrowseInformation>false</BrowseInformation>
<BrowseInformationFile>x64\Debug\</BrowseInformationFile>
<CompileAs>Default</CompileAs>
<ConformanceMode>true</ConformanceMode>
<DiagnosticsFormat>Column</DiagnosticsFormat>
<DisableLanguageExtensions>false</DisableLanguageExtensions>
<ErrorReporting>Prompt</ErrorReporting>
<ExpandAttributedSource>false</ExpandAttributedSource>
<ExceptionHandling>Sync</ExceptionHandling>
<EnableASAN>false</EnableASAN>
<EnableFuzzer>false</EnableFuzzer>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<GenerateModuleDependencies>false</GenerateModuleDependencies>
<GenerateSourceDependencies>false</GenerateSourceDependencies>
<GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<LanguageStandard>Default</LanguageStandard>
<LanguageStandard_C>Default</LanguageStandard_C>
<MinimalRebuild>false</MinimalRebuild>
<ModuleDependenciesFile>x64\Debug\</ModuleDependenciesFile>
<ModuleOutputFile>x64\Debug\</ModuleOutputFile>
<OmitDefaultLibName>false</OmitDefaultLibName>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
<ObjectFileName>x64\Debug\</ObjectFileName>
<CallingConvention>Cdecl</CallingConvention>
<ProgramDataBaseFileName>x64\Debug\vc143.pdb</ProgramDataBaseFileName>
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>x64\Debug\Game.pch</PrecompiledHeaderOutputFile>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessKeepComments>false</PreprocessKeepComments>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
<ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
<ShowIncludes>false</ShowIncludes>
<SourceDependenciesFile>x64\Debug\</SourceDependenciesFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<BufferSecurityCheck>true</BufferSecurityCheck>
<SmallerTypeCheck>false</SmallerTypeCheck>
<SpectreMitigation>false</SpectreMitigation>
<StructMemberAlignment>Default</StructMemberAlignment>
<TrackerLogDirectory>x64\Debug\Game.tlog\</TrackerLogDirectory>
<TranslateIncludes>false</TranslateIncludes>
<MinimalRebuildFromTracking>true</MinimalRebuildFromTracking>
<TreatWarningAsError>false</TreatWarningAsError>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<UseFullPaths>true</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<XMLDocumentationFileName>x64\Debug\</XMLDocumentationFileName>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<IntelJCCErratum>false</IntelJCCErratum>
<BuildStlModules>false</BuildStlModules>
<TreatAngleIncludeAsExternal>false</TreatAngleIncludeAsExternal>
<ExternalWarningLevel>InheritWarningLevel</ExternalWarningLevel>
<TreatExternalTemplatesAsInternal>true</TreatExternalTemplatesAsInternal>
<DisableAnalyzeExternal>false</DisableAnalyzeExternal>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_UNICODE;UNICODE;</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<LinkCompiled>true</LinkCompiled>
</ClCompile>
<ClCompile Include="Levels\MainMenu\MainMenuLevel.cpp" />
<ClCompile Include="Levels\World\WorldLevel.cpp">
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@@ -382,80 +457,6 @@
<ClCompile Include="pch.cpp" /> <ClCompile Include="pch.cpp" />
<ClCompile Include="Player.cpp" /> <ClCompile Include="Player.cpp" />
<ClCompile Include="TextureManager.cpp" /> <ClCompile Include="TextureManager.cpp" />
<ClCompile Include="WorldLevel.cpp">
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<Optimization>Disabled</Optimization>
<SupportJustMyCode>true</SupportJustMyCode>
<AssemblerOutput>NoListing</AssemblerOutput>
<AssemblerListingLocation>x64\Debug\</AssemblerListingLocation>
<UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
<BrowseInformation>false</BrowseInformation>
<BrowseInformationFile>x64\Debug\</BrowseInformationFile>
<CompileAs>Default</CompileAs>
<ConformanceMode>true</ConformanceMode>
<DiagnosticsFormat>Column</DiagnosticsFormat>
<DisableLanguageExtensions>false</DisableLanguageExtensions>
<ErrorReporting>Prompt</ErrorReporting>
<ExpandAttributedSource>false</ExpandAttributedSource>
<ExceptionHandling>Sync</ExceptionHandling>
<EnableASAN>false</EnableASAN>
<EnableFuzzer>false</EnableFuzzer>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<FloatingPointModel>Precise</FloatingPointModel>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<GenerateModuleDependencies>false</GenerateModuleDependencies>
<GenerateSourceDependencies>false</GenerateSourceDependencies>
<GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<LanguageStandard>Default</LanguageStandard>
<LanguageStandard_C>Default</LanguageStandard_C>
<MinimalRebuild>false</MinimalRebuild>
<ModuleDependenciesFile>x64\Debug\</ModuleDependenciesFile>
<ModuleOutputFile>x64\Debug\</ModuleOutputFile>
<OmitDefaultLibName>false</OmitDefaultLibName>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<WholeProgramOptimization>false</WholeProgramOptimization>
<ObjectFileName>x64\Debug\</ObjectFileName>
<CallingConvention>Cdecl</CallingConvention>
<ProgramDataBaseFileName>x64\Debug\vc143.pdb</ProgramDataBaseFileName>
<PrecompiledHeader>Create</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>x64\Debug\Game.pch</PrecompiledHeaderOutputFile>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessKeepComments>false</PreprocessKeepComments>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
<ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
<ShowIncludes>false</ShowIncludes>
<SourceDependenciesFile>x64\Debug\</SourceDependenciesFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<BufferSecurityCheck>true</BufferSecurityCheck>
<SmallerTypeCheck>false</SmallerTypeCheck>
<SpectreMitigation>false</SpectreMitigation>
<StructMemberAlignment>Default</StructMemberAlignment>
<TrackerLogDirectory>x64\Debug\Game.tlog\</TrackerLogDirectory>
<TranslateIncludes>false</TranslateIncludes>
<MinimalRebuildFromTracking>true</MinimalRebuildFromTracking>
<TreatWarningAsError>false</TreatWarningAsError>
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<UseFullPaths>true</UseFullPaths>
<WarningLevel>Level3</WarningLevel>
<XMLDocumentationFileName>x64\Debug\</XMLDocumentationFileName>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<IntelJCCErratum>false</IntelJCCErratum>
<BuildStlModules>false</BuildStlModules>
<TreatAngleIncludeAsExternal>false</TreatAngleIncludeAsExternal>
<ExternalWarningLevel>InheritWarningLevel</ExternalWarningLevel>
<TreatExternalTemplatesAsInternal>true</TreatExternalTemplatesAsInternal>
<DisableAnalyzeExternal>false</DisableAnalyzeExternal>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_UNICODE;UNICODE;</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
<LinkCompiled>true</LinkCompiled>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Animations\Animation.h" /> <ClInclude Include="Animations\Animation.h" />
@@ -468,11 +469,12 @@
<ClInclude Include="Gui\Screen.h" /> <ClInclude Include="Gui\Screen.h" />
<ClInclude Include="Gui\Screens\FuelScreen.h" /> <ClInclude Include="Gui\Screens\FuelScreen.h" />
<ClInclude Include="Gui\Screens\ScreenManager.h" /> <ClInclude Include="Gui\Screens\ScreenManager.h" />
<ClInclude Include="Level.h"/> <ClInclude Include="Levels\Level.h" />
<ClInclude Include="Levels\MainMenu\MainMenuLevel.h" />
<ClInclude Include="Levels\World\WorldLevel.h" />
<ClInclude Include="pch.h" /> <ClInclude Include="pch.h" />
<ClInclude Include="Player.h" /> <ClInclude Include="Player.h" />
<ClInclude Include="TextureManager.h" /> <ClInclude Include="TextureManager.h" />
<ClInclude Include="WorldLevel.h"/>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
@@ -481,6 +483,6 @@
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory> <LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Engine\imgui;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> <IncludePath>C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Game;C:\Users\Bram\Desktop\Programming 2\Exam\dae16-VerhulstBram\Engine\imgui;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

66
Game/Game.vcxproj.filters
View File

@@ -27,21 +27,42 @@
<ClCompile Include="Camera.cpp"> <ClCompile Include="Camera.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Level.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="WorldLevel.cpp"> <ClCompile Include="WorldLevel.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="WorldTile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Player.cpp"> <ClCompile Include="Player.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="TextureManager.cpp"> <ClCompile Include="TextureManager.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Animations\Animation.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GameManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GridSystem\WorldGridManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GridSystem\WorldTile.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Gui\Button.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Gui\Screen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Gui\Screens\FuelScreen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Gui\Screens\ScreenManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Levels\Level.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Game.h"> <ClInclude Include="Game.h">
@@ -53,20 +74,41 @@
<ClInclude Include="Camera.h"> <ClInclude Include="Camera.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Level.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="WorldLevel.h"> <ClInclude Include="WorldLevel.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="WorldTile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Player.h"> <ClInclude Include="Player.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="TextureManager.h"> <ClInclude Include="TextureManager.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Animations\Animation.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GameManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GridSystem\WorldGridManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GridSystem\WorldTile.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Gui\Button.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Gui\Screen.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Gui\Screens\FuelScreen.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Gui\Screens\ScreenManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Levels\Level.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
Game/GameManager.cpp
View File

@@ -1 +1,2 @@
#include "pch.h"
#include "GameManager.h" #include "GameManager.h"

37
Game/GridSystem/WorldGridManager.cpp
View File

@@ -1,4 +1,5 @@
#include "WorldGridManager.h" #include "pch.h"
#include "WorldGridManager.h"
#include <stdexcept> #include <stdexcept>
@@ -15,31 +16,27 @@ WorldGridManager::WorldGridManager() {
WorldGridManager::~WorldGridManager() { WorldGridManager::~WorldGridManager() {
} }
std::vector<WorldTile*> WorldGridManager::GetSurroundingTiles(const WorldTile* world_tile) { surroundingTiles WorldGridManager::GetSurroundingTiles(const WorldTile* world_tile) {
std::vector<WorldTile*> tiles; surroundingTiles tiles;
Point2f pos = world_tile->GetPosition(); Point2f pos = world_tile->GetPosition();
Point2f gridCoords = this->GetIndexFromPosition(pos); Point2f gridCoords = this->GetIndexFromPosition(pos);
int x = gridCoords.x; int x = gridCoords.x;
//TODO: Stupid fix, fix this //TODO: Stupid fix, fix this
int y = gridCoords.y - 1; int y = gridCoords.y - 1;
if (x < 0 || x >= WORLD_WIDTH || y < 0 || y >= WORLD_HEIGHT) {
return tiles; tiles.SetTile(TileDirection::TopLeft, this->GetTileAtIndex(x - 1, y - 1));
} tiles.SetTile(TileDirection::TopMiddle, this->GetTileAtIndex(x, y - 1));
for (int i { -1 }; i <= 1; ++i) { tiles.SetTile(TileDirection::TopRight, this->GetTileAtIndex(x + 1, y - 1));
for (int j { -1 }; j <= 1; ++j) {
if (i == 0 && j == 0) { tiles.SetTile(TileDirection::MiddleLeft, this->GetTileAtIndex(x - 1, y));
continue; tiles.SetTile(TileDirection::MiddleRight, this->GetTileAtIndex(x + 1, y));
}
if(x + i < 0 || x + i >= WORLD_WIDTH || y + j < 0 || y + j >= WORLD_HEIGHT) { tiles.SetTile(TileDirection::BottomLeft, this->GetTileAtIndex(x - 1, y + 1));
continue; tiles.SetTile(TileDirection::BottomMiddle, this->GetTileAtIndex(x, y + 1));
} tiles.SetTile(TileDirection::BottomRight, this->GetTileAtIndex(x + 1, y + 1));
WorldTile* tile = GetTileAtIndex(x + i, y + j);
if (tile != nullptr) {
tiles.push_back(tile);
}
}
}
return tiles; return tiles;
} }
Point2f WorldGridManager::GetIndexFromPosition(Point2f position) { Point2f WorldGridManager::GetIndexFromPosition(Point2f position) {
int x = int(position.x / TILE_WIDTH + WORLD_WIDTH / 2); int x = int(position.x / TILE_WIDTH + WORLD_WIDTH / 2);

30
Game/GridSystem/WorldGridManager.h
View File

@@ -1,5 +1,6 @@
#pragma once #pragma once
#include <array> #include <array>
#include <map>
#include <vector> #include <vector>
#include "structs.h" #include "structs.h"
@@ -12,17 +13,32 @@ static const int TILE_HEIGHT = 50;
class WorldTile; class WorldTile;
enum TileDirection
{
TopLeft,
TopMiddle,
TopRight,
MiddleLeft,
//me
MiddleRight,
BottomLeft,
BottomMiddle,
BottomRight
};
struct surroundingTiles struct surroundingTiles
{ {
std::array<WorldTile *, 8> tiles;
//Center of the surrounding tiles is 0, 0 std::map<TileDirection, WorldTile *> m_tiles;
void SetTile(int x, int y, WorldTile* tile) {
tiles[x + y * 3] = tile; void SetTile(TileDirection direction, WorldTile* tile) {
m_tiles[direction] = tile;
} }
WorldTile * GetTile(int x, int y) { WorldTile* GetTile(TileDirection direction) {
return tiles[x + y * 3]; return m_tiles[direction];
} }
}; };
@@ -31,7 +47,7 @@ class WorldGridManager
public: public:
WorldGridManager(); WorldGridManager();
~WorldGridManager(); ~WorldGridManager();
std::vector<WorldTile*> GetSurroundingTiles(const WorldTile* world_tile); surroundingTiles GetSurroundingTiles(const WorldTile* world_tile);
Point2f GetIndexFromPosition(Point2f position); Point2f GetIndexFromPosition(Point2f position);
WorldGridManager(const WorldGridManager& other) = default; WorldGridManager(const WorldGridManager& other) = default;

104
Game/GridSystem/WorldTile.cpp
View File

@@ -1,7 +1,9 @@
#include "WorldTile.h" #include "pch.h"
#include "WorldTile.h"
#include <iostream> #include <iostream>
#include "Camera.h"
#include "colors.h" #include "colors.h"
#include "../TextureManager.h" #include "../TextureManager.h"
#include "utils.h" #include "utils.h"
@@ -21,56 +23,78 @@ WorldTile::WorldTile(const Point2f& position, GroundTileType* groundTileType, Te
WorldTile::~WorldTile() { WorldTile::~WorldTile() {
delete m_pTexture; delete m_pTexture;
} }
void WorldTile::Draw() const { void WorldTile::Draw() {
if (*m_GroundTileType != Tiles::AIR) { if (*m_GroundTileType != Tiles::AIR) {
m_pTexture->Draw(m_Position); m_pTexture->Draw(m_Position);
if (m_Hightlight) { if (m_Hightlight) {
utils::SetColor(Colors::GREEN); utils::SetColor(Colors::GREEN);
utils::FillRect(m_Position, 50, 50); utils::FillRect(m_Position, 50, 50);
} }
return;
} }
if(m_Hightlight) {
for (int i = 0; i < 8; i++) {
WorldTile* tile = m_SurroundingTiles.GetTile(static_cast<TileDirection>(i));
if(tile != nullptr) { //Tile exists
//TODO: Wow Big mess
GroundTileTypes type = tile->GetTileType()->getType();
if(type == Tiles::AIR->getType()) {
utils::SetColor(Colors::BLACK);
utils::FillRect(Rectf{tile->GetPosition(), Point2f{50,50}});
continue;
}
if(type != Tiles::AIR->getType()) {
utils::SetColor(Colors::YELLOW);
utils::FillRect(Rectf{tile->GetPosition(), Point2f{50,50}});
}
}
}
}
//Tile is air, So check 8 tiles around //Tile is air, So check 8 tiles around
// Check the 4 tiles diagonally // Check the 4 tiles diagonally
Point2f CurrentIndex = m_pGridManager->GetIndexFromPosition(m_Position);
WorldTile* pTopLeft = m_pGridManager->GetTileAtIndex(CurrentIndex.x - 1, CurrentIndex.y - 1); // m_SurroundingTiles = m_pGridManager->GetSurroundingTiles(this);
WorldTile* pTopRight = m_pGridManager->GetTileAtIndex(CurrentIndex.x + 1, CurrentIndex.y - 1); //
WorldTile* pBottomLeft = m_pGridManager->GetTileAtIndex(CurrentIndex.x - 1, CurrentIndex.y + 1); // //check if all tiles are air
WorldTile* pBottomRight = m_pGridManager->GetTileAtIndex(CurrentIndex.x + 1, CurrentIndex.y + 1); // bool allAir = true;
// for (int i = 0; i < 8; i++) {
// WorldTile* tile = m_SurroundingTiles.GetTile(static_cast<TileDirection>(i));
GroundTileType* pTopLeftType = pTopLeft != nullptr ? pTopLeft->GetTileType() : Tiles::AIR; // if(tile != nullptr) { //Tile exists
GroundTileType* pTopRightType = pTopRight != nullptr ? pTopRight->GetTileType() : Tiles::AIR; // if(tile->GetTileType() != Tiles::AIR) {
GroundTileType* pBottomLeftType = pBottomLeft != nullptr ? pBottomLeft->GetTileType() : Tiles::AIR; // allAir = false;
GroundTileType* pBottomRightType = pBottomRight != nullptr ? pBottomRight->GetTileType() : Tiles::AIR; // break;
if(pBottomLeftType == Tiles::AIR && pBottomRightType == Tiles::AIR && pTopLeftType == Tiles::AIR && pTopRightType == Tiles::AIR) {
return;
}
if(pTopLeftType != Tiles::AIR) {
m_pTopLeftTexture->Draw(m_Position);
}
if(pTopRightType != Tiles::AIR) {
m_pTopRightTexture->Draw(m_Position);
}
if(pBottomLeftType != Tiles::AIR) {
m_pBottomLeftTexture->Draw(m_Position);
}
if(pBottomRightType != Tiles::AIR) {
m_pBottomRightTexture->Draw(m_Position);
}
// if(m_Hightlight) {
// //Draw a rect over the diagonal tiles
// utils::SetColor(Colors::GREEN);
// utils::FillRect(m_Position, 50, 50);
// utils::FillRect(Rectf{ pTopLeft->GetPosition(), Point2f{ 50, 50} });
// utils::FillRect(Rectf{ pTopRight->GetPosition(), Point2f{ 50, 50} });
// utils::FillRect(Rectf{ pBottomLeft->GetPosition(), Point2f{ 50, 50} });
// utils::FillRect(Rectf{ pBottomRight->GetPosition(), Point2f{ 50, 50} });
// } // }
// }
// }
// if (allAir) {
// return;
// }
//
// WorldTile* topLeft = m_SurroundingTiles.GetTile(TileDirection::TopLeft); //TODO: ask if draw needs to be const
// GroundTileType* topLeftType = topLeft != nullptr ? topLeft->GetTileType() : Tiles::AIR;
// if(topLeftType != Tiles::AIR) {
// m_pTopLeftTexture->Draw(m_Position);
// utils::SetColor(Colors::YELLOW);
// utils::FillRect(Rectf{topLeft->GetPosition(), Point2f{50,50}});
// }
//
// WorldTile* topRight = m_SurroundingTiles.GetTile(TileDirection::TopRight);
// GroundTileType* topRightType = topRight != nullptr ? topRight->GetTileType() : Tiles::AIR;
// if(topRightType != Tiles::AIR) {
// m_pTopRightTexture->Draw(m_Position);
// }
//
}
void WorldTile::Update(Camera* camera) {
Point2f CurrentIndex = m_pGridManager->GetIndexFromPosition(m_Position);
m_SurroundingTiles = m_pGridManager->GetSurroundingTiles(this);
Point2f mousePos = camera->TransformMouse(Point2f{utils::GetMousePos().x, 500 - utils::GetMousePos().y});
m_Hightlight = utils::IsPointInRect(mousePos, Rectf{GetCollisionRect().pos, GetCollisionRect().size});
if(CurrentIndex.x == 1 && CurrentIndex.y == 1) {
std::cout << "Hey" << std::endl;
}
} }
Collision::TileCollisionRect WorldTile::GetCollisionRect() { Collision::TileCollisionRect WorldTile::GetCollisionRect() {
return Collision::TileCollisionRect { m_Position, GetSize(), ( this ) }; return Collision::TileCollisionRect { m_Position, GetSize(), ( this ) };

8
Game/GridSystem/WorldTile.h
View File

@@ -4,7 +4,7 @@
#include "WorldGridManager.h" #include "WorldGridManager.h"
#include "../TextureManager.h" #include "../TextureManager.h"
class Camera;
enum class GroundTileTypes enum class GroundTileTypes
{ {
@@ -98,8 +98,8 @@ public:
WorldTile(const Point2f& position, GroundTileType* groundTileType, TextureManager* pTextureManager, WorldGridManager* pGridManager); WorldTile(const Point2f& position, GroundTileType* groundTileType, TextureManager* pTextureManager, WorldGridManager* pGridManager);
~WorldTile(); ~WorldTile();
void Draw() const; void Draw();
void Update(); void Update(Camera* camera); //TODO: no use
Point2f GetPosition() const { Point2f GetPosition() const {
return m_Position; return m_Position;
@@ -133,6 +133,8 @@ private:
WorldGridManager* m_pGridManager; WorldGridManager* m_pGridManager;
surroundingTiles m_SurroundingTiles;
Texture* m_pTopLeftTexture; Texture* m_pTopLeftTexture;
Texture* m_pTopRightTexture; Texture* m_pTopRightTexture;
Texture* m_pBottomLeftTexture; Texture* m_pBottomLeftTexture;

1
Game/Gui/Button.cpp
View File

@@ -1,3 +1,4 @@
#include "pch.h"
#include "Button.h" #include "Button.h"
#include <iostream> #include <iostream>

2
Game/Gui/Screen.cpp
View File

@@ -1,4 +1,6 @@
#include "pch.h"
#include "Screen.h" #include "Screen.h"
Screen::Screen(const std::string& filePath, Point2f pos, Point2f size,TextureManager* manager): m_Position(pos), m_Size(size) Screen::Screen(const std::string& filePath, Point2f pos, Point2f size,TextureManager* manager): m_Position(pos), m_Size(size)
{ {
m_Background = manager->GetTexture(filePath); m_Background = manager->GetTexture(filePath);

1
Game/Gui/Screens/FuelScreen.cpp
View File

@@ -1,3 +1,4 @@
#include "pch.h"
#include "FuelScreen.h" #include "FuelScreen.h"
#include "ScreenManager.h" #include "ScreenManager.h"

1
Game/Gui/Screens/ScreenManager.cpp
View File

@@ -1,3 +1,4 @@
#include "pch.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "FuelScreen.h" #include "FuelScreen.h"

1
Game/Level.cpp → Game/Levels/Level.cpp
View File

@@ -1,5 +1,6 @@
#include "pch.h" #include "pch.h"
#include "Level.h" #include "Level.h"
#include "../Camera.h"
#include <iostream> #include <iostream>
Level::Level() : m_pCamera(nullptr) { Level::Level() : m_pCamera(nullptr) {

3
Game/Level.h → Game/Levels/Level.h
View File

@@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Camera.h"
class Camera;
class Level class Level
{ {

27
Game/Levels/MainMenu/MainMenuLevel.cpp Normal file
View File

@@ -0,0 +1,27 @@
#include "pch.h"
#include "MainMenuLevel.h"
#include "colors.h"
#include "utils.h"
MainMenuLevel::MainMenuLevel(Camera* camera): Level(camera) {
m_TextMotherload = new Text("Motherload", "fonts/verdana.ttf", 20, Colors::WHITE);
m_TextNewGame = new Text("New Game", "fonts/verdana.ttf", 20, Colors::WHITE);
m_TextExit = new Text("Exit", "fonts/verdana.ttf", 20, Colors::WHITE);
}
MainMenuLevel::~MainMenuLevel() {
delete m_TextMotherload;
delete m_TextNewGame;
delete m_TextExit;
}
void MainMenuLevel::Update(float elapsedSec) {
}
void MainMenuLevel::Draw() const {
m_TextMotherload->Draw(Point2f(200, 100));
m_TextNewGame->Draw(Point2f(200, 200));
m_TextExit->Draw(Point2f(200, 300));
}
void MainMenuLevel::MouseMove(const Point2f& mousePos) {
}
void MainMenuLevel::ProcessImGui() {
}

21
Game/Levels/MainMenu/MainMenuLevel.h Normal file
View File

@@ -0,0 +1,21 @@
#pragma once
#include "Text.h"
#include "Levels/Level.h"
class MainMenuLevel : public Level
{
public:
MainMenuLevel(Camera* camera);
virtual ~MainMenuLevel();
void Update(float elapsedSec) override;
void Draw() const override;
void MouseMove(const Point2f& mousePos) override;
void ProcessImGui() override;
private:
Text* m_TextMotherload;
Text* m_TextNewGame;
Text* m_TextExit;
};

34
Game/WorldLevel.cpp → Game/Levels/World/WorldLevel.cpp
View File

@@ -60,29 +60,39 @@ void WorldLevel::Update(float elapsedSec) {
//m_player.Update(elapsedSec, *this); //m_player.Update(elapsedSec, *this);
WorldTile* selectedTile { nullptr };
for (size_t x { 0 }; x < WORLD_WIDTH; ++x) { for (size_t x { 0 }; x < WORLD_WIDTH; ++x) {
for (size_t y { 0 }; y < WORLD_HEIGHT; ++y) { for (size_t y { 0 }; y < WORLD_HEIGHT; ++y) {
m_gridManager.GetTileAtIndex(x, y)->m_Hightlight = false; m_gridManager.GetTileAtIndex(x, y)->m_Hightlight = false;
}
}
for (size_t x { 0 }; x < WORLD_WIDTH; ++x) {
for (size_t y { 0 }; y < WORLD_HEIGHT; ++y) {
m_gridManager.GetTileAtIndex(x, y)->Update(m_pCamera);
if (m_gridManager.GetTileAtIndex(x, y)->GetCollisionRect().Contains(m_mousePos)) { if (m_gridManager.GetTileAtIndex(x, y)->GetCollisionRect().Contains(m_mousePos)) {
selectedTile = m_gridManager.GetTileAtIndex(x, y); m_pSelectedTile = m_gridManager.GetTileAtIndex(x, y);
selectedTile->m_Hightlight = true; //selectedTile->m_Hightlight = true;
} }
} }
} }
if (selectedTile != nullptr) { if (m_pSelectedTile != nullptr) {
if (utils::isMouseDown(SDL_BUTTON_LEFT)) { if (utils::isMouseDown(SDL_BUTTON_LEFT)) {
selectedTile->SetTileType(Tiles::AIR); m_pSelectedTile->SetTileType(Tiles::AIR);
} }
} }
//Get the diogonal tiles of the selected tile //Get the diogonal tiles of the selected tile
if(selectedTile != nullptr) { if(m_pSelectedTile != nullptr) {
std::vector<WorldTile*> surroundingTiles = m_gridManager.GetSurroundingTiles(selectedTile); surroundingTiles surroundingTiles = m_gridManager.GetSurroundingTiles(m_pSelectedTile);
for (WorldTile* tile : surroundingTiles) { TileDirection direction = TileDirection::TopMiddle;
if (tile != nullptr) { std::array<TileDirection, 8> directions = {TileDirection::TopLeft, TileDirection::TopMiddle, TileDirection::TopRight, TileDirection::MiddleLeft, TileDirection::MiddleRight, TileDirection::BottomLeft, TileDirection::BottomMiddle, TileDirection::BottomRight};
tile->m_Hightlight = true;
for(int i = 0; i < 8; i++) {
direction = directions[i];
if(surroundingTiles.GetTile(direction) != nullptr) {
if(surroundingTiles.GetTile(direction)->GetTileType() != Tiles::AIR) {
//surroundingTiles.GetTile(direction)->m_Hightlight = true;
}
} }
} }
} }
@@ -134,6 +144,10 @@ void WorldLevel::Draw() const {
utils::FillEllipse(0, 0, 5, 5); utils::FillEllipse(0, 0, 5, 5);
m_player.Draw(); m_player.Draw();
if(m_pSelectedTile != nullptr) {
m_pSelectedTile->Draw();
}
m_pCamera->EndRendering(); m_pCamera->EndRendering();
utils::FillRect(utils::GetMousePos(), 10, 10); utils::FillRect(utils::GetMousePos(), 10, 10);

8
Game/WorldLevel.h → Game/Levels/World/WorldLevel.h
View File

@@ -1,13 +1,10 @@
#pragma once #pragma once
#include "Collision.h" #include "Collision.h"
#include "Level.h" #include "Levels/Level.h"
#include "Player.h" #include "Player.h"
#include "utils.h"
#include "GridSystem/WorldGridManager.h" #include "GridSystem/WorldGridManager.h"
#include "Gui/Button.h"
#include "Gui/Screen.h"
#include "Gui/Screens/ScreenManager.h" #include "Gui/Screens/ScreenManager.h"
#include "Camera.h"
class WorldLevel : public Level class WorldLevel : public Level
{ {
@@ -39,6 +36,7 @@ private:
ScreenManager* m_screenManager; ScreenManager* m_screenManager;
WorldTile* m_pSelectedTile { nullptr };
// ImGui Vars // ImGui Vars
bool m_ShowTextureManagerWindow { true }; bool m_ShowTextureManagerWindow { true };

5
Game/Player.cpp
View File

@@ -1,11 +1,12 @@
#include "imgui.h" #include "pch.h"
#include "imgui.h"
#include "Player.h" #include "Player.h"
#include <algorithm> #include <algorithm>
#include "colors.h" #include "colors.h"
#include "utils.h" #include "utils.h"
#include "WorldLevel.h" #include "Levels/World/WorldLevel.h"
#include "Animations/Animation.h" #include "Animations/Animation.h"
#include "GridSystem/WorldTile.h" #include "GridSystem/WorldTile.h"