Ajouts textures et blend.
This commit is contained in:
Marc-Eric Martel
@@ -2,100 +2,110 @@
|
||||
|
||||
Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) { }
|
||||
|
||||
void Player::TurnLeftRight(float value) {
|
||||
void Player::TurnLeftRight(float value) {
|
||||
m_rotY += value;
|
||||
if (m_rotY > 360) m_rotY = 0;
|
||||
else if (m_rotY < -360) m_rotY = 0;
|
||||
}
|
||||
|
||||
void Player::TurnTopBottom(float value) {
|
||||
m_rotX += value;
|
||||
if (m_rotX > 45) m_rotX = 45;
|
||||
else if (m_rotX < -45) m_rotX = -45;
|
||||
}
|
||||
|
||||
void Player::TurnTopBottom(float value) { m_rotY += value; }
|
||||
|
||||
void Player::Move(bool front, bool back, bool left, bool right, bool jump, float elapsedTime) {
|
||||
void Player::Move(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime) {
|
||||
static float accWS = 0;
|
||||
static float accAD = 0;
|
||||
static float accjmp = 0;
|
||||
static float yrotrad = 0;
|
||||
static float xrotrad = 0;
|
||||
static bool jumped = false;
|
||||
|
||||
if (jump && !jumped) {
|
||||
m_accjmp = m_jumpheight;
|
||||
accjmp = m_jumpforce;
|
||||
jumped = true;
|
||||
}
|
||||
else if (m_position.y > -0.3f && m_accjmp != 0) {
|
||||
if (m_accjmp > 0.1f) {
|
||||
else if (m_position.y > -0.2f && accjmp != 0) {
|
||||
if (accjmp > 0.f) {
|
||||
if (jump) {
|
||||
m_accjmp *= 0.95 - m_accjmp * elapsedTime;
|
||||
m_accjmp -= elapsedTime * 1.1;
|
||||
accjmp *= 0.95f - accjmp * elapsedTime;
|
||||
accjmp -= elapsedTime * 1.1;
|
||||
}
|
||||
else {
|
||||
m_accjmp *= 0.75 - m_accjmp * elapsedTime;
|
||||
m_accjmp -= elapsedTime * 1.1;
|
||||
accjmp *= 0.75f - accjmp * elapsedTime;
|
||||
accjmp -= elapsedTime * 1.1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (jump) m_accjmp -= elapsedTime * 0.7;
|
||||
else m_accjmp -= elapsedTime * 0.9;
|
||||
if (jump) accjmp -= elapsedTime * 0.7;
|
||||
else accjmp -= elapsedTime * 0.9;
|
||||
}
|
||||
front = false; // Emp<6D>che le d<>placement dans les airs.
|
||||
back = false;
|
||||
left = false;
|
||||
right = false;
|
||||
}
|
||||
else m_accjmp = 0;
|
||||
else accjmp = 0;
|
||||
|
||||
if (m_position.y < 0) { // Suivi de mouvement pour l'atterrissage.
|
||||
m_position.y += elapsedTime * 5;
|
||||
if (m_position.y < 0.f) { //&& jumped) { // Suivi de mouvement pour l'atterrissage.
|
||||
m_position.y += elapsedTime * 5.f;
|
||||
if (m_position.y > 0.f) {
|
||||
jumped = false;
|
||||
jumped = false;
|
||||
m_position.y = 0;
|
||||
}
|
||||
}
|
||||
|
||||
m_position.y += m_accjmp;
|
||||
|
||||
m_position.y += accjmp;
|
||||
|
||||
if (!jumped || left || right || front || back) {
|
||||
m_yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
|
||||
m_xrotrad = (m_rotX / 57.2957795056f);
|
||||
yrotrad = (m_rotY / 57.2957795056f); // 180/Pi = 57.295...
|
||||
xrotrad = (m_rotX / 57.2957795056f);
|
||||
}
|
||||
|
||||
if (front) {
|
||||
if (m_accWS < m_topspeed) m_accWS += elapsedTime * 30; else m_accWS = m_topspeed;
|
||||
if (accWS < m_topspeed) accWS += elapsedTime * 30; else accWS = m_topspeed;
|
||||
|
||||
m_position.x += float(sin(m_yrotrad)) * elapsedTime * m_accWS;
|
||||
m_position.z += float(-cos(m_yrotrad)) * elapsedTime * m_accWS;
|
||||
m_position.x += float(sin(yrotrad)) * elapsedTime * accWS;
|
||||
m_position.z += float(-cos(yrotrad)) * elapsedTime * accWS;
|
||||
// m_position.y += float(-sin(xrotrad)) * elapsedTime * 20; // <20> remettre pour impl<70>menter une fonction de vol.
|
||||
}
|
||||
else if (back) {
|
||||
if (m_accWS > -m_topspeed) m_accWS -= elapsedTime * 30; else m_accWS = -m_topspeed;
|
||||
else if (back) {
|
||||
if (accWS > -m_topspeed) accWS -= elapsedTime * 30; else accWS = -m_topspeed;
|
||||
|
||||
m_position.x += float(-sin(m_yrotrad)) * elapsedTime * -m_accWS;
|
||||
m_position.z += float(cos(m_yrotrad)) * elapsedTime * -m_accWS;
|
||||
m_position.x += float(-sin(yrotrad)) * elapsedTime * -accWS;
|
||||
m_position.z += float(cos(yrotrad)) * elapsedTime * -accWS;
|
||||
// m_position.y += float(sin(xrotrad)) * elapsedTime * 20; // <20> remettre pour impl<70>menter une fonction de vol.
|
||||
}
|
||||
else if (m_accWS != 0) {
|
||||
m_accWS = m_accWS > 0 ? m_accWS - elapsedTime * (jumped? 10 : 60) : m_accWS + elapsedTime * (jumped ? 10 : 60);
|
||||
else if (accWS != 0) {
|
||||
accWS = accWS > 0 ? accWS - elapsedTime * (m_position.y > 0.f ? 10 : 60) : accWS + elapsedTime * (m_position.y > 0.f ? 10 : 60);
|
||||
|
||||
m_position.x += float(sin(m_yrotrad)) * elapsedTime * m_accWS;
|
||||
m_position.z += float(-cos(m_yrotrad)) * elapsedTime * m_accWS;
|
||||
if (m_accWS < 1 && m_accWS > -1) m_accWS = 0;
|
||||
m_position.x += float(sin(yrotrad)) * elapsedTime * accWS;
|
||||
m_position.z += float(-cos(yrotrad)) * elapsedTime * accWS;
|
||||
if (accWS < 1 && accWS > -1) accWS = 0;
|
||||
}
|
||||
|
||||
if (left) {
|
||||
if (m_accAD < m_topspeed) m_accAD += elapsedTime * 30; else m_accAD = m_topspeed;
|
||||
m_position.x += float(-cos(m_yrotrad)) * elapsedTime * m_accAD;
|
||||
m_position.z += float(-sin(m_yrotrad)) * elapsedTime * m_accAD;
|
||||
if (left) {
|
||||
if (accAD < m_topspeed) accAD += elapsedTime * 30; else accAD = m_topspeed;
|
||||
m_position.x += float(-cos(yrotrad)) * elapsedTime * accAD;
|
||||
m_position.z += float(-sin(yrotrad)) * elapsedTime * accAD;
|
||||
}
|
||||
else if (right) {
|
||||
if (m_accAD > -m_topspeed) m_accAD -= elapsedTime * 30; else m_accAD = -m_topspeed;
|
||||
m_position.x += float(cos(m_yrotrad)) * elapsedTime * -m_accAD;
|
||||
m_position.z += float(sin(m_yrotrad)) * elapsedTime * -m_accAD;
|
||||
if (accAD > -m_topspeed) accAD -= elapsedTime * 30; else accAD = -m_topspeed;
|
||||
m_position.x += float(cos(yrotrad)) * elapsedTime * -accAD;
|
||||
m_position.z += float(sin(yrotrad)) * elapsedTime * -accAD;
|
||||
}
|
||||
else if (m_accAD != 0) {
|
||||
m_accAD = m_accAD > 0 ? m_accAD - elapsedTime * (jumped ? 10 : 60) : m_accAD + elapsedTime * (jumped ? 10 : 60);
|
||||
m_position.x += float(-cos(m_yrotrad)) * elapsedTime * m_accAD;
|
||||
m_position.z += float(-sin(m_yrotrad)) * elapsedTime * m_accAD;
|
||||
if (m_accAD < 1 && m_accAD > -1) m_accAD = 0;
|
||||
else if (accAD != 0) {
|
||||
accAD = accAD > 0 ? accAD - elapsedTime * (m_position.y > 0.f ? 10 : 60) : accAD + elapsedTime * (m_position.y > 0.f ? 10 : 60);
|
||||
m_position.x += float(-cos(yrotrad)) * elapsedTime * accAD;
|
||||
m_position.z += float(-sin(yrotrad)) * elapsedTime * accAD;
|
||||
if (accAD < 1 && accAD > -1) accAD = 0;
|
||||
}
|
||||
|
||||
// Gestion de si le personnage va en diagonale pour qu'il n'aille pas plus vite que s'il allait en ligne droite: SQRT(15^2+15^2) = ~21.2
|
||||
if ((m_accWS >= 0? m_accWS: -m_accWS + m_accAD >= 0 ? m_accAD : -m_accAD) > sqrtf(m_topspeed * m_topspeed + m_topspeed * m_topspeed)) {
|
||||
m_accWS *= 0.9f;
|
||||
m_accAD *= 0.9f;
|
||||
// Gestion de si le personnage va en diagonale, qu'il n'aille pas plus vite que s'il allait en ligne droite.
|
||||
if ((accWS >= 0 ? accWS : -accWS + accAD >= 0 ? accAD : -accAD) > sqrtf(m_topspeed * m_topspeed + m_topspeed * m_topspeed)) {
|
||||
accWS *= 0.9f;
|
||||
accAD *= 0.9f;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user