ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

menu_display_matrix_4x4_rotate_z

This commit is contained in:
twinaphex 2016-01-08 08:42:29 +01:00
parent deb66a885e
commit 25481f9bfd
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/menu_display.c
View File

@ -18,7 +18,6 @@
#include <retro_assert.h> #include <retro_assert.h>
#include <queues/message_queue.h> #include <queues/message_queue.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <gfx/math/matrix_4x4.h>
#include <formats/image.h> #include <formats/image.h>
#include "../config.def.h" #include "../config.def.h"
@ -544,20 +543,16 @@ void menu_display_msg_queue_push(const char *msg, unsigned prio, unsigned durati
void menu_display_matrix_4x4_rotate_z(void *data, float rotation, void menu_display_matrix_4x4_rotate_z(math_matrix_4x4 *matrix, float rotation,
float scale_x, float scale_y, float scale_z, bool scale_enable) float scale_x, float scale_y, float scale_z, bool scale_enable)
{ {
math_matrix_4x4 *matrix, *b; math_matrix_4x4 matrix_rotated, matrix_scaled;
math_matrix_4x4 matrix_rotated; math_matrix_4x4 *b = NULL;
math_matrix_4x4 matrix_scaled;
menu_display_ctx_driver_t *menu_disp = menu_display_context_get_ptr(); menu_display_ctx_driver_t *menu_disp = menu_display_context_get_ptr();
if (!menu_disp || !menu_disp->get_default_mvp) if (!matrix || !menu_disp || !menu_disp->get_default_mvp)
return; return;
matrix = (math_matrix_4x4*)data; b = (math_matrix_4x4*)menu_disp->get_default_mvp();
b = (math_matrix_4x4*)menu_disp->get_default_mvp();
if (!matrix)
return;
matrix_4x4_rotate_z(&matrix_rotated, rotation); matrix_4x4_rotate_z(&matrix_rotated, rotation);
matrix_4x4_multiply(matrix, &matrix_rotated, b); matrix_4x4_multiply(matrix, &matrix_rotated, b);

4
menu/menu_display.h
View File

@ -20,6 +20,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <boolean.h> #include <boolean.h>
#include <gfx/math/matrix_4x4.h>
#include "../gfx/video_context_driver.h" #include "../gfx/video_context_driver.h"
#include "../gfx/font_driver.h" #include "../gfx/font_driver.h"
#include "../gfx/video_common.h" #include "../gfx/video_common.h"
@ -163,7 +165,7 @@ void menu_display_draw_bg(
enum menu_display_prim_type prim_type enum menu_display_prim_type prim_type
); );
void menu_display_matrix_4x4_rotate_z(void *data, float rotation, void menu_display_matrix_4x4_rotate_z(math_matrix_4x4 *matrix, float rotation,
float scale_x, float scale_y, float scale_z, bool scale_enable); float scale_x, float scale_y, float scale_z, bool scale_enable);
unsigned menu_display_texture_load(void *data, unsigned menu_display_texture_load(void *data,