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

fix wade state for some cases, fix shaders compilation on mobile

Browse Source
This commit is contained in:
XProger
2018-11-18 08:19:10 +03:00
parent c5358fe0b8
commit 8f6b4945bc
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/format.h
View File

@@ -3255,7 +3255,7 @@ namespace TR {
int16 intensity = stream.readBE16();
int16 intensity2 = stream.readBE16();
ASSERT(intensity == intensity2);
ASSERTV(intensity == intensity2);
int value = clamp((intensity > 0x1FFF) ? 0 : (intensity >> 5), 0, 255);
light.color.r = light.color.g = light.color.b = value;
light.color.a = 0;
@@ -4936,7 +4936,6 @@ namespace TR {
d.h *= 2;
}
uint16 bi = 0;
if (type == TEX_TYPE_ITEM)
ASSERTV(stream.readBE16() == t.i5);

19
src/lara.h
View File

@@ -138,7 +138,8 @@ struct Lara : Character {
ANIM_WADE_RUN_RIGHT = 179,
ANIM_WADE_STAND = 186,
ANIM_WADE_ASCEND = 190,
ANIM_SWIM_WADE = 192,
ANIM_SWIM_STAND = 192,
ANIM_SURF_STAND = 193,
ANIM_SWITCH_BIG_DOWN = 195,
ANIM_SWITCH_BIG_UP = 196,
@@ -2200,6 +2201,12 @@ struct Lara : Character {
} else {
pos.y = waterLevel;
updateRoom();
switch (state) {
case STATE_BACK : animation.setAnim(ANIM_ONWATER_SWIM_B); break;
case STATE_STEP_LEFT : animation.setAnim(ANIM_ONWATER_SWIM_L); break;
case STATE_STEP_RIGHT : animation.setAnim(ANIM_ONWATER_SWIM_R); break;
default : animation.setAnim(ANIM_ONWATER_SWIM_F);
}
return STAND_ONWATER;
}
} else if (waterDepth > LARA_WADE_DEPTH) {
@@ -2208,17 +2215,19 @@ struct Lara : Character {
pos.y = waterLevel + waterDepth;
game->playSound(TR::SND_WATER_SPLASH, pos, Sound::PAN);
updateRoom();
animation.setAnim(ANIM_SWIM_WADE);
animation.setAnim(ANIM_SWIM_STAND);
stopScreaming();
return STAND_WADE;
} else if (stand == STAND_UNDERWATER) {
if (waterDepth <= LARA_SWIM_MIN_DEPTH) {
pos.y = waterLevel + waterDepth;
updateRoom();
animation.setAnim(ANIM_SWIM_WADE);
animation.setAnim(ANIM_SWIM_STAND);
return STAND_WADE;
}
} else if (stand == STAND_ONWATER || stand == STAND_GROUND) {
if (state == STATE_RUN || state == STATE_SURF_SWIM)
animation.setAnim(ANIM_WADE);
pos.y = waterLevel + waterDepth;
updateRoom();
return STAND_WADE;
@@ -2687,6 +2696,8 @@ struct Lara : Character {
}
if (state == STATE_SURF_SWIM)
return animation.setAnim(ANIM_WADE_SWIM);
if (state == STATE_SURF_BACK)
return animation.setAnim(ANIM_BACK);
}
if (input & FORTH) {
@@ -2698,8 +2709,6 @@ struct Lara : Character {
}
if (input & BACK) {
if (state == STATE_SURF_BACK)
return animation.setAnim(ANIM_BACK);
return STATE_BACK;
}

2
src/shaders/shader.glsl
View File

@@ -481,7 +481,7 @@ uniform vec4 uFogParams;
#ifdef TYPE_ENTITY
float specular = calcSpecular(normal, vViewVec.xyz, vLightVec, uLightColor[0], rSpecular);
#ifdef UNDERWATER
specular *= (1.0f - uwSign);
specular *= (1.0 - uwSign);
#endif
color.xyz += specular;
#endif