Skip to content

Cleanup: camera.c #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unofficial-fish wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cleanup: camera.c #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 66 additions & 66 deletions src/wipeout/camera.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,27 @@ vec3_t camera_forward(camera_t *camera) {
return rotation_matrix.basis.forward.vec3;
}

static void camera_look_at_point(camera_t *camera, vec3_t point) {
vec3_t target = vec3_sub(point, camera->position);
float height = vec3_len(vec3_mul(target, vec3(1,0,1)));

camera->angle = vec3(-atan2f(target.y, height), -atan2f(target.x, target.z), 0);
}

void camera_update(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->last_position = camera->position;
camera->update_timer -= system_tick();

(camera->update_func)(camera, ship, droid);

camera->real_velocity = vec3_mulf(vec3_sub(camera->position, camera->last_position), 1.0/system_tick());
camera_update_shake(camera);
}

void camera_update_race_external(camera_t *camera, ship_t *ship, droid_t *droid) {

vec3_t pos = vec3_transform(vec3(0,0,-1024), &ship->mat);

pos.y -= 200;

camera->section = track_nearest_section(pos, vec3(1,1,1), camera->section, NULL);
section_t *next = camera->section->next;

Expand All @@ -47,127 +56,118 @@ void camera_update_race_external(camera_t *camera, ship_t *ship, droid_t *droid)
vec3_t diff_from_center = vec3_sub(pos, target);
vec3_t acc = diff_from_center;
acc.y += vec3_len(diff_from_center) * 0.5;

camera->velocity = vec3_sub(camera->velocity, vec3_mulf(acc, 0.015625 * 30 * system_tick()));
camera->velocity = vec3_sub(camera->velocity, vec3_mulf(camera->velocity, 0.125 * 30 * system_tick()));
pos = vec3_add(pos, camera->velocity);

camera->position = pos;
camera->angle = vec3(ship->angle.x, ship->angle.y, 0);
camera->angle = vec3_mul(ship->angle, vec3(1,1,0));
}

void camera_update_race_internal(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->section = ship->section;
camera->position = ship_cockpit(ship);
camera->angle = vec3(ship->angle.x, ship->angle.y, ship->angle.z * save.internal_roll);
camera->angle = vec3_mul(ship->angle, vec3(1,1,save.internal_roll));
}

void camera_update_race_intro(camera_t *camera, ship_t *ship, droid_t *droid) {
// Set to final position
vec3_t pos = vec3_transform(vec3(0,0,-0.25 * 4096), &ship->mat);

pos.x += sinf(( (ship->update_timer - UPDATE_TIME_RACE_VIEW) * 30 * 3.0 * M_PI * 2) / 4096.0) * 4096;
pos.y -= (2 * (ship->update_timer - UPDATE_TIME_RACE_VIEW) * 30) + 200;
pos.z += sinf(( (ship->update_timer - UPDATE_TIME_RACE_VIEW) * 30 * 3.0 * M_PI * 2) / 4096.0) * 4096;
vec3_t pos = vec3_transform(vec3(0,0,-1024), &ship->mat);
pos.y -= 200;

camera->position = vec3_add(pos, vec3(
sinf(( (ship->update_timer - UPDATE_TIME_RACE_VIEW) * 30 * 3.0 * M_PI * 2) / 4096.0) * 4096,
-((2 * (ship->update_timer - UPDATE_TIME_RACE_VIEW) * 30)),
sinf(( (ship->update_timer - UPDATE_TIME_RACE_VIEW) * 30 * 3.0 * M_PI * 2) / 4096.0) * 4096
));

if (!camera->has_initial_section) {
camera->section = ship->section;
camera->has_initial_section = true;
}
else {
camera->section = track_nearest_section(pos, vec3(1,1,1), camera->section, NULL);
camera->section = track_nearest_section(camera->position, vec3(1,1,1), camera->section, NULL);
}

camera->position = pos;
camera->angle.z = 0;
camera->angle.x = ship->angle.x * 0.5;
vec3_t target = vec3_sub(ship->position, pos);

camera->angle.y = -atan2f(target.x, target.z);
camera_look_at_point(camera, ship->position);
camera->angle.x = ship->angle.x * 0.5f;

if (ship->update_timer <= UPDATE_TIME_RACE_VIEW) {
flags_add(ship->flags, SHIP_VIEW_INTERNAL);
camera->update_func = camera_update_race_internal;
}
}

void camera_update_rescue(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->position = vec3_add(camera->section->center, vec3(300, -1500, 300));
camera_look_at_point(camera, droid->position);
}

void camera_update_attract_circle(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->update_timer -= system_tick();
if (camera->update_timer <= 0) {
camera->update_func = camera_update_attract_random;
}
// FIXME: not exactly sure what I'm doing here. The PSX version behaves
// differently.
camera->section = ship->section;

camera->position.x = ship->position.x + sinf(ship->angle.y) * 512;
camera->position.y = ship->position.y + ((ship->angle.x * 512 / (M_PI * 2)) - 200);
camera->position.z = ship->position.z - cosf(ship->angle.y) * 512;

camera->position.x += sinf(camera->update_timer * 0.25) * 512;
camera->position.y -= 400;
camera->position.z += cosf(camera->update_timer * 0.25) * 512;
camera->position = vec3_add(ship->position, vec3(
sinf(ship->angle.y) * 512,
((ship->angle.x * 512 / (M_PI * 2)) - 200),
-cosf(ship->angle.y) * 512
));
camera->position = vec3_add(camera->position, vec3(
sinf(camera->update_timer * 0.25) * 512,
-400,
cosf(camera->update_timer * 0.25) * 512
));
camera->position = vec3_add(camera->position, vec3_mulf(ship->mat.basis.down.vec3, 256));

vec3_t target = vec3_sub(ship->position, camera->position);
float height = vec3_len(vec3_mul(target, vec3(1,0,1)));
camera->angle.x = -atan2f(target.y, height);
camera->angle.y = -atan2f(target.x, target.z);
}

void camera_update_rescue(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->position = vec3_add(camera->section->center, vec3(300, -1500, 300));

vec3_t target = vec3_sub(droid->position, camera->position);
float height = vec3_len(vec3_mul(target, vec3(1,0,1)));
camera->angle.x = -atan2f(target.y, height);
camera->angle.y = -atan2f(target.x, target.z);
camera_look_at_point(camera, ship->position);
}


void camera_update_attract_internal(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->update_timer -= system_tick();
if (camera->update_timer <= 0) {
camera->update_func = camera_update_attract_random;
}

camera->section = ship->section;
camera->position = ship_cockpit(ship);
camera->angle = vec3(ship->angle.x, ship->angle.y, 0); // No roll
camera->angle = vec3_mul(ship->angle, vec3(1,1,0)); // No roll
}

void camera_update_static_follow(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->update_timer -= system_tick();
if (camera->update_timer <= 0) {
camera->update_func = camera_update_attract_random;
}

vec3_t target = vec3_sub(ship->position, camera->position);
float height = vec3_len(vec3_mul(target, vec3(1,0,1)));
camera_look_at_point(camera, ship->position);
}

void camera_update_attract_static_follow(camera_t *camera, ship_t *ship, droid_t *droid) {
section_t *section = ship->section->next;
for (int i = 0; i < 10; i++) {
section = section->next;
}

camera->angle.x = -atan2f(target.y, height);
camera->angle.y = -atan2f(target.x, target.z);
camera->section = section;
camera->position = section->center;
camera->position.y -= 500;
camera->update_func = camera_update_static_follow;
(camera->update_func)(camera, ship, droid);
}

void (* const attract_options[3])(camera_t *camera, ship_t *ship, droid_t *droid) = {
camera_update_attract_static_follow,
camera_update_attract_circle,
camera_update_attract_internal,
};

void camera_update_attract_random(camera_t *camera, ship_t *ship, droid_t *droid) {
flags_rm(ship->flags, SHIP_VIEW_INTERNAL);

if (rand() % 2) {
camera->update_func = camera_update_attract_circle;
camera->update_timer = 5;
}
else {
camera->update_func = camera_update_static_follow;
camera->update_timer = 5;
section_t *section = ship->section->next;
for (int i = 0; i < 10; i++) {
section = section->next;
}

camera->section = section;
camera->position = section->center;
camera->position.y -= 500;
}
camera->update_timer = 5;
camera->update_func = attract_options[rand() % len(attract_options)];

(camera->update_func)(camera, ship, droid);
}
Expand All @@ -179,11 +179,11 @@ void camera_set_shake(camera_t *camera, float duration) {
void camera_update_shake(camera_t *camera) {
if (camera->shake_timer > 0.0f) {
float s = 0.25 * save.screen_shake * camera->shake_timer;
camera->shake.x = rand_float(-s, s);
camera->shake.y = rand_float(-s, s);
camera->shake = vec2(rand_float(-s, s), rand_float(-s, s));
camera->shake_timer -= system_tick();
}
else {
camera->shake.x = camera->shake.y = camera->shake_timer = 0.0f;
camera->shake = vec2(0.0f, 0.0f);
camera->shake_timer = 0.0f;
}
}
5 changes: 3 additions & 2 deletions src/wipeout/camera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ void camera_update(camera_t *camera, ship_t *ship, droid_t *droid);
void camera_update_race_external(camera_t *, ship_t *camShip, droid_t *);
void camera_update_race_internal(camera_t *, ship_t *camShip, droid_t *);
void camera_update_race_intro(camera_t *, ship_t *camShip, droid_t *);
void camera_update_rescue(camera_t *, ship_t *camShip, droid_t *);
void camera_update_static_follow(camera_t *camera, ship_t *ship, droid_t *droid);
void camera_update_attract_circle(camera_t *, ship_t *camShip, droid_t *);
void camera_update_attract_internal(camera_t *, ship_t *camShip, droid_t *);
void camera_update_static_follow(camera_t *, ship_t *camShip, droid_t *);
void camera_update_attract_static_follow(camera_t *, ship_t *camShip, droid_t *);
void camera_update_attract_random(camera_t *, ship_t *camShip, droid_t *);
void camera_update_rescue(camera_t *, ship_t *camShip, droid_t *);
void camera_set_shake(camera_t *, float duration);
void camera_update_shake(camera_t *);

Expand Down