Miroirs/wipeout-rewrite
1
0
Fork 0
mirror of https://github.com/phoboslab/wipeout-rewrite synced 2024-12-26 09:59:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #101 from LuKP17/options-internal-camera-roll

Browse source 
Option to lessen internal camera roll
This commit is contained in:
Dominic Szablewski 2023-11-04 19:36:54 +01:00 committed by GitHub
commit 4a80e0b260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/wipeout/camera.c
View file

@ -10,6 +10,7 @@
#include "weapon.h" #include "weapon.h"
#include "droid.h" #include "droid.h"
#include "camera.h" #include "camera.h"
#include "game.h"
void camera_init(camera_t *camera, section_t *section) { void camera_init(camera_t *camera, section_t *section) {
camera->section = section; camera->section = section;
@ -61,7 +62,7 @@ void camera_update_race_external(camera_t *camera, ship_t *ship, droid_t *droid)
void camera_update_race_internal(camera_t *camera, ship_t *ship, droid_t *droid) { void camera_update_race_internal(camera_t *camera, ship_t *ship, droid_t *droid) {
camera->section = ship->section; camera->section = ship->section;
camera->position = ship_cockpit(ship); camera->position = ship_cockpit(ship);
camera->angle = vec3(ship->angle.x, ship->angle.y, ship->angle.z); camera->angle = vec3(ship->angle.x, ship->angle.y, ship->angle.z * save.internal_roll);
} }
void camera_update_race_intro(camera_t *camera, ship_t *ship, droid_t *droid) { void camera_update_race_intro(camera_t *camera, ship_t *ship, droid_t *droid) {

1
src/wipeout/game.c
View file

@ -396,6 +396,7 @@ save_t save = {
.sfx_volume = 0.6, .sfx_volume = 0.6,
.music_volume = 0.5, .music_volume = 0.5,
.internal_roll = 0.6,
.ui_scale = 0, .ui_scale = 0,
.show_fps = false, .show_fps = false,
.fullscreen = false, .fullscreen = false,

1
src/wipeout/game.h
View file

@ -240,6 +240,7 @@ typedef struct {
float sfx_volume; float sfx_volume;
float music_volume; float music_volume;
float internal_roll;
uint8_t ui_scale; uint8_t ui_scale;
bool show_fps; bool show_fps;
bool fullscreen; bool fullscreen;

7
src/wipeout/main_menu.c
View file

@ -260,6 +260,11 @@ static void toggle_fullscreen(menu_t *menu, int data) {
platform_set_fullscreen(save.fullscreen); platform_set_fullscreen(save.fullscreen);
} }
static void toggle_internal_roll(menu_t *menu, int data) {
save.internal_roll = (float)data * 0.1;
save.is_dirty = true;
}
static void toggle_show_fps(menu_t *menu, int data) { static void toggle_show_fps(menu_t *menu, int data) {
save.show_fps = data; save.show_fps = data;
save.is_dirty = true; save.is_dirty = true;
@ -283,6 +288,7 @@ static void toggle_post(menu_t *menu, int data) {
} }
static const char *opts_off_on[] = {"OFF", "ON"}; static const char *opts_off_on[] = {"OFF", "ON"};
static const char *opts_roll[] = {"0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"};
static const char *opts_ui_sizes[] = {"AUTO", "1X", "2X", "3X", "4X"}; static const char *opts_ui_sizes[] = {"AUTO", "1X", "2X", "3X", "4X"};
static const char *opts_res[] = {"NATIVE", "240P", "480P"}; static const char *opts_res[] = {"NATIVE", "240P", "480P"};
static const char *opts_post[] = {"NONE", "CRT EFFECT"}; static const char *opts_post[] = {"NONE", "CRT EFFECT"};
@ -299,6 +305,7 @@ static void page_options_video_init(menu_t *menu) {
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
menu_page_add_toggle(page, save.fullscreen, "FULLSCREEN", opts_off_on, len(opts_off_on), toggle_fullscreen); menu_page_add_toggle(page, save.fullscreen, "FULLSCREEN", opts_off_on, len(opts_off_on), toggle_fullscreen);
#endif #endif
menu_page_add_toggle(page, save.internal_roll * 10, "INTERNAL VIEW ROLL", opts_roll, len(opts_roll), toggle_internal_roll);
menu_page_add_toggle(page, save.ui_scale, "UI SCALE", opts_ui_sizes, len(opts_ui_sizes), toggle_ui_scale); menu_page_add_toggle(page, save.ui_scale, "UI SCALE", opts_ui_sizes, len(opts_ui_sizes), toggle_ui_scale);
menu_page_add_toggle(page, save.show_fps, "SHOW FPS", opts_off_on, len(opts_off_on), toggle_show_fps); menu_page_add_toggle(page, save.show_fps, "SHOW FPS", opts_off_on, len(opts_off_on), toggle_show_fps);
menu_page_add_toggle(page, save.screen_res, "SCREEN RESOLUTION", opts_res, len(opts_res), toggle_res); menu_page_add_toggle(page, save.screen_res, "SCREEN RESOLUTION", opts_res, len(opts_res), toggle_res);