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

TR2 add flying helicopter object

Browse Source
This commit is contained in:
XProger
2019-01-13 08:25:56 +03:00
parent 347bb78e22
commit 7b104d6631
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/camera.h
View File

@@ -415,11 +415,13 @@ struct Camera : ICamera {
if (!owner->viewTarget) { if (!owner->viewTarget) {
if (viewTarget && !viewTarget->flags.invisible) { if (viewTarget && !viewTarget->flags.invisible) {
vec3 targetVec = (viewTarget->pos - owner->pos).normal(); vec3 targetVec = (viewTarget->pos - owner->pos).normal();
if (targetVec.dot(owner->getDir()) > 0.5f) if (targetVec.dot(owner->getDir()) > 0.1f) {
lookAt = viewTarget; lookAt = viewTarget;
} }
} else }
} else {
lookAt = owner->viewTarget; lookAt = owner->viewTarget;
}
owner->lookAt(lookAt); owner->lookAt(lookAt);
} else { } else {
@@ -427,16 +429,18 @@ struct Camera : ICamera {
owner->lookAt(NULL); owner->lookAt(NULL);
} }
if (!firstPerson && (mode == MODE_FOLLOW || mode == MODE_COMBAT)) if (!firstPerson && (mode == MODE_FOLLOW || mode == MODE_COMBAT)) {
targetAngle += angle; targetAngle += angle;
}
if (!firstPerson || viewIndex != -1) { if (!firstPerson || viewIndex != -1) {
if (timer > 0.0f) { if (timer > 0.0f) {
timer -= Core::deltaTime; timer -= Core::deltaTime;
if (timer <= 0.0f) if (timer <= 0.0f) {
resetTarget(); resetTarget();
} }
}
TR::Location to; TR::Location to;

2
src/format.h
View File

@@ -984,6 +984,8 @@ namespace TR {
SND_TNT = 170, SND_TNT = 170,
SND_MUTANT_DEATH = 171, SND_MUTANT_DEATH = 171,
SND_SECRET = 173, SND_SECRET = 173,
SND_HELICOPTER = 297,
}; };
enum { enum {

2
src/level.h
View File

@@ -1147,6 +1147,8 @@ struct Level : IGame {
case TR::Entity::WINDOW_1 : case TR::Entity::WINDOW_1 :
case TR::Entity::WINDOW_2 : return new BreakableWindow(this, index); case TR::Entity::WINDOW_2 : return new BreakableWindow(this, index);
case TR::Entity::HELICOPTER_FLYING : return new HelicopterFlying(this, index);
default : return new Controller(this, index); default : return new Controller(this, index);
} }
} }

30
src/trigger.h
View File

@@ -1617,6 +1617,36 @@ struct BreakableWindow : Controller {
}; };
#define HELICOPTER_SPEED 3000
#define HELICOPTER_RANGE (1024 * 30)
struct HelicopterFlying : Controller {
HelicopterFlying(IGame *game, int entity) : Controller(game, entity) {}
virtual void update() {
pos.z += HELICOPTER_SPEED * Core::deltaTime;
updateAnimation(false);
updateRoom();
Controller *lara = game->getLara(pos);
float dist = pos.z - lara->pos.z;
Sound::Sample *sample = game->playSound(TR::SND_HELICOPTER, vec3(0.0), 0);
if (sample) {
sample->volume = (1.0f - dist / HELICOPTER_RANGE) * 0.8f;
}
if (fabsf(dist) > HELICOPTER_RANGE) {
Sound::stop(TR::SND_HELICOPTER);
flags.invisible = true;
deactivate(true);
}
}
};
#define STONE_ITEM_LIGHT_RADIUS 2048.0f #define STONE_ITEM_LIGHT_RADIUS 2048.0f
struct StoneItem : Controller { struct StoneItem : Controller {