kapitan/2dkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Zad3] Remove comments, add more text

Browse Source
This commit is contained in:
Michał Leśniak 2022-01-03 12:44:24 +01:00
parent faa6e109f6
commit 1482d95397
6 changed files with 25 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
2dgk_zad3/2dgk_zad3/2dgk_zad3.vcxproj
View File

@ -218,12 +218,6 @@
<Text Include="assets\levels\level1.txt"> <Text Include="assets\levels\level1.txt">
<DeploymentContent>true</DeploymentContent> <DeploymentContent>true</DeploymentContent>
</Text> </Text>
<Text Include="assets\levels\level2.txt">
<DeploymentContent>true</DeploymentContent>
</Text>
<Text Include="assets\levels\level3.txt">
<DeploymentContent>true</DeploymentContent>
</Text>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Font Include="assets\fonts\Roboto-Thin.ttf"> <Font Include="assets\fonts\Roboto-Thin.ttf">

2
2dgk_zad3/2dgk_zad3/2dgk_zad3.vcxproj.filters
View File

@ -179,7 +179,5 @@
<ItemGroup> <ItemGroup>
<Text Include="assets\fonts\LICENSE.txt" /> <Text Include="assets\fonts\LICENSE.txt" />
<Text Include="assets\levels\level1.txt" /> <Text Include="assets\levels\level1.txt" />
<Text Include="assets\levels\level2.txt" />
<Text Include="assets\levels\level3.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

37
2dgk_zad3/2dgk_zad3/KGame.cpp
View File

@ -254,7 +254,6 @@ namespace KapitanGame {
if (Input.IsKeyboardButtonHeld(SDL_SCANCODE_F3)) if (Input.IsKeyboardButtonHeld(SDL_SCANCODE_F3))
{ {
Settings.MaxJumpHeight -= 0.1f; Settings.MaxJumpHeight -= 0.1f;
//Settings.SetMaxJumpHeight(Settings.GetMaxJumpHeight() - 0.1f);
SettingsTextTextureDirty = true; SettingsTextTextureDirty = true;
} }
if (Input.IsKeyboardButtonHeld(SDL_SCANCODE_F4)) if (Input.IsKeyboardButtonHeld(SDL_SCANCODE_F4))
@ -300,19 +299,25 @@ namespace KapitanGame {
camera.Update(Pawns, Map); camera.Update(Pawns, Map);
} }
//if (SettingsTextTextureDirty) { Textures.insert_or_assign("Text_Settings", Fonts["PressStart2P-Regular"].GetTextTexture(
Textures.insert_or_assign("Text_Settings", Fonts["PressStart2P-Regular"].GetTextTexture( Utils::StringFormat(
Utils::StringFormat( "Developer Mode (F1): %d\n"
"Max Jump Height: %f\nHorizontal Distance to Max Jump Height: %f\nInitial Jump Velocity: %f\nGravity: %f\nPlayer Position X: %f\nPlayer Position Y: %f", "Collision Enabled (F2): %s\n"
static_cast<float>(Settings.MaxJumpHeight), "Max Jump Height (F3/F4): %f\n"
static_cast<float>(Settings.HorizontalDistanceToMaxJumpHeight), "Horizontal Distance to Max Jump Height (F5/F6): %f\n"
static_cast<float>(Settings.JumpInitialVelocity), "Initial Jump Velocity: %f\n"
static_cast<float>(Settings.Gravity), "Gravity: %f\n"
Pawns.back()->GetPosition().X, "Player Position X: %f\n"
Pawns.back()->GetPosition().Y), {0, 0, 0, 0xFF}, "Player Position Y: %f",
Renderer)); static_cast<int>(devMode),
//SettingsTextTextureDirty = false; Settings.CollisionEnabled ? "True" : "False",
//} static_cast<float>(Settings.MaxJumpHeight),
static_cast<float>(Settings.HorizontalDistanceToMaxJumpHeight),
static_cast<float>(Settings.JumpInitialVelocity),
static_cast<float>(Settings.Gravity),
Pawns.back()->GetPosition().X,
Pawns.back()->GetPosition().Y), { 0, 0, 0, 0xFF },
Renderer));
if (!Playing) if (!Playing)
@ -348,10 +353,6 @@ namespace KapitanGame {
} }
if (devMode >= 2) if (devMode >= 2)
{ {
SDL_SetRenderDrawColor(Renderer, 0x00, 0x00, 0x00, 0xFF);
SDL_RenderDrawLineF(Renderer, 0, Constants::SCREEN_HEIGHT / 2.f, Constants::SCREEN_WIDTH, Constants::SCREEN_HEIGHT / 2.f);
SDL_RenderDrawLineF(Renderer, Constants::SCREEN_WIDTH / 2.f, 0, Constants::SCREEN_WIDTH / 2.f, Constants::SCREEN_HEIGHT);
SDL_SetRenderDrawColor(Renderer, 0x00, 0xFF, 0x00, 0xFF);
SDL_RenderDrawPointF(Renderer, camera.GetFocusPoint().X * debugCamera.GetScale(), camera.GetFocusPoint().Y * debugCamera.GetScale()); SDL_RenderDrawPointF(Renderer, camera.GetFocusPoint().X * debugCamera.GetScale(), camera.GetFocusPoint().Y * debugCamera.GetScale());
SDL_SetRenderDrawColor(Renderer, 0xFF, 0x00, 0x00, 0xFF); SDL_SetRenderDrawColor(Renderer, 0xFF, 0x00, 0x00, 0xFF);

12
2dgk_zad3/2dgk_zad3/assets/levels/level1.txt
View File

@ -7,9 +7,9 @@
# ##### ## # ##### ## ##
## ## ## ## ##
## ## ## ## ## ## ##
P ## ## ## P ## ## ## ##
################################################################## ############################################################################
################################################################## ############################################################################

37
2dgk_zad3/2dgk_zad3/assets/levels/level2.txt
View File

@ -1,37 +0,0 @@
#####################################
# # # # # # #
# ### ### # # # ######### # ##### # #
# # # # # # # # # #
### # ### # ####### # # ##### # ### #
# # # # # # # # #
### ########### # ### # # # # ### ###
# # # # # # # # # # # #
# # ### ### # ### ### # ######### # #
# # # # # # # # #
# # ### # # ### # # # ### ######### #
# # # # # # # # # # # # # #
# ##### # # # # ####### ### ##### # #
# # # # # # # #
# ##### # # # ##### ####### ### # ###
# # # # # # # # # #
####### ### ### # # # # ### ####### #
# # # # # # # # # # # #
# ##### # # ##### ### # ### # # ### #
# # # # # # # # # # # # # #
# # # ### ### ### ### # ### ##### ###
# # # # # # # # #
# ####### ##### # ### ####### #######
# # # # # # #
# # ### ##### ############# ### #####
# # # # # # # # # #
### # # ######### # # # # # # # ### #
# # # # # # # # # #
# ##### ### ### # # ### # ### ##### #
# # # # # # # # # # # #
# # ### ### # # # # ##### # # # # # #
# # # # # # # # # # # # # #
# ####### ### ######### ######### # #
# # # # # # # # # # #
# # ######### # # # ##### # # # # # #
# # # # #
#####################################

41
2dgk_zad3/2dgk_zad3/assets/levels/level3.txt
View File

@ -1,41 +0,0 @@
#########################################
# # # # # # # #
# # ### # # ####### ### ####### ####### #
# # # # # # # # # # #
# # # # # ##### ####### # ### # ### #####
# # # # # # # # # #
# # ### # ##### ##### ### ### # ##### # #
# # # # # # # # # #
### ######### ##### ####### ### ##### # #
# # # # # # # # # # #
# ### # ### ### ##### # # ### ### # ### #
# # # # # # # # # # # #
### ### ####### # # # ####### # # # # # #
# # # # # # # # # # # # # # #
# ### # # ### ### # ### # # ### ##### ###
# # # # # # # # # # # #
# # # ### ##### ##### # ##### # # ### ###
# # # # # # # #
# ####### ### ### # # ######### # #######
# # # # # # # #
# ### ##### ### # ########### ######### #
# # # # # # # # # # # #
# ##### # # ### ### ### ### # # # # ### #
# # # # # # # # # # # # #
# # ### # ### # ### # ##### ##### # # ###
# # # # # # # # # # # #
# ##### ####### ####### ### ##### # # # #
# # # # # # # # # # # # #
### ### ### ### # # ### ##### ####### # #
# # # # # # # # #
### ##### ##### ### ##### # ### ### # # #
# # # # # # # # # # #
# ##### # ### ##### # # # ### ### ### # #
# # # # # # # # # # # #
##### # ### ##### ### # # # ### # # # ###
# # # # # # # # # # #
# ##### ####### ####### # ##### ### # ###
# # # # # # # # # # #
# # # # ### ### # ### # ##### ### # # # #
# # # # # # # # # # # #
#########################################