SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Showing only changes of commit 5696e20452 - Show all commits

View File

@@ -1290,16 +1290,16 @@ void Engine::Render(float elapsedTime) {
//if (m_whoosh[x]) //if (m_whoosh[x])
// m_whoosh[x]->drop(); // m_whoosh[x]->drop();
//m_bullets[x] = nullptr; //m_bullets[x] = nullptr;
m_whoosh[x] = nullptr; //m_whoosh[x] = nullptr;
break; break;
} }
// else if (!m_whoosh[x]) { // else if (!m_whoosh[x]) {
// m_whoosh[x] = m_audio.Create3DAudioObj(m_whoosh[x], AUDIO_PATH "noise.wav", m_bullets[x]->getPos(), m_bullets[x]->getVel(), true, (m_bullets[x]->getPos() - m_player.GetPosition()).Length()); // m_whoosh[x] = m_audio.Create3DAudioObj(m_whoosh[x], AUDIO_PATH "noise.wav", m_bullets[x]->getPos(), m_bullets[x]->getVel(), true, (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
// } // }
else { // else {
Vector3f pos = m_bullets[x]->getPos(), vel = m_bullets[x]->getVel(); // Vector3f pos = m_bullets[x]->getPos(), vel = m_bullets[x]->getVel();
m_audio.Render3DAudioObj(m_whoosh[x], pos, vel, 5 - (m_bullets[x]->getPos() - m_player.GetPosition()).Length()); // m_audio.Render3DAudioObj(m_whoosh[x], pos, vel, 5 - (m_bullets[x]->getPos() - m_player.GetPosition()).Length());
} // }
} }
} }
} }