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

fix switch button animation and alignment (TR2, TR3); minor fixes

Browse Source
This commit is contained in:
XProger
2018-07-17 02:58:33 +03:00
parent ff89372ac5
commit 827eec9b26
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/format.h
View File

@@ -1032,6 +1032,10 @@ namespace TR {
0, 100, 80, ::Box(vec3(-1024, -1024, -1024), vec3(1024, 1024, 512)), true, true 0, 100, 80, ::Box(vec3(-1024, -1024, -1024), vec3(1024, 1024, 512)), true, true
}; };
Limit SWITCH_BUTTON = {
0, 300, 30, ::Box(vec3(-200, 0, 290), vec3(200, 0, 512)), true, true
};
Limit PICKUP = { Limit PICKUP = {
0, -100, 180, ::Box(vec3(-256, -100, -256), vec3(256, 100, 100)), false, true 0, -100, 180, ::Box(vec3(-256, -100, -256), vec3(256, 100, 100)), false, true
}; };
@@ -3052,11 +3056,13 @@ namespace TR {
} }
// turn off interpolation for some entities // turn off interpolation for some entities
if (id == LVL_TR2_CUT_1)
for (int i = 0; i < entitiesBaseCount; i++) { for (int i = 0; i < entitiesBaseCount; i++) {
Entity &e = entities[i]; Entity &e = entities[i];
if (e.type == Entity::CUT_6 || e.type == Entity::CUT_8 || e.type == Entity::CUT_9) { if ((id == LVL_TR2_CUT_1 && (e.type == Entity::CUT_6 || e.type == Entity::CUT_8 || e.type == Entity::CUT_9)) ||
e.type == Entity::SWITCH_BUTTON) {
e.flags.smooth = false; e.flags.smooth = false;
} }
} }
} }

8
src/inventory.h
View File

@@ -961,12 +961,12 @@ struct Inventory {
void update() { void update() {
if (titleTimer > 1.0f && ( if (titleTimer > 1.0f && (
Input::state[0][cInventory] || Input::state[0][cAction] || Input::state[0][cJump] || Input::state[0][cInventory] || Input::state[0][cAction] ||
Input::state[1][cInventory] || Input::state[1][cAction] || Input::state[1][cJump] || Input::state[1][cInventory] || Input::state[1][cAction] ||
Input::down[ikCtrl] || Input::down[ikEnter] || Input::down[ikAlt])) Input::down[ikCtrl]))
{ {
if (video) { if (video) {
if (video->time > 0.5f) if (video->time > 0.75f)
skipVideo(); skipVideo();
} else if (titleTimer > 1.0f && titleTimer < 2.5f) } else if (titleTimer > 1.0f && titleTimer < 2.5f)
titleTimer = 1.0f; titleTimer = 1.0f;

2
src/lara.h
View File

@@ -1814,7 +1814,7 @@ struct Lara : Character {
Switch *controller = (Switch*)level->entities[info.trigCmd[cmdIndex++].args].controller; Switch *controller = (Switch*)level->entities[info.trigCmd[cmdIndex++].args].controller;
if (controller->flags.state != TR::Entity::asActive) { if (controller->flags.state != TR::Entity::asActive) {
limit = state == STATE_STOP ? &TR::Limits::SWITCH : &TR::Limits::SWITCH_UNDERWATER; limit = state == STATE_STOP ? (controller->getEntity().type == TR::Entity::SWITCH_BUTTON ? &TR::Limits::SWITCH_BUTTON : &TR::Limits::SWITCH) : &TR::Limits::SWITCH_UNDERWATER;
if (checkInteraction(controller, limit, Input::state[camera->cameraIndex][cAction])) { if (checkInteraction(controller, limit, Input::state[camera->cameraIndex][cAction])) {
actionState = (controller->state == Switch::STATE_DOWN && stand == STAND_GROUND) ? STATE_SWITCH_UP : STATE_SWITCH_DOWN; actionState = (controller->state == Switch::STATE_DOWN && stand == STAND_GROUND) ? STATE_SWITCH_UP : STATE_SWITCH_DOWN;

4
src/video.h
View File

@@ -659,9 +659,9 @@ struct Video {
Y[i] = clamp(luma + offsetLUT[diff] * signLUT[sign][i], 0U, 63U); Y[i] = clamp(luma + offsetLUT[diff] * signLUT[sign][i], 0U, 63U);
} else { } else {
if (bs.readBit()) {
if (bs.readBit())
luma = bs.readBit() ? bs.read(6) : ((luma + lumaLUT[bs.read(3)]) & 63); luma = bs.readBit() ? bs.read(6) : ((luma + lumaLUT[bs.read(3)]) & 63);
}
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
Y[i] = luma; Y[i] = luma;