diff --git a/SQCSim2021/player.cpp b/SQCSim2021/player.cpp index 5e498d5..d221880 100644 --- a/SQCSim2021/player.cpp +++ b/SQCSim2021/player.cpp @@ -37,7 +37,6 @@ void Player::Move(bool front, bool back, bool left, bool right, bool jump, bool accjmp += jump? m_jumpforce: 0.1f; jumped = true; dbljump++; - std::cout << accjmp << std::endl; } else if (m_position.y > -0.2f && accjmp != 0) { if (accjmp > 0.f) { @@ -65,7 +64,9 @@ void Player::Move(bool front, bool back, bool left, bool right, bool jump, bool } } - if (dbljump < 1 && ( left || right || front || back) || dash && !(left || right || front || back)) { + if (dbljump < 1 && ( left || right || front || back) || + dash && !(left || right || front || back)) + { yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295... xrotrad = (m_rotX / 57.2957795056f); if (dash) accWS = m_topspeed; // Pour avoir un boost de vitesse vers l'avant si le dash est appuyé seul. @@ -74,22 +75,16 @@ void Player::Move(bool front, bool back, bool left, bool right, bool jump, bool m_position.y += accjmp; if (front) { - if (jumped == 0) + if (dbljump == 0) if (accWS < m_topspeed) accWS += elapsedTime * 30; else accWS = m_topspeed; - if (dash) { - ++accWS *= 3.f; - //m_position.y += float(-sin(xrotrad)) * elapsedTime * 70; // à remettre pour implémenter une fonction de vol. - } + if (dash) accWS *= accWS > 0.f ? 3.f : -1.f; m_position.x += float(sin(yrotrad)) * elapsedTime * accWS; m_position.z += float(-cos(yrotrad)) * elapsedTime * accWS; } else if (back) { - if (jumped == 0) + if (dbljump == 0) if (accWS > -m_topspeed) accWS -= elapsedTime * 30; else accWS = -m_topspeed; - if (dash) { - --accWS *= 3.f; - //m_position.y += float(sin(xrotrad)) * elapsedTime * 20; // à remettre pour implémenter une fonction de vol. - } + if (dash) accWS *= accWS < 0.f? 3.f: -1.f; m_position.x += float(-sin(yrotrad)) * elapsedTime * -accWS; m_position.z += float(cos(yrotrad)) * elapsedTime * -accWS; } @@ -102,16 +97,16 @@ void Player::Move(bool front, bool back, bool left, bool right, bool jump, bool } if (left) { - if (jumped == 0) + if (dbljump == 0) if (accAD < m_topspeed) accAD += elapsedTime * 30; else accAD = m_topspeed; - if (dash) ++accAD *= 3.f; + if (dash) accAD *= accAD > 0.f? 3.f: -1.f; m_position.x += float(-cos(yrotrad)) * elapsedTime * accAD; m_position.z += float(-sin(yrotrad)) * elapsedTime * accAD; } else if (right) { - if (jumped == 0) + if (dbljump == 0) if (accAD > -m_topspeed) accAD -= elapsedTime * 30; else accAD = -m_topspeed; - if (dash) --accAD *= 3.f; + if (dash) accAD *= accAD < 0.f ? 3.f : -1.f; m_position.x += float(cos(yrotrad)) * elapsedTime * -accAD; m_position.z += float(sin(yrotrad)) * elapsedTime * -accAD; }