brammie15/dae16-VerhulstBram-GameProject
1
0
Fork 0
mirror of https://github.com/HowestDAE/dae16-VerhulstBram.git synced 2025-12-16 12:21:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added basic player / collisions in player

Browse Source
This commit is contained in:
Bram Verhulst
2024-03-18 15:05:11 +01:00
parent 39c744ba79
commit 964a1a42f6
8 changed files with 119 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Engine/Collision.cpp
View File

@@ -1,6 +1,7 @@
#include "Collision.h" #include "Collision.h"
#include "utils.h" #include "utils.h"
#include "../Game/Player.h"
namespace Collision namespace Collision
{ {
@@ -120,4 +121,14 @@ namespace Collision
} }
return false; return false;
} }
bool ResolvePlayerVsRect(Player& player, float ElapsedTime, Collision::CollisionRect* staticRectangle) {
CollisionRect rect = player.GetCollisionRect();
Collision::ResolveDynamicRectVsRect(rect, ElapsedTime, staticRectangle);
// std::map<CollisionDirection, TileCollisionRect*> test = rect.ContactMap;
// player.SetContactMap(test);
player.SetPosition(rect.pos);
player.SetVelocity(rect.vel);
return true;
}
} }

9
Engine/Collision.h
View File

@@ -6,6 +6,7 @@
#include "structs.h" #include "structs.h"
#include "utils.h" #include "utils.h"
class Player;
class WorldTile; class WorldTile;
namespace Collision namespace Collision
@@ -20,12 +21,14 @@ namespace Collision
struct CollisionRect struct CollisionRect
{ {
CollisionRect() = default;
CollisionRect(const Point2f& pos, const Point2f& size) : pos(pos), size(size) {}
CollisionRect(const Point2f& pos, const Point2f& size, const Point2f& vel) : pos(pos), size(size), vel(vel) {}
Point2f pos; Point2f pos;
Point2f size; Point2f size;
Point2f vel; Point2f vel;
std::map<CollisionDirection, CollisionRect*> ContactMap; std::map<CollisionDirection, CollisionRect*> ContactMap{};
}; };
struct TileCollisionRect struct TileCollisionRect
@@ -55,4 +58,6 @@ namespace Collision
bool DynamicRectVsRect(const CollisionRect& dynamicRectangle, float ElapsedTime, const CollisionRect& staticRectangle, Point2f& contactPoint, Point2f& contactNormal, float& contactTime); bool DynamicRectVsRect(const CollisionRect& dynamicRectangle, float ElapsedTime, const CollisionRect& staticRectangle, Point2f& contactPoint, Point2f& contactNormal, float& contactTime);
bool ResolveDynamicRectVsRect(CollisionRect& dynamicRectangle, float ElapsedTime, CollisionRect* staticRectangle); bool ResolveDynamicRectVsRect(CollisionRect& dynamicRectangle, float ElapsedTime, CollisionRect* staticRectangle);
bool ResolvePlayerVsRect(Player& player, float ElapsedTime, Collision::CollisionRect* staticRectangle);
} }

2
Game/Game.cpp
View File

@@ -111,4 +111,6 @@ void Game::ProcessImGui() {
ImGui::SameLine(); ImGui::SameLine();
ImGui::TextColored(ImVec4(1.0f, 0.0f, 1.0f, 1.0f), std::to_string(Texture::m_TextureCounter).c_str()); ImGui::TextColored(ImVec4(1.0f, 0.0f, 1.0f, 1.0f), std::to_string(Texture::m_TextureCounter).c_str());
ImGui::End(); ImGui::End();
m_WorldLevel.ProcessImGui();
} }

1
Game/Level.h
View File

@@ -11,6 +11,7 @@ public:
virtual void Update(float elapsedSec) = 0; virtual void Update(float elapsedSec) = 0;
virtual void Draw() const = 0; virtual void Draw() const = 0;
virtual void MouseMove(const Point2f& mousePos) = 0; virtual void MouseMove(const Point2f& mousePos) = 0;
virtual void ProcessImGui() = 0;
private: private:

38
Game/Player.cpp
View File

@@ -1,19 +1,25 @@
#include "pch.h" #include "pch.h"
#include "Player.h" #include "Player.h"
#include <algorithm>
#include "colors.h" #include "colors.h"
#include "utils.h" #include "utils.h"
#include "WorldLevel.h" #include "WorldLevel.h"
Player::Player(const Point2f& Position) : m_Position(Position), m_Size(Point2f{50, 20}) Player::Player(const Point2f& Position) : m_Position(Position), m_Size(Point2f{50, 20})
{} {}
Collision::CollisionRect Player::GetCollisionRect() {
Collision::CollisionRect rect = {m_Position, m_Size, m_Vel};
return rect;
}
void Player::Draw() const { void Player::Draw() const {
utils::SetColor(Colors::RED); utils::SetColor(Colors::RED);
utils::DrawRect(Rectf{m_Position.x, m_Position.y, m_Size.x, m_Size.y}); utils::DrawRect(Rectf{m_Position.x, m_Position.y, m_Size.x, m_Size.y});
} }
void Player::Update(float elapsedTime, const WorldLevel& level) { void Player::Update(float elapsedTime, WorldLevel& level) {
// m_Acc.y += m_Gravity.y; // m_Acc.y += m_Gravity.y;
// m_Vel.y = std::min(m_Vel.y, m_MaxSpeed); // m_Vel.y = std::min(m_Vel.y, m_MaxSpeed);
// //
@@ -35,23 +41,25 @@ void Player::Update(float elapsedTime, const WorldLevel& level) {
m_Vel.x = 100; m_Vel.x = 100;
} }
Point2f nextPos = m_Position + m_Vel * elapsedTime; float t = 0, min_t = INFINITY;
bool isColliding = false; Point2f intersectionPoint, normal;
auto tiles = level.GetAllTiles(); std::vector<std::pair<int, float>> contactTimes{};
for (int x{0}; x < WorldLevel::WORLD_WIDTH; ++x) {
for (int y{0}; y < WorldLevel::WORLD_HEIGHT; ++y) { for (size_t i { 0 }; i < level.m_Rects.size(); ++i) {
WorldTile* tile = tiles[x][y]; if(Collision::DynamicRectVsRect(this->GetCollisionRect(), elapsedTime, level.m_Rects[i], intersectionPoint, normal, t)) {
if (tile->GetTileType() == GroundTileTypes::Dirt) { contactTimes.push_back(std::pair<int, float>{i, t});
Rectf tileRect = Rectf{tile->GetPosition().x, tile->GetPosition().y, WorldLevel::TILE_WIDTH, WorldLevel::TILE_HEIGHT};
if (utils::IsOverlapping(nextPos, m_Size, tileRect)) {
isColliding = true;
}
}
} }
} }
if(!isColliding) { std::sort(contactTimes.begin(), contactTimes.end(), [](const std::pair<int, float>& a, const std::pair<int, float>& b) {
m_Position = nextPos; return a.second < b.second;
});
for (std::pair<int, float> contact_time : contactTimes) {
Collision::ResolvePlayerVsRect(*this, elapsedTime, &level.m_Rects[contact_time.first]);
} }
m_Position = m_Position + m_Vel * elapsedTime;
} }

15
Game/Player.h
View File

@@ -1,4 +1,5 @@
#pragma once #pragma once
#include "Collision.h"
class WorldLevel; class WorldLevel;
class Player class Player
@@ -6,15 +7,27 @@ class Player
public: public:
Player(const Point2f& Position); Player(const Point2f& Position);
void Update(float elapsedTime, const WorldLevel& level); Collision::CollisionRect GetCollisionRect();
void Update(float elapsedTime, WorldLevel& level);
void Draw() const; void Draw() const;
void SetPosition(Point2f pos) { m_Position = pos; }
Point2f GetPosition() const { return m_Position; }
void SetVelocity(Point2f vel) { m_Vel = vel; }
Point2f GetVelocity() const { return m_Vel; }
auto GetContactMap(){ return m_ContactMap; }
void SetContactMap(Collision::CollisionDirection dir, WorldTile* tile) { m_ContactMap[dir] = tile; }
private: private:
Point2f m_Position{}; Point2f m_Position{};
Point2f m_Size{}; Point2f m_Size{};
Point2f m_Vel{}; Point2f m_Vel{};
std::map<Collision::CollisionDirection, WorldTile*> m_ContactMap{};
Point2f m_Acc{}; Point2f m_Acc{};
Point2f m_Gravity{ 0, -9.81f }; Point2f m_Gravity{ 0, -9.81f };
float m_MaxSpeed{ 200 }; float m_MaxSpeed{ 200 };

119
Game/WorldLevel.cpp
View File

@@ -1,4 +1,5 @@
#include "pch.h" #include <imgui.h>
#include "pch.h"
#include "WorldLevel.h" #include "WorldLevel.h"
#include <algorithm> #include <algorithm>
@@ -89,47 +90,49 @@ void WorldLevel::Update(float elapsedSec) {
std::vector<std::pair<int, float>> contactTimes{}; std::vector<std::pair<int, float>> contactTimes{};
for (size_t i { 1 }; i < m_Rects.size(); ++i) { m_player.Update(elapsedSec, *this);
if(Collision::DynamicRectVsRect(m_Rects[0], elapsedSec, m_Rects[i], intersectionPoint, normal, t)) {
contactTimes.push_back(std::pair<int, float>{i, t});
}
}
std::sort(contactTimes.begin(), contactTimes.end(), [](const std::pair<int, float>& a, const std::pair<int, float>& b) { // for (size_t i { 1 }; i < m_Rects.size(); ++i) {
return a.second < b.second; // if(Collision::DynamicRectVsRect(m_Rects[0], elapsedSec, m_Rects[i], intersectionPoint, normal, t)) {
}); // contactTimes.push_back(std::pair<int, float>{i, t});
// }
// }
//
// std::sort(contactTimes.begin(), contactTimes.end(), [](const std::pair<int, float>& a, const std::pair<int, float>& b) {
// return a.second < b.second;
// });
//
// for (std::pair<int, float> contact_time : contactTimes) {
// Collision::ResolveDynamicRectVsRect(m_Rects[0], elapsedSec, &m_Rects[contact_time.first]);
// }
for (std::pair<int, float> contact_time : contactTimes) { //contactTimes.clear();
Collision::ResolveDynamicRectVsRect(m_Rects[0], elapsedSec, &m_Rects[contact_time.first]);
}
contactTimes.clear(); // //loop over the worldTiles
// for (int x {0} ; x < WORLD_WIDTH; ++x) {
//loop over the worldTiles // for (int y {0}; y < WORLD_HEIGHT; ++y) {
for (int x {0} ; x < WORLD_WIDTH; ++x) { // if(m_worldTiles[x][y]->GetTileType() == GroundTileTypes::Dirt) {
for (int y {0}; y < WORLD_HEIGHT; ++y) { // if(Collision::DynamicRectVsRect(m_Rects[0], elapsedSec, m_worldTiles[x][y]->GetCollisionRect().getCollisionRect(), intersectionPoint, normal, t)) {
if(m_worldTiles[x][y]->GetTileType() == GroundTileTypes::Dirt) { // contactTimes.push_back(std::pair<int, float>{x + y * WORLD_WIDTH, t});
if(Collision::DynamicRectVsRect(m_Rects[0], elapsedSec, m_worldTiles[x][y]->GetCollisionRect().getCollisionRect(), intersectionPoint, normal, t)) { // }
contactTimes.push_back(std::pair<int, float>{x + y * WORLD_WIDTH, t}); // }
} // }
} // }
} //
} // std::sort(contactTimes.begin(), contactTimes.end(), [](const std::pair<int, float>& a, const std::pair<int, float>& b) {
// return a.second < b.second;
std::sort(contactTimes.begin(), contactTimes.end(), [](const std::pair<int, float>& a, const std::pair<int, float>& b) { // });
return a.second < b.second; //
}); // for (std::pair<int, float> contact_time : contactTimes) {
// WorldTile* tile = m_worldTiles[contact_time.first % WORLD_WIDTH][contact_time.first / WORLD_WIDTH];
for (std::pair<int, float> contact_time : contactTimes) { // Collision::CollisionRect rect = tile->GetCollisionRect().getCollisionRect();
WorldTile* tile = m_worldTiles[contact_time.first % WORLD_WIDTH][contact_time.first / WORLD_WIDTH]; // Collision::ResolveDynamicRectVsRect(m_Rects[0], elapsedSec, &rect);
Collision::CollisionRect rect = tile->GetCollisionRect().getCollisionRect(); // //delete tile;
Collision::ResolveDynamicRectVsRect(m_Rects[0], elapsedSec, &rect); // //WorldTile* tileRect = tile->GetCollisionRect().tile;
//delete tile; // //tileRect->SetTileType(GroundTileTypes::Air);
//WorldTile* tileRect = tile->GetCollisionRect().tile; // }
//tileRect->SetTileType(GroundTileTypes::Air); //
} // m_Rects[0].pos = m_Rects[0].pos + m_Rects[0].vel * elapsedSec;
m_Rects[0].pos = m_Rects[0].pos + m_Rects[0].vel * elapsedSec;
} }
void WorldLevel::Draw() const { void WorldLevel::Draw() const {
@@ -139,11 +142,6 @@ void WorldLevel::Draw() const {
utils::DrawRect(rect.pos, rect.size.x, rect.size.y); utils::DrawRect(rect.pos, rect.size.x, rect.size.y);
} }
//Rectf expanded = Rectf{ m_Rects[1].bottomLeft.x - m_Rects[0].width / 2, m_Rects[1].bottomLeft.y - m_Rects[0].height / 2, m_Rects[1].width + m_Rects[0].width, m_Rects[1].height + m_Rects[0].height };
//utils::SetColor(Colors::RED);
//utils::DrawRect(expanded);
Point2f RayPoint = Point2f{m_pCamera->Viewport.width, m_pCamera->Viewport.height}; Point2f RayPoint = Point2f{m_pCamera->Viewport.width, m_pCamera->Viewport.height};
Point2f RayDir = Point2f{m_mousePos.x - RayPoint.x, m_mousePos.y - RayPoint.y}; Point2f RayDir = Point2f{m_mousePos.x - RayPoint.x, m_mousePos.y - RayPoint.y};
@@ -152,18 +150,6 @@ void WorldLevel::Draw() const {
utils::FillEllipse(m_mousePos, 20, 20); utils::FillEllipse(m_mousePos, 20, 20);
// Point2f intersectionPoint, normal;
// float contactTime;
// Rectf testRect = Rectf{m_Rects[1].bottomLeft.x, m_Rects[1].bottomLeft.y, m_Rects[1].width, m_Rects[1].height};
// if(utils::RayVsRect(RayPoint, RayDir, testRect, intersectionPoint, normal, contactTime) && contactTime > 0.0f && contactTime < 1.0f) {
// utils::SetColor(Colors::GREEN);
// utils::FillEllipse(intersectionPoint, 5, 5);
// utils::DrawLine(intersectionPoint, Point2f{intersectionPoint.x + normal.x * 50, intersectionPoint.y + normal.y * 50});
// }
//
// utils::SetColor(Colors::YELLOW);
// utils::FillEllipse(m_mousePos,2,2);
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_worldTiles[x][y]->Draw(); m_worldTiles[x][y]->Draw();
@@ -199,16 +185,25 @@ void WorldLevel::Draw() const {
utils::SetColor(Colors::MAGENTA); utils::SetColor(Colors::MAGENTA);
utils::FillEllipse(0, 0, 5, 5); utils::FillEllipse(0, 0, 5, 5);
//m_player.Draw(); m_player.Draw();
m_pCamera->EndRendering(); m_pCamera->EndRendering();
//utils::SetColor(Colors::WHITE);
//m_pTextTexture->Draw(Point2f{ 0, 0 });
} }
void WorldLevel::MouseMove(const Point2f& mousePos) { void WorldLevel::MouseMove(const Point2f& mousePos) {
m_mousePos = mousePos; m_mousePos = mousePos;
} }
void WorldLevel::ProcessImGui() {
ImGui::Begin("Player Info", nullptr, 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);
//PLAYER COLLISIONS
ImGui::Text("Player Collisions:");
// for (std::pair<Collision::CollisionDirection, Collision::CollisionRect*> contact : m_player.GetContactMap()) {
// ImGui::Text("Direction: %d", contact.first);
// ImGui::Text("Position: (%f, %f)", contact.second->pos.x, contact.second->pos.y);
// ImGui::Text("Size: (%f, %f)", contact.second->size.x, contact.second->size.y);
// }
ImGui::End();
}
WorldTile* WorldLevel::GetTileAt(const Point2f& pos) const { WorldTile* WorldLevel::GetTileAt(const Point2f& pos) const {
return nullptr; return nullptr;
} }
@@ -218,3 +213,5 @@ std::array<std::array<WorldTile*, WorldLevel::WORLD_WIDTH>, WorldLevel::WORLD_HE
return m_worldTiles; return m_worldTiles;
} }

1
Game/WorldLevel.h
View File

@@ -25,6 +25,7 @@ public:
void Draw() const override; void Draw() const override;
void MouseMove(const Point2f& mousePos) override; void MouseMove(const Point2f& mousePos) override;
void ProcessImGui() override;
WorldTile* GetTileAt(const Point2f& pos) const; WorldTile* GetTileAt(const Point2f& pos) const;
void SetTileAt(const Point2f& pos, WorldTile* tile); void SetTileAt(const Point2f& pos, WorldTile* tile);