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

Deux Ex Machina

Browse Source
This commit is contained in:
Bram Verhulst
2024-06-09 23:23:55 +02:00
parent 5f1dcd5788
commit caabb12838
17 changed files with 151 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Game/Player.cpp
View File

@@ -84,6 +84,10 @@ Player::~Player() {
for (Particle* particle : m_DigParticles) {
delete particle;
}
for (Particle* particle : m_SmokeParticles) {
delete particle;
}
}
Collision::CollisionRect Player::GetCollisionRect() const {
@@ -112,12 +116,10 @@ void Player::Draw() const {
{
utils::SetColor(Colors::WHITE);
m_CurrentAnimation->Draw(Vector2f { 0, 0 }, Rectf { 0, 0, frameWidth, frameWidth });
utils::SetColor(Colors::GREEN);
}
glPopMatrix();
utils::FillEllipse(m_OutletPos + m_Position, 5, 5);
for (Particle* particle : m_DigParticles) {
utils::SetColor(Colors::WHITE);
particle->Draw();
@@ -271,8 +273,8 @@ void Player::Update(float elapsedTime, WorldLevel& level) {
m_SmokeTimer += elapsedTime;
if (m_SmokeTimer >= m_SmokeTime) {
m_SmokeTimer = 0.0f;
Vector2f Dir { static_cast<float>(m_Direction == PlayerDirection::Left ? 30 : -30), 20 };
Particle* NewSmokeParticle = new Particle(m_OutletPos + m_Position, Dir, Vector2f { 0.0f, 9.81f * 30}, 5.f, TextureManager::GetInstance()->GetTexture("particles/smoke.png"));
Vector2f Dir { static_cast<float>(m_Direction == PlayerDirection::Left ? 60 : -60), 20 };
Particle* NewSmokeParticle = new Particle(m_OutletPos + m_Position, Dir, Vector2f { 0.0f, 9.81f * 5}, 1.f, TextureManager::GetInstance()->GetTexture("particles/smoke.png"));
NewSmokeParticle->SetFlipped(m_Direction == PlayerDirection::Left);
m_SmokeParticles.push_back(NewSmokeParticle);
}