mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input overlay) Reorder variables in struct

Browse Source
This commit is contained in:
twinaphex 2017-09-29 17:11:42 +02:00
parent 819e3fb02a
commit 5b9f90dd9a
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
input/input_overlay.h
View File

@ -96,27 +96,34 @@ enum overlay_image_transfer_status
struct overlay struct overlay
{ {
unsigned id; bool full_screen;
bool block_scale;
struct overlay_desc *descs; unsigned load_images_size;
size_t size; unsigned id;
size_t pos;
unsigned pos_increment; unsigned pos_increment;
struct texture_image image; size_t size;
size_t pos;
bool block_scale;
float mod_x, mod_y, mod_w, mod_h; float mod_x, mod_y, mod_w, mod_h;
float x, y, w, h; float x, y, w, h;
float scale; float scale;
float center_x, center_y; float center_x, center_y;
bool full_screen; struct overlay_desc *descs;
struct texture_image *load_images;
struct texture_image image;
char name[64]; char name[64];
struct struct
{ {
bool normalized;
float alpha_mod;
float range_mod;
struct struct
{ {
char key[64]; char key[64];
@ -140,41 +147,36 @@ struct overlay
unsigned size; unsigned size;
} descs; } descs;
bool normalized;
float alpha_mod;
float range_mod;
} config; } config;
struct texture_image *load_images;
unsigned load_images_size;
}; };
struct overlay_desc struct overlay_desc
{ {
float x;
float y;
enum overlay_hitbox hitbox; enum overlay_hitbox hitbox;
float range_x, range_y;
float range_x_mod, range_y_mod;
float mod_x, mod_y, mod_w, mod_h;
float delta_x, delta_y;
enum overlay_type type; enum overlay_type type;
uint64_t key_mask;
float analog_saturate_pct; bool updated;
bool movable;
unsigned next_index; unsigned next_index;
char next_index_name[64];
struct texture_image image;
unsigned image_index; unsigned image_index;
float alpha_mod; float alpha_mod;
float range_mod; float range_mod;
float analog_saturate_pct;
float range_x, range_y;
float range_x_mod, range_y_mod;
float mod_x, mod_y, mod_w, mod_h;
float delta_x, delta_y;
float x;
float y;
bool updated; uint64_t key_mask;
bool movable;
char next_index_name[64];
struct texture_image image;
}; };
typedef struct overlay_desc overlay_desc_t; typedef struct overlay_desc overlay_desc_t;
@ -183,13 +185,13 @@ typedef struct input_overlay input_overlay_t;
typedef struct typedef struct
{ {
struct overlay *overlays;
struct overlay *active;
size_t size;
bool hide_in_menu; bool hide_in_menu;
bool overlay_enable; bool overlay_enable;
size_t size;
float overlay_opacity; float overlay_opacity;
float overlay_scale; float overlay_scale;
struct overlay *overlays;
struct overlay *active;
} overlay_task_data_t; } overlay_task_data_t;
/** /**