sigonasr2/Faceball2030
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Level complete transition and screen.

Browse Source
This commit is contained in:
sigonasr2 2023-04-14 17:45:25 -05:00
parent e4216d5769
commit c0508d0b70
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Faceball2030/main.cpp
View File

@ -849,6 +849,10 @@ void FaceBall::HandleKeys(float fElapsedTime) {
vec3d zMovement{ 0,0,vForward.z }; vec3d zMovement{ 0,0,vForward.z };
player.UpdatePos(Vector_Add(player.GetPos(), zMovement)); player.UpdatePos(Vector_Add(player.GetPos(), zMovement));
} }
float distanceToExit = std::sqrtf(std::powf(player.GetPos().x - exit.pos.x, 2) + std::powf(player.GetPos().z - exit.pos.z, 2));
if (distanceToExit < player.GetRadius() + exit.radius) {
mode = LEVELCOMPLETE;
}
} }
} }
if (GetKey(S).bHeld) { if (GetKey(S).bHeld) {
@ -990,6 +994,22 @@ bool Bullet::Update(float fElapsedTime) {
return true; return true;
} }
void FaceBall::RenderHud(float fElapsedTime) {
if (!GetKey(olc::D).bHeld && !GetKey(olc::A).bHeld) {
hudOffsetAcc += 20 * fElapsedTime;
while (hudOffsetAcc >= 1) {
hudOffset /= 2;
hudOffsetAcc--;
}
}
SetDecalMode(DecalMode::NORMAL);
DrawDecal({ -32 + hudOffset,-18 }, hud, { 1.05,1.05 });
DrawStringDecal({ 112 + hudOffset,4 }, "Triangles: " + std::to_string(triRenderCount), BLACK, { 2,4 });
std::string hudText = "Tags Left: " + std::to_string(tagsRemaining) + " Lives: " + std::to_string(lives);
DrawStringPropDecal(vf2d{ hudOffset + (float)(ScreenWidth() / 2 - GetTextSizeProp(hudText).x * 3 / 2),(float)(ScreenHeight() - 64 - GetTextSizeProp(hudText).y * 6) }, hudText, WHITE, { 3,6 });
FillRectDecal({ 0,0 }, vf2d{ (float)ScreenWidth(),(float)ScreenHeight() }, { (uint8_t)0,(uint8_t)0,(uint8_t)0,(uint8_t)screenAlpha });
}
void FaceBall::SubtractTag() { void FaceBall::SubtractTag() {
tagsRemaining = std::max(0, tagsRemaining - 1); tagsRemaining = std::max(0, tagsRemaining - 1);
if (!exitWallsCleared&&tagsRemaining <= 0) { if (!exitWallsCleared&&tagsRemaining <= 0) {
@ -1132,22 +1152,21 @@ bool FaceBall::OnUserUpdate(float fElapsedTime)
case GAME: { case GAME: {
HandleKeys(fElapsedTime); HandleKeys(fElapsedTime);
RenderWorld(); RenderWorld();
if (!GetKey(olc::D).bHeld && !GetKey(olc::A).bHeld) { RenderHud(fElapsedTime);
hudOffsetAcc += 20 * fElapsedTime;
while (hudOffsetAcc >= 1) {
hudOffset /= 2;
hudOffsetAcc--;
}
}
SetDecalMode(DecalMode::NORMAL);
DrawDecal({ -32+hudOffset,-18 }, hud, {1.05,1.05});
DrawStringDecal({ 112+hudOffset,4 }, "Triangles: " + std::to_string(triRenderCount), BLACK, { 2,4 });
std::string hudText = "Tags Left: " + std::to_string(tagsRemaining) + " Lives: " + std::to_string(lives);
DrawStringPropDecal(vf2d{ hudOffset+(float)(ScreenWidth() / 2 - GetTextSizeProp(hudText).x * 3 / 2),(float)(ScreenHeight() - 64 - GetTextSizeProp(hudText).y*6) }, hudText, WHITE, {3,6});
}break; }break;
case EDITOR: { case EDITOR: {
editor.Update(fElapsedTime); editor.Update(fElapsedTime);
}break; }break;
case LEVELCOMPLETE: {
RenderWorld();
RenderHud(fElapsedTime);
if (screenAlpha < 255) {
screenAlpha = std::min(255.f,screenAlpha+200 * fElapsedTime);
}
else {
DrawStringDecal({ 16,16 }, "Level " + std::to_string(level) + " complete!", WHITE, { 4,8 });
}
}break;
} }
if (GetKey(olc::F5).bPressed) { if (GetKey(olc::F5).bPressed) {
mode = (GAMEMODE)!(mode&1); mode = (GAMEMODE)!(mode&1);

5
Faceball2030/main.h
View File

@ -9,7 +9,8 @@ const float PI = 3.14159f;
enum GAMEMODE { enum GAMEMODE {
GAME, GAME,
EDITOR EDITOR,
LEVELCOMPLETE
}; };
enum Direction { enum Direction {
@ -243,6 +244,7 @@ class FaceBall : public PixelGameEngine
float moveSpd = 2.0f; float moveSpd = 2.0f;
float hudOffset = 0; float hudOffset = 0;
float hudOffsetAcc = 0; float hudOffsetAcc = 0;
float screenAlpha = 0;
int triRenderCount = 0; int triRenderCount = 0;
@ -277,6 +279,7 @@ class FaceBall : public PixelGameEngine
void LoadLevel(int level); void LoadLevel(int level);
void RenderMesh(mat4x4&matView, std::vector<Triangle>&vecTrianglesToRaster,Object&o); void RenderMesh(mat4x4&matView, std::vector<Triangle>&vecTrianglesToRaster,Object&o);
void RunEnemyAI(Enemy& e,float fElapsedTime); void RunEnemyAI(Enemy& e,float fElapsedTime);
void RenderHud(float fElapsedTime);
public: public:
static bool CheckCollision(vec3d movementVector,vf2d pos,float radius); static bool CheckCollision(vec3d movementVector,vf2d pos,float radius);
static int CheckEnemyCollision(vec3d movementVector, vf2d pos, float radius); static int CheckEnemyCollision(vec3d movementVector, vf2d pos, float radius);