mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 09:34:18 +02:00
Code Issues Releases Wiki Activity

#3 fix jumping towards the wall

Browse Source
This commit is contained in:
XProger
2017-05-14 00:19:14 +03:00
parent 44e924bda7
commit d3cf26ac1a
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/lara.h
View File

@@ -1540,20 +1540,31 @@ struct Lara : Character {
} }
} }
if ( (input & (FORTH | BACK)) == (FORTH | BACK) && (state == STATE_STOP || state == STATE_RUN) ) if ( (input & (FORTH | BACK)) == (FORTH | BACK) && (animation.index == ANIM_STAND_NORMAL || state == STATE_RUN) )
return animation.setAnim(ANIM_STAND_ROLL_BEGIN); return animation.setAnim(ANIM_STAND_ROLL_BEGIN);
// ready to jump // ready to jump
if (state == STATE_COMPRESS) { if (state == STATE_COMPRESS) {
int res;
float ext = angle.y;
switch (input & (RIGHT | LEFT | FORTH | BACK)) { switch (input & (RIGHT | LEFT | FORTH | BACK)) {
case RIGHT : return STATE_RIGHT_JUMP; case RIGHT : res = STATE_RIGHT_JUMP; ext += PI * 0.5f; break;
case LEFT : return STATE_LEFT_JUMP; case LEFT : res = STATE_LEFT_JUMP; ext -= PI * 0.5f; break;
case FORTH | LEFT : case FORTH | LEFT :
case FORTH | RIGHT : case FORTH | RIGHT :
case FORTH : return STATE_FORWARD_JUMP; case FORTH : res = STATE_FORWARD_JUMP; break;
case BACK : return STATE_BACK_JUMP; case BACK : res = STATE_BACK_JUMP; ext += PI; break;
default : return STATE_UP_JUMP; default : res = STATE_UP_JUMP; break;
} }
if (res != STATE_UP_JUMP) {
vec3 p = pos;
collision = Collision(level, getRoomIndex(), p, vec3(0.0f), vec3(0.0f), LARA_RADIUS * 2.5f, ext, 0, LARA_HEIGHT, 256 + 128, 0xFFFFFF);
if (collision.side == Collision::FRONT)
res = STATE_UP_JUMP;
}
return res;
} }
// jump button is pressed // jump button is pressed
@@ -2135,7 +2146,14 @@ struct Lara : Character {
if (collision.side == Collision::FRONT) { if (collision.side == Collision::FRONT) {
int floor = collision.info[Collision::FRONT].floor; int floor = collision.info[Collision::FRONT].floor;
/*
switch (angleQuadrant(angleExt - angle.y)) {
case 0 : collision.side = Collision::FRONT; LOG("FRONT\n"); break;
case 1 : collision.side = Collision::RIGHT; LOG("RIGHT\n"); break;
case 2 : collision.side = Collision::BACK; LOG("BACK\n"); break;
case 3 : collision.side = Collision::LEFT; LOG("LEFT\n"); break;
}
*/
if (velocity.dot(getDir()) <= EPS) if (velocity.dot(getDir()) <= EPS)
collision.side = Collision::NONE; collision.side = Collision::NONE;