brammie15/prog2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final Commit

Browse Source
This commit is contained in:
Bram Verhulst
2024-06-09 23:32:29 +02:00
parent caabb12838
commit 81746db9ae
36 changed files with 112 additions and 59426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Game/Game.cpp
View File

@@ -85,8 +85,3 @@ void Game::ProcessMouseWheelEvent(const SDL_MouseWheelEvent& e) {
}
m_Camera.SetScale(newScale);
}
void Game::ProcessImGui() {
if(m_ImGui) {
m_pCurrentLevel->ProcessImGui();
}
}

2
Game/Game.h
View File

@@ -27,8 +27,6 @@ public:
void ProcessMouseUpEvent(const SDL_MouseButtonEvent& e) override;
void ProcessMouseWheelEvent(const SDL_MouseWheelEvent& e) override;
void ProcessImGui() override;
static Rectf VIEWPORT;
private:

4
Game/GameManager.cpp
View File

@@ -39,7 +39,7 @@ void GameManager::DecreaseFuel(float fuel) {
void GameManager::AddFuel(float fuel) {
m_Fuel += fuel;
if(m_Fuel > this->GetMaxFuel()) {
m_Fuel = this->GetMaxFuel();
m_Fuel = (float)this->GetMaxFuel();
}
}
void GameManager::SetHullIntegrity(int hullIntegrity) {
@@ -71,7 +71,7 @@ void GameManager::IncreaseMoney(int money) {
}
void GameManager::Update(float elapsedSecs) {
m_pMainScreen->SetFuelMeterValue(this->GetMaxFuel() - m_Fuel);
m_pMainScreen->SetHullMeterValue(m_HullIntegrity);
m_pMainScreen->SetHullMeterValue((float)m_HullIntegrity);
m_pMainScreen->SetScore(std::to_string(m_Score));
m_pMainScreen->SetMoney("$ " + std::to_string(m_Money));

1
Game/Gui/GuiButton.cpp
View File

@@ -17,6 +17,7 @@ void GuiButton::Draw() const {
Rectf src = Rectf(0, 0, m_Texture->GetWidth(), m_Texture->GetHeight());
if (m_IsHovered || !m_shouldHide) {
m_Texture->Draw(dest, src, false);
}
}
void GuiButton::Update(float elapsedSec) {

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

@@ -91,7 +91,7 @@ FuelScreen::FuelScreen(const std::string& filePath, Vector2f pos, Vector2f size,
if (GameManager::GetInstance().GetFuel() < GameManager::GetInstance().GetMaxFuel() - 2) {
int fuelNeeded = static_cast<int>(GameManager::GetInstance().GetMaxFuel() - GameManager::GetInstance().GetFuel());
if (fuelNeeded <= GameManager::GetInstance().GetMoney()) {
GameManager::GetInstance().AddFuel(fuelNeeded);
GameManager::GetInstance().AddFuel((float)fuelNeeded);
GameManager::GetInstance().IncreaseMoney(-fuelNeeded);
m_BuySound->Play(0);
}
@@ -118,13 +118,13 @@ FuelScreen::~FuelScreen() {
void FuelScreen::Draw() const {
int currentFuel = GameManager::GetInstance().GetFuel();
int currentFuel = (int) GameManager::GetInstance().GetFuel();
int maxFuel = GameManager::GetInstance().GetMaxFuel();
utils::SetColor(Color4f { 99.f / 255.f, 82.f / 255.f, 36.f / 255.f, 1.f });
Vector2f fuelBarPos = Vector2f { 275, 135 };
const int MAX_HEIGHT = 210;
Vector2f fuelBarSize = Vector2f { 40, utils::map(currentFuel, 0, maxFuel, 0, MAX_HEIGHT) };
Vector2f fuelBarSize = Vector2f { 40, utils::map(currentFuel, 0.f, maxFuel, 0.f, MAX_HEIGHT) };
utils::FillRect(Rectf { fuelBarPos, fuelBarSize });
Screen::Draw();

2
Game/Levels/Level.cpp
View File

@@ -4,7 +4,7 @@
#include <iostream>
Level::Level() : m_pCamera(nullptr) {
std::cout << "Cannot make level without a camera, Duh 🙄" << std::endl;
std::cout << "Cannot make level without a camera, Duh" << std::endl;
}
Level::Level(Camera* camera) {
m_pCamera = camera;

1
Game/Levels/Level.h
View File

@@ -17,7 +17,6 @@ public:
virtual void Update(float elapsedSec) = 0;
virtual void Draw() const = 0;
virtual void MouseMove(const Vector2f& mousePos) = 0;
virtual void ProcessImGui() = 0;
protected:
Camera* m_pCamera;

2
Game/Levels/MainMenu/MainMenuLevel.cpp
View File

@@ -23,5 +23,3 @@ void MainMenuLevel::Draw() const {
}
void MainMenuLevel::MouseMove(const Vector2f& mousePos) {
}
void MainMenuLevel::ProcessImGui() {
}

1
Game/Levels/MainMenu/MainMenuLevel.h
View File

@@ -12,7 +12,6 @@ public:
void Update(float elapsedSec) override;
void Draw() const override;
void MouseMove(const Vector2f& mousePos) override;
void ProcessImGui() override;
private:
Text* m_TextMotherload;

238
Game/Levels/World/WorldLevel.cpp
View File

@@ -1,5 +1,4 @@
#include <imgui.h>
#include "pch.h"
#include "pch.h"
#include "WorldLevel.h"
#include <algorithm>
@@ -42,9 +41,10 @@ WorldLevel::WorldLevel(Camera* camera, Rectf viewport): Level(camera),
m_GridManager.GetTileAtIndex(0, y)->SetTileType(GroundTileTypeManager::GetInstance()->STONE);
m_GridManager.GetTileAtIndex(WORLD_WIDTH - 1, y)->SetTileType(GroundTileTypeManager::GetInstance()->STONE);
}
Building* fuelBuilding = new Building { "buildings/fuelStation.png", Vector2f { -700, -52 }, Rectf{0 ,0, 50, 50}, TextureManager::GetInstance() };
fuelBuilding->SetOnEnterHitbox([]() {
Building* fuelBuilding = new Building { "buildings/fuelStation.png", Vector2f { -700, -52 }, Rectf { 0, 0, 50, 50 }, TextureManager::GetInstance() };
fuelBuilding->SetOnEnterHitbox([]()
{
ScreenManager::GetInstance()->OpenScreen(ScreenManager::m_FuelScreen);
});
m_Buildings.push_back(fuelBuilding);
@@ -53,31 +53,32 @@ WorldLevel::WorldLevel(Camera* camera, Rectf viewport): Level(camera),
m_GridManager.GetTileAtWorldPos(Vector2f { -650, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { -600, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
Building* mineralBuilding = new Building { "buildings/mineralStation.png", Vector2f { -350, -52 }, Rectf{0 ,0, 100, 100}, TextureManager::GetInstance() };
mineralBuilding->SetOnEnterHitbox([]() {
Building* mineralBuilding = new Building { "buildings/mineralStation.png", Vector2f { -350, -52 }, Rectf { 0, 0, 100, 100 }, TextureManager::GetInstance() };
mineralBuilding->SetOnEnterHitbox([]()
{
ScreenManager::GetInstance()->OpenScreen(ScreenManager::m_SellScreen);
});
m_Buildings.emplace_back(mineralBuilding);
m_GridManager.GetTileAtWorldPos(Vector2f {-400, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_LEFT);
m_GridManager.GetTileAtWorldPos(Vector2f {-350, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {-300, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {-250, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {-200, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {-150, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
m_Buildings.emplace_back(new Building { "buildings/junkStation.png", Vector2f { 250, -52 }, Rectf{0 ,0, 100, 100}, TextureManager::GetInstance() });
m_GridManager.GetTileAtWorldPos(Vector2f {200, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_LEFT);
m_GridManager.GetTileAtWorldPos(Vector2f {250, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {300, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {350, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {400, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {450, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
m_Buildings.emplace_back(new Building { "buildings/repairStation.png", Vector2f { 700, -52 }, Rectf{0 ,0, 100, 100}, TextureManager::GetInstance() });
m_GridManager.GetTileAtWorldPos(Vector2f {650, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_LEFT);
m_GridManager.GetTileAtWorldPos(Vector2f {700, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {750, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f {800, -50})->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
m_GridManager.GetTileAtWorldPos(Vector2f { -400, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_LEFT);
m_GridManager.GetTileAtWorldPos(Vector2f { -350, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { -300, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { -250, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { -200, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { -150, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
m_Buildings.emplace_back(new Building { "buildings/junkStation.png", Vector2f { 250, -52 }, Rectf { 0, 0, 100, 100 }, TextureManager::GetInstance() });
m_GridManager.GetTileAtWorldPos(Vector2f { 200, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_LEFT);
m_GridManager.GetTileAtWorldPos(Vector2f { 250, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { 300, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { 350, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { 400, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { 450, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
m_Buildings.emplace_back(new Building { "buildings/repairStation.png", Vector2f { 700, -52 }, Rectf { 0, 0, 100, 100 }, TextureManager::GetInstance() });
m_GridManager.GetTileAtWorldPos(Vector2f { 650, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_LEFT);
m_GridManager.GetTileAtWorldPos(Vector2f { 700, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { 750, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_MIDDLE);
m_GridManager.GetTileAtWorldPos(Vector2f { 800, -50 })->SetTileType(GroundTileTypeManager::GetInstance()->HARD_RIGHT);
m_TopCover = TextureManager::GetInstance()->GetTexture("topBackground.png");
@@ -85,8 +86,8 @@ WorldLevel::WorldLevel(Camera* camera, Rectf viewport): Level(camera),
m_MainScreen = new MainScreen(TextureManager::GetInstance());
GameManager::GetInstance().SetMainScreen(m_MainScreen);
m_Sun = new OrbitingObject(Vector2f{0, -1000}, 1200, 0.1f, TextureManager::GetInstance()->GetTexture("sun.png"));
m_Moon = new OrbitingObject(Vector2f{0, -1000}, 1200, 0.1f, TextureManager::GetInstance()->GetTexture("moon.png"), M_PI);
m_Sun = new OrbitingObject(Vector2f { 0, -1000 }, 1200, 0.1f, TextureManager::GetInstance()->GetTexture("sun.png"));
m_Moon = new OrbitingObject(Vector2f { 0, -1000 }, 1200, 0.1f, TextureManager::GetInstance()->GetTexture("moon.png"), (float)M_PI);
GameManager::GetInstance().SetFuel(100);
GameManager::GetInstance().SetHullIntegrity(100);
@@ -94,7 +95,7 @@ WorldLevel::WorldLevel(Camera* camera, Rectf viewport): Level(camera),
GameManager::GetInstance().SetPlayer(&m_Player);
m_BackgroundMusic = new SoundStream("sound/bgm.wav");
m_BackgroundMusic->Play(-1);
m_BackgroundMusic->Play(true);
GameManager::GetInstance().SetMoney(100);
@@ -110,9 +111,9 @@ WorldLevel::~WorldLevel() {
for (Building* building : m_Buildings) {
delete building;
}
GameManager::DestroyInstance();
}
void WorldLevel::Update(float elapsedSec) {
@@ -132,7 +133,7 @@ void WorldLevel::Update(float elapsedSec) {
m_Sun->Update(elapsedSec);
m_Moon->Update(elapsedSec);
for (int x { 0 }; x < WORLD_WIDTH; ++x) {
for (int y { 0 }; y < WORLD_HEIGHT; ++y) {
m_GridManager.GetTileAtIndex(x, y)->Update(m_pCamera);
@@ -147,37 +148,35 @@ void WorldLevel::Update(float elapsedSec) {
building->Update(elapsedSec, m_Player.GetCollisionRect().getRectf());
// building.IsPlayerInHitbox(Rectf{m_Player.GetCollisionRect().pos, m_Player.GetCollisionRect().size});
}
if (m_pSelectedTile != nullptr) {
if (utils::isMouseDown(SDL_BUTTON_LEFT)) {
m_pSelectedTile->SetTileType(GroundTileTypeManager::GetInstance()->AIR);
}
}
if(!m_ScreenManager->IsScreenOpen()) {
if (!m_ScreenManager->IsScreenOpen()) {
m_Player.Update(elapsedSec, *this);
}
//Move the camera when the player gets to the edge
//Also lock the camera from going below -800 and above -100
if(m_FollowPlayer) {
Vector2f playerPos = m_Player.GetPosition();
Vector2f newCameraPos = m_pCamera->GetPosition();
if (playerPos.x < newCameraPos.x + 50) {
newCameraPos.x = playerPos.x - 50;
}
if (playerPos.x > newCameraPos.x + m_Viewport.width - 100) {
newCameraPos.x = playerPos.x - m_Viewport.width + 100;
}
if (playerPos.y < newCameraPos.y + 100) {
newCameraPos.y = playerPos.y - 100;
}
if (playerPos.y > newCameraPos.y + m_Viewport.height - 150) {
newCameraPos.y = playerPos.y - m_Viewport.height + 150;
}
newCameraPos.x = utils::clamp(newCameraPos.x, -800, -100);
m_pCamera->SetPosition(newCameraPos);
}
Vector2f playerPos = m_Player.GetPosition();
Vector2f newCameraPos = m_pCamera->GetPosition();
if (playerPos.x < newCameraPos.x + 50) {
newCameraPos.x = playerPos.x - 50;
}
if (playerPos.x > newCameraPos.x + m_Viewport.width - 100) {
newCameraPos.x = playerPos.x - m_Viewport.width + 100;
}
if (playerPos.y < newCameraPos.y + 100) {
newCameraPos.y = playerPos.y - 100;
}
if (playerPos.y > newCameraPos.y + m_Viewport.height - 150) {
newCameraPos.y = playerPos.y - m_Viewport.height + 150;
}
newCameraPos.x = utils::clamp(newCameraPos.x, -800, -100);
m_pCamera->SetPosition(newCameraPos);
Screen* screen = m_ScreenManager->GetCurrentScreen();
if (screen != nullptr) {
@@ -191,7 +190,6 @@ void WorldLevel::Update(float elapsedSec) {
// m_MainScreen->SetHullMeterValue(GameManager::GetInstance().GetHullIntegrity());
m_MainScreen->Update(elapsedSec);
//Vector2f playerPos = m_player.GetPosition();
//Vector2f newCameraPos = playerPos;
@@ -201,14 +199,14 @@ void WorldLevel::Update(float elapsedSec) {
//m_pCamera->SetPosition(Vector2f{playerPos.x - m_viewport.width / 2, playerPos.y - m_viewport.height / 2});
}
void WorldLevel::Draw() const {
m_pCamera->BeginRendering();
m_Sun->Draw();
m_Moon->Draw();
// m_topCover->Draw(Vector2f{-850,-70} );
m_TopCover->Draw(Rectf{-850, -70, 850, -70 + 32}, Rectf{0, 0, WORLD_WIDTH * 50, 32});
m_TopCover->Draw(Rectf { -850, -70, 850, -70 + 32 }, Rectf { 0, 0, WORLD_WIDTH * 50, 32 });
for (Collision::CollisionRect rect : m_Rects) {
// utils::DrawRect(rect.pos, rect.size.x, rect.size.y);
@@ -227,10 +225,10 @@ void WorldLevel::Draw() const {
// utils::FillEllipse(-5, -5, 5, 5);
// if (m_pSelectedTile != nullptr) {
// m_pSelectedTile->Draw();
// m_pSelectedTile->Draw();
// }
for(Building* building : m_Buildings) {
for (Building* building : m_Buildings) {
building->Draw();
}
@@ -257,127 +255,7 @@ void WorldLevel::MouseMove(const Vector2f& mousePos) {
m_MousePos = mousePos;
}
void WorldLevel::ProcessImGui() {
ImGui::Begin("Selected Tile");
std::string tileType = "None";
if (m_pSelectedTile != nullptr) {
switch (m_pSelectedTile->GetTileType()->GetType()) {
case GroundTileTypes::Air:
tileType = "Air";
break;
case GroundTileTypes::Dirt:
tileType = "Dirt";
break;
case GroundTileTypes::Iron:
tileType = "Iron";
break;
case GroundTileTypes::Hard:
tileType = "Hard";
break;
case GroundTileTypes::Stone:
tileType = "Stone";
break;
default:
tileType = "Unknown";
break;
}
}
ImGui::Text("Selected Tile: %s", tileType.c_str());
ImGui::End();
if (ImGui::BeginMainMenuBar()) {
if (ImGui::BeginMenu("Properties")) {
if (ImGui::MenuItem("TextureManager Info")) {
m_ShowTextureManagerWindow = !m_ShowTextureManagerWindow;
}
if (ImGui::MenuItem("Camera Info")) {
m_ShowCameraWindow = !m_ShowCameraWindow;
}
if (ImGui::MenuItem("Player Info")) {
m_ShowPlayerInfo = !m_ShowPlayerInfo;
}
if(ImGui::MenuItem("Game Manager Info")) {
m_ShowGameManagerInfo = !m_ShowGameManagerInfo;
}
ImGui::EndMenu();
}
if (ImGui::BeginMenu("Screens")) {
if (ImGui::MenuItem("Open Fuel screen")) {
ScreenManager::GetInstance()->OpenScreen(ScreenManager::m_FuelScreen);
}
if (ImGui::MenuItem("Open Sell screen")) {
ScreenManager::GetInstance()->OpenScreen(ScreenManager::m_SellScreen);
}
if (ImGui::MenuItem("Close Screen")) {
ScreenManager::GetInstance()->CloseScreen();
}
ImGui::EndMenu();
}
const Vector2f screenPos = utils::GetMousePos();
const std::string mousePos = "Mouse Pos: (" + std::to_string(screenPos.x) + ", " + std::to_string(screenPos.y) + ")";
if (ImGui::BeginMenu(mousePos.c_str())) {
ImGui::EndMenu();
}
if (ImGui::BeginMenu(std::to_string(m_Fps).c_str())) {
ImGui::EndMenu();
}
ImGui::EndMainMenuBar();
}
if (m_ShowTextureManagerWindow) {
ImGui::Begin("Texture Manager", &m_ShowTextureManagerWindow, ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text("Texture loading Count:");
ImGui::SameLine();
ImGui::TextColored(ImVec4(1.0f, 0.0f, 1.0f, 1.0f), std::to_string(Texture::m_TextureCounter).c_str());
ImGui::End();
}
if (m_ShowCameraWindow) {
ImGui::Begin("Camera", &m_ShowCameraWindow, ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text("Camera Position: (%f, %f)", m_pCamera->GetPosition().x, m_pCamera->GetPosition().y);
ImGui::Text("Camera Scale: %f", m_pCamera->GetScale());
ImGui::Text("Is Right Mouse Down: %s", utils::isMouseDown(0) ? "true" : "false");
if (ImGui::Button("Reset Camera")) {
m_pCamera->SetPosition(Vector2f { -m_Viewport.width / 2, -m_Viewport.height / 2 });
m_pCamera->SetScale(1.0f);
}
ImGui::Checkbox("Follow Player", &m_FollowPlayer);
ImGui::End();
}
if (m_ShowPlayerInfo) {
ImGui::Begin("Player Info", &m_ShowPlayerInfo, ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text("Player Position: (%f, %f)", m_Player.GetPosition().x, m_Player.GetPosition().y);
ImGui::Text("Player Velocity: (%f, %f)", m_Player.GetVelocity().x, m_Player.GetVelocity().y);
ImGui::End();
m_Player.ProcessImGui();
}
if(m_ShowGameManagerInfo) {
ImGui::Begin("Game Manager", &m_ShowGameManagerInfo, ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text("Fuel: %f", GameManager::GetInstance().GetFuel());
ImGui::Text("Hull Integrity: %d", GameManager::GetInstance().GetHullIntegrity());
ImGui::Text("Score: %d", GameManager::GetInstance().GetScore());
ImGui::Text("Money: %d", GameManager::GetInstance().GetMoney());
ImGui::Separator();
if(ImGui::Button("Add 1$")) {
GameManager::GetInstance().IncreaseMoney(1);
}
if(ImGui::Button("Add 10$")) {
GameManager::GetInstance().IncreaseMoney(10);
}
ImGui::SameLine();
if(ImGui::Button("Add 100$")) {
GameManager::GetInstance().IncreaseMoney(100);
}
ImGui::End();
}
}
WorldGridManager& WorldLevel::GetGridManager() {
return m_GridManager;
}

11
Game/Levels/World/WorldLevel.h
View File

@@ -31,7 +31,6 @@ public:
void Draw() const override;
void MouseMove(const Vector2f& mousePos) override;
void ProcessImGui() override;
WorldGridManager& GetGridManager();
@@ -62,13 +61,5 @@ private:
OrbitingObject* m_Moon{ nullptr };
Texture* m_TopCover{ nullptr };
// ImGui Vars
bool m_ShowTextureManagerWindow { false };
bool m_ShowCameraWindow { false };
bool m_ShowPlayerInfo { true };
bool m_ShowGameManagerInfo{ true };
bool m_FollowPlayer { true };
};

57
Game/Player.cpp
View File

@@ -1,5 +1,4 @@
#include "pch.h"
#include "imgui.h"
#include "Player.h"
#include <algorithm>
@@ -137,62 +136,6 @@ void Player::Die() {
m_CurrentAnimation = m_DieStartAnimation;
m_HasPlayedDeathAnimation = false;
}
void Player::ProcessImGui() {
ImGui::Begin("Collision Info", nullptr, ImGuiWindowFlags_AlwaysAutoResize);
ImGui::Text("is Grounded: %s", m_Grounded ? "true" : "false");
ImGui::Checkbox("Draw Collision Rect", &m_DrawCollisionRect);
std::string currentState { "No idea" };
switch (m_State) {
case PlayerState::Idle:
currentState = "Idle";
break;
case PlayerState::Digging:
currentState = "Digging";
break;
case PlayerState::Walking:
currentState = "Walking";
break;
case PlayerState::Flying:
currentState = "Flying";
break;
}
ImGui::Text("Player State %s", currentState.c_str());
ImGui::Text("Is digging Primed: %s", m_IsDiggingPrimed ? "true" : "false");
ImGui::Text("Bob counter: %f", m_BobTimer);
ImGui::Text("Bob up: %s", m_BobUp ? "true" : "false");
ImGui::Text("Is Grounded: %s", m_Grounded ? "true" : "false");
std::string direction {};
switch (m_Direction) {
case PlayerDirection::Down:
direction = "Down";
break;
case PlayerDirection::Left:
direction = "Left";
break;
case PlayerDirection::Right:
direction = "Right";
break;
case PlayerDirection::Up:
direction = "Up";
break;
}
ImGui::Text("Direction: %s", direction.c_str());
//ContactMap
ImGui::Text("ContactMap:");
ImGui::Text("Top: %s", m_ContactMap[Collision::CollisionDirection::Top] != nullptr ? "true" : "false");
ImGui::Text("Bottom: %s", m_ContactMap[Collision::CollisionDirection::Bottom] != nullptr ? "true" : "false");
ImGui::Text("Left: %s", m_ContactMap[Collision::CollisionDirection::Left] != nullptr ? "true" : "false");
ImGui::Text("Right: %s", m_ContactMap[Collision::CollisionDirection::Right] != nullptr ? "true" : "false");
ImGui::Separator();
ImGui::Text("Values");
ImGui::Text("Current Fuel: %f", GameManager::GetInstance().GetFuel());
ImGui::Text("Current Score: %d", GameManager::GetInstance().GetScore());
ImGui::Text("Current Hull Integrity: %d", GameManager::GetInstance().GetHullIntegrity());
ImGui::End();
}
void Player::Dig(Collision::CollisionDirection dir, WorldLevel& level) {
m_State = PlayerState::Digging;
m_DigProgress = 0;

1
Game/Player.h
View File

@@ -70,7 +70,6 @@ public:
void Die();
void ProcessImGui();
private:
void Dig(Collision::CollisionDirection dir, WorldLevel& level);