Commit Graph

3759 Commits

Author SHA1 Message Date
twinaphex 66c980210f (MaterialUI) Fix mixed declaration warnings 2015-11-02 23:35:41 +01:00
twinaphex 848a060562 Some CXX_BUILD fixes 2015-11-02 23:33:02 +01:00
twinaphex 65670e08ff Change GRfloat instances to float 2015-11-02 23:26:03 +01:00
twinaphex c2f044d30f Add fallback for menu_display_get_default_mvp 2015-11-02 23:24:45 +01:00
twinaphex 66914232ab Replace most instances of GLUI (except for ident string) with
HAVE_MATERIALUI
2015-11-02 23:23:54 +01:00
twinaphex df8c6952df Get rid of some messy code 2015-11-02 23:12:08 +01:00
twinaphex 1d911ac29b (XMB) Get rid of forward declarations 2015-11-02 22:56:05 +01:00
twinaphex 1225fce93b Create menu_display_get_tex_coords 2015-11-02 22:54:05 +01:00
twinaphex 2a100d730c (Menu) Have default tex coords array 2015-11-02 22:46:23 +01:00
twinaphex 8e5a2fdc77 Have one default vertex coord array in menu_display.c 2015-11-02 22:37:29 +01:00
twinaphex b90c78251d Turn menu_video_get_ident into static function 2015-11-02 22:27:19 +01:00
twinaphex 7b35620859 (Menu) Simplify code 2015-11-02 22:25:39 +01:00
twinaphex ab230f5169 Fix warnings 2015-11-02 22:12:43 +01:00
twinaphex 5e2ba2bdfc Cleanup 2015-11-02 22:11:01 +01:00
twinaphex a4eb49430c Create menu_display_texture_load and menu_display_texture_unload 2015-11-02 22:06:51 +01:00
twinaphex c461b920c2 (Menu) Header cleanups 2015-11-02 21:53:51 +01:00
twinaphex 6d02a19a3a menu_display.c - cleanup 2015-11-02 20:51:14 +01:00
twinaphex 76f82082b1 Cleanup 2015-11-02 20:48:57 +01:00
twinaphex 3be9b2752b (GLUI) Start renaming 'glui' 'materialui' under the hood 2015-11-02 20:46:22 +01:00
twinaphex 71ca469cda GL totally abstracted away now from menu drivers 2015-11-02 20:41:42 +01:00
twinaphex ecffd040e2 (GLUI) Cleanups 2015-11-02 20:06:05 +01:00
twinaphex b0d1434940 Remove gl_t pointer grabbing in xmb_frame 2015-11-02 20:03:16 +01:00
twinaphex 080213f5b3 More cleanups - almost completely remove gl_t * usage 2015-11-02 20:02:06 +01:00
twinaphex b34fb9e081 Add scaling steps to menu_display_matrix4x4_rotate_z too 2015-11-02 19:47:25 +01:00
twinaphex d970f16106 (XMB) Cleanups 2015-11-02 19:41:10 +01:00
twinaphex 1b4f19ab87 Cleanup xmb_draw_cursor 2015-11-02 19:38:53 +01:00
twinaphex 699b5f7f3f Create menu_display_matrix4x4_rotate_z 2015-11-02 19:34:01 +01:00
twinaphex 5b15ed2b60 Don't pass gl_t pointer to menu_display functions 2015-11-02 19:11:09 +01:00
twinaphex 7c69249e63 Don't use arguments for blend_begin/blend_end 2015-11-02 19:07:36 +01:00
twinaphex c8cb03e412 Get rid of some gl_t * pointers 2015-11-02 19:04:20 +01:00
twinaphex 10051a657c Simplify menu_display_draw_frame 2015-11-02 18:55:05 +01:00
twinaphex b1c66c5dec (GLUI) Cleanup 2015-11-02 18:47:19 +01:00
twinaphex 6516fc783b Start making menu drivers depend less on gl handle 2015-11-02 18:41:51 +01:00
twinaphex d132cfac7c Make Android hack tinto generic hack for detecting the correct
core info file with the right core name
2015-11-02 17:38:44 +01:00
twinaphex 869ebb3733 (menu) Add include header 2015-11-02 16:12:25 +01:00
Twinaphex fcb0c434ff Merge pull request #2330 from fr500/master
Add new icon alternatives, add extra info to debug panel
2015-11-02 08:24:28 +01:00
radius 93583dc334 update information panel 2015-11-01 22:09:46 -05:00
radius b1d66e86ea fix trailing spaces 2015-11-01 21:20:55 -05:00
twinaphex b5a1cb6d12 Move enum to menu_input.c 2015-11-01 22:57:13 +01:00
twinaphex ae2dca3587 Cleanup menu_input.h some more 2015-11-01 22:45:17 +01:00
twinaphex 60f7a26f53 Move variable out of header 2015-11-01 22:43:54 +01:00
twinaphex 7372885922 (menu_input.h) Move struct definitions out of header file 2015-11-01 22:42:26 +01:00
twinaphex 159e9c1910 Revert "Don't use the same vertex array in every menu driver"
This reverts commit eefc33ef07.
2015-11-01 22:35:19 +01:00
twinaphex eefc33ef07 Don't use the same vertex array in every menu driver 2015-11-01 22:24:10 +01:00
twinaphex b0c94e22fb (GLUI) Remove unused variable 2015-11-01 21:47:36 +01:00
twinaphex ea5f8ec4d2 (GLUI) Cleanup comments 2015-11-01 21:02:45 +01:00
twinaphex 4ccf0839a5 (GLUI) Only change opacity of white_transp_bg when wallpaper is loaded 2015-11-01 21:01:26 +01:00
twinaphex 840306103c Take out unnecessary menu entries for GLUI now that the tabs work
for both mouse and pointer
2015-11-01 20:52:56 +01:00
twinaphex 9607c4fe5d This still works 2015-11-01 20:50:06 +01:00
twinaphex e896799352 Make menu_input_get_ptr a static function now 2015-11-01 20:47:20 +01:00
twinaphex b5855fa49c Backport changes to RGUI too 2015-11-01 20:45:29 +01:00
twinaphex 1e53e3e19a Backport pointer_tap changes 2015-11-01 20:44:04 +01:00
Twinaphex 5287e46e57 Revert "(Menu) Make the mouse left click and the pointer tap use the same cod…" 2015-11-01 20:35:43 +01:00
Twinaphex 9bc28461f3 Merge pull request #2325 from lakkatv/material
(Menu) Make the mouse left click and the pointer tap use the same cod…
2015-11-01 20:26:11 +01:00
Jean-André Santoni 5b51124b62 (Menu) Make the mouse left click and the pointer tap use the same codepath 2015-11-02 02:22:21 +07:00
twinaphex a43fe491f3 Need to restore initial values for glClearColor at end 2015-11-01 20:07:23 +01:00
Twinaphex a07cfd4915 Merge pull request #2324 from lakkatv/material
(GLUI) Tap on tabs
2015-11-01 19:52:09 +01:00
twinaphex 399d1e8fb7 Implement menu_display_clear_color 2015-11-01 19:49:19 +01:00
Jean-André Santoni 4f784a189f (Menu) Implement taps on tabs 2015-11-02 01:44:45 +07:00
twinaphex 0d6ea9c0ff Don't need gl->shader->use calls anymore 2015-11-01 19:35:32 +01:00
twinaphex e9ba2caac7 Rename blending functions 2015-11-01 19:28:12 +01:00
twinaphex 9f3a8dd432 (GLUI) Blend cursor 2015-11-01 19:26:24 +01:00
twinaphex 2b087f3be0 No longer do blending inside menu_display_draw_frame 2015-11-01 19:24:35 +01:00
Jean-André Santoni bd99e952d6 (Menu) Move pointer_tap on the menu driver side 2015-11-02 01:17:06 +07:00
Jean-André Santoni 2f56d5f2d6 (Menu) Refactor pointer_tap 2015-11-02 01:05:33 +07:00
twinaphex 5cabb8111a Enable the mouse by default on Windows and OSX 2015-11-01 16:38:04 +01:00
Twinaphex a752a24f98 Merge pull request #2323 from lakkatv/material
(GLUI) Fix a display bug on switches
2015-11-01 16:26:38 +01:00
twinaphex 2ab4158eca (XMB) Should not need this I think 2015-11-01 16:25:31 +01:00
twinaphex 19a6ccb646 Create menu_display_draw_icon_blend_begin and menu_display_draw_icon_blend_end - cut down on code duplication 2015-11-01 16:23:50 +01:00
Jean-André Santoni 81d4d9f046 (GLUI) Fix a display bug on switches 2015-11-01 22:20:49 +07:00
twinaphex 956580c606 Cleanups 2015-11-01 11:18:28 +01:00
twinaphex f4f76d9dda Create separate setting for State Slot in Quick Menu 2015-11-01 10:59:01 +01:00
twinaphex 106cbce6d7 Show 'display name' for core in Playlist Associations 2015-11-01 02:06:30 +01:00
twinaphex 358e859a17 (GLUI) Make lightblue_bg only translucent when there is a background or
libretro in the background running
2015-10-31 23:09:14 +01:00
twinaphex 3a7799f132 Remove some unused variables 2015-10-31 18:13:03 +01:00
twinaphex da1931ad9f First working implementation of playlist associations 2015-10-31 17:44:42 +01:00
twinaphex 6edc7aa73e Fix menu_playlist_find_associated_core 2015-10-31 17:24:28 +01:00
twinaphex 0c691dab06 Fix rarch_playlist_load_content 2015-10-31 17:18:37 +01:00
twinaphex 1ddd33336a 1) rarch_playlist_load_content - add argument
2) GLUI - handle libretro_pause being false better - hide
background and make white background look better
2015-10-31 17:06:08 +01:00
twinaphex a509fc50b1 Create menu_playlist_find_associated_core 2015-10-31 16:27:48 +01:00
twinaphex 0480ba4bd2 Fills in settings->playlist_cores now too 2015-10-31 16:07:52 +01:00
twinaphex b42a0ea7f7 Make backgrounds transparent 2015-10-31 15:02:54 +01:00
twinaphex 2972125772 (GLUI) Always draw white background 2015-10-31 14:57:47 +01:00
twinaphex efb83d5e1a Start setting up 'get_value' callbacks for playlist associations 2015-10-31 13:46:06 +01:00
twinaphex d42bbbf35d Remove frivolous log 2015-10-31 13:33:57 +01:00
twinaphex 990ee7a105 Start adding playlist_names and playlist_cores to config file 2015-10-31 13:29:27 +01:00
Jean-André Santoni a467af48cf (XMB) Fix a display bug on 16:9 displays caused by an optimization 2015-10-31 13:41:33 +07:00
twinaphex 958346de78 (GLUI) Hide 'Select From Collection' (except on RARCH_MOBILE) -
now handled by tab
2015-10-30 18:32:17 +01:00
Twinaphex bd683596b9 Merge pull request #2318 from lakkatv/xmb
(XMB) Use defines for values that will never change. Fixes a display …
2015-10-30 16:24:23 +01:00
Jean-André Santoni 0e6324f118 (XMB) Use defines for values that will never change. Fixes a display bug too. 2015-10-30 22:14:30 +07:00
twinaphex 274513a9c5 Spacing fix for RGUI 2015-10-30 15:39:22 +01:00
twinaphex 174ab87311 Hook up labels 2015-10-30 15:25:24 +01:00
twinaphex d800f7b8d9 Hook up bind_mode inside menu_input_key_bind_set_mode 2015-10-30 15:20:59 +01:00
twinaphex 5b0132c16e Add back Bind Mode setting 2015-10-30 14:36:04 +01:00
Jean-André Santoni ae79d70438 (GLUI) Fix left tab switching when navigation wraparound is false. Also dehardcode some values representing the number of tabs in the menu system. 2015-10-30 16:28:27 +07:00
twinaphex e36ff60acc (GLUI) Add back settings for mobile for now- can go again when
tabs are responding to touch
2015-10-30 09:49:05 +01:00
Twinaphex d4f037f6d7 Add default left/right callbacks for 'No Items' 2015-10-29 15:00:29 +01:00
twinaphex d796ac592a Set type of 'No Items' and attempt to implement a left callback
by default
2015-10-29 14:48:55 +01:00
twinaphex dc01a392ea (GLUI) Implement glui_list_push 2015-10-29 13:35:15 +01:00
twinaphex f38ba514ed Get rid of unused variables 2015-10-29 13:32:58 +01:00
twinaphex 507fa8028e Set tabs_height again if glui_list_get_size is 1 2015-10-29 13:05:01 +01:00
Jean-André Santoni cdfb274ac2 (GLUI) Hide tabs if we're not on the root level of the navigation 2015-10-29 18:36:57 +07:00
Jean-André Santoni 0fa2e553b2 (XMB) Use pure white color when displaying an icon with GL 2015-10-29 18:27:40 +07:00
Jean-André Santoni 2b1bbadc3b (XMB) Use icons for tabs instead of labels 2015-10-29 18:24:37 +07:00
Jean-André Santoni 1eda4a094f (GLUI) Use a white theme for the tabs 2015-10-29 17:40:06 +07:00
Jean-André Santoni 07ef7f23ab (GLUI) Move tabs to the bottom 2015-10-29 17:31:13 +07:00
Jean-André Santoni c0916c11af (GLUI) Add a settings tab 2015-10-29 17:23:04 +07:00
Jean-André Santoni b6bb679e68 (GLUI) Fix left action on the playlist tab 2015-10-29 13:32:44 +07:00
twinaphex ed1d8583f4 (GLUI) Playlist tab works now 2015-10-28 21:30:30 +01:00
Jean-André Santoni 27553e2363 (GLUI) Use uppercase for tab names 2015-10-29 02:54:26 +07:00
Jean-André Santoni d779ffcf13 (GLUI) Show appropriate tab names 2015-10-29 02:34:52 +07:00
Jean-André Santoni 37312fe922 (GLUI) Display playlists in the second tab 2015-10-29 02:15:01 +07:00
Jean-André Santoni 01f0cb43f7 (GLUI) Display tabs in the header 2015-10-29 02:15:01 +07:00
Jean-André Santoni 4a391e8af2 (GLUI) Tabs, first step: allow switching between two tabs 2015-10-29 02:12:46 +07:00
twinaphex 434f8383d8 menu_display_draw_frame - put in potential edge case fix 2015-10-28 18:24:51 +01:00
Twinaphex 3e17c9e741 Merge pull request #2306 from lakkatv/material
(GLUI) Free textures in context_destroy
2015-10-28 18:21:43 +01:00
Jean-André Santoni 657b02033e (GLUI) Free textures in context_destroy 2015-10-29 00:06:05 +07:00
twinaphex 2437f8cd97 Correct sizeof argument too 2015-10-28 17:02:38 +01:00
twinaphex e991945ece Don't use the same variable for fill_pathname_join 2015-10-28 17:02:03 +01:00
twinaphex a151467bc7 menu_setting_set_flags - handles string option settings now 2015-10-28 16:58:20 +01:00
twinaphex 052616c675 (GLUI) Add back stock shader blend in glui_draw_icon function 2015-10-28 16:00:30 +01:00
twinaphex 85ff9e5418 Can now press driver options 2015-10-28 15:56:45 +01:00
twinaphex 5fef315cb1 Add more titles 2015-10-28 08:25:15 +01:00
twinaphex 99720d02d8 (Menu) Add more labels 2015-10-28 06:31:58 +01:00
twinaphex 6f56a34589 More titles 2015-10-28 06:25:24 +01:00
twinaphex 67e5262ef8 (GLUI) Fixes graphical glitch that could occur if scrollbar_height
became negative
2015-10-28 06:05:05 +01:00
twinaphex c5c816d708 Add another title 2015-10-28 05:00:48 +01:00
twinaphex d59f3eff07 Fix some labels 2015-10-28 04:26:53 +01:00
twinaphex e2f69a1f4c (menu_cbs_title.c) Dehardcode some strings 2015-10-28 04:19:31 +01:00
twinaphex 53f71b0a94 Pretty version of 'Information' string 2015-10-28 04:11:43 +01:00
Jean-André Santoni 3c4aa5ee67 (GLUI) Align title on the left 2015-10-28 09:54:08 +07:00
Jean-André Santoni cd733b803b (GLUI) Remove footer 2015-10-28 09:39:37 +07:00
twinaphex d1896ce4f4 (RGUI) Titles should uppercase on RGUI 2015-10-28 02:01:38 +01:00
twinaphex 5da51f5d1a More dehardcoding of upper case strings 2015-10-28 01:54:54 +01:00
twinaphex 89ea9ccbf0 Dehardcode upper-case strings 2015-10-28 01:52:20 +01:00
twinaphex d4a0da8e7b Don't log spam anymore 2015-10-28 01:37:50 +01:00
twinaphex 6b15d86c5c (Menu) Don't uppercase titles always
(GLUI) Show switch icons for certain text strings too
2015-10-28 01:36:36 +01:00
twinaphex df01279cf3 Add non-HAVE_MENU ifdefs 2015-10-28 00:55:11 +01:00
twinaphex cf7a5f6361 (GLUI) Update 2015-10-27 23:52:20 +01:00
Twinaphex 5cad96763f Merge pull request #2297 from lakkatv/material
(GLUI) Graphical switch buttons
2015-10-27 20:09:26 +01:00
Jean-André Santoni 3ba0332b52 (GLUI) Graphical switch buttons 2015-10-28 00:51:22 +07:00
Twinaphex ccafcbdabc Merge pull request #2296 from lakkatv/material
Material
2015-10-27 18:47:33 +01:00
Jean-André Santoni 1d7e83c6d6 (GLUI) Display a BACK icon 2015-10-27 22:49:48 +07:00
Jean-André Santoni cc853ac1ef (GLUI) Use Roboto-Regular, add shadows, fix colors and scrollbar dimensions 2015-10-27 20:03:38 +07:00
twinaphex 1a2b806d01 (GLUI) Remove unused variables 2015-10-27 13:00:18 +01:00
Jean-André Santoni 3d64d50f5c (GLUI) Fix text color, fix color and margin of the scrollbar to match material guidelines 2015-10-27 18:42:28 +07:00
Jean-André Santoni 0a36782f4a (GLUI) Texture for the cursor. Clone the texture system of XMB to allow adding icons in the future. 2015-10-27 18:37:13 +07:00
Jean-André Santoni ea913a157f (XMB) Fix pointer display and use the new pointer size (update assets) 2015-10-27 18:37:13 +07:00
Jean-André Santoni 99c0eaa0f9 (GLUI) Use material palette 2015-10-27 18:37:13 +07:00
twinaphex 7ea6cb164e (Zarch) Free zui->ca upon exiting 2015-10-27 12:19:41 +01:00
twinaphex 07cb4fd445 Re-grab menu_stack pointer 2015-10-27 12:11:23 +01:00
twinaphex a9b9f20a32 Add if 0 around problematic code 2015-10-27 12:08:45 +01:00
twinaphex 53d95a1ac9 Fix menu_entries_increment_* functions 2015-10-27 12:06:29 +01:00
twinaphex 179f624d8e Add something more to debug output 2015-10-27 11:52:12 +01:00
twinaphex 20250978b1 (Zarch) Show labels again 2015-10-27 11:42:54 +01:00
twinaphex 795fa14c40 Fix signature 2015-10-27 11:37:13 +01:00
twinaphex de4102c8f7 (menu_entries.c) 2015-10-27 11:34:41 +01:00
twinaphex 54b2774f39 Add menu_entries_increment_selection_buf/menu_entries_increment_menu_stack 2015-10-27 10:59:20 +01:00
twinaphex 48495d839d (menu_entries.c) Cleanups 2015-10-27 10:53:14 +01:00
twinaphex 5032f59f54 (menu_entries.c) Separate initialization loop for selection_buf array 2015-10-27 10:51:33 +01:00
twinaphex 30fb40ad87 Add menu_entries_push_selection_buf 2015-10-27 10:45:06 +01:00
twinaphex bb6f66fc44 Add menu_entries_push_menu_stack 2015-10-27 10:41:59 +01:00
twinaphex 6826a3833e menu_entries_get_menu_stack_ptr - add idx parameter 2015-10-27 10:33:19 +01:00
twinaphex ab9006f21e Add 'idx' to menu_entries functions 2015-10-27 10:29:50 +01:00
twinaphex 41344960f5 Fix initialization of menu lists 2015-10-27 10:15:39 +01:00
twinaphex 0d89bca635 Start setting up menu_entries function so we can access
multiple stacks
2015-10-27 10:10:33 +01:00
twinaphex 42751462c0 (menu_entries.c) Have pointers to pointers for menu lists 2015-10-27 09:58:01 +01:00
twinaphex 88060f7142 (Zarch) Remove double entry in menu stack 2015-10-27 09:18:37 +01:00
Jean-André Santoni 0b48af4781 (XMB) Fix cursor alpha 2015-10-27 15:05:02 +07:00
twinaphex 8f8d75de00 (xmb) CLeanups 2015-10-27 08:02:15 +01:00
twinaphex 1494437191 (Zarch) Cleanups 2015-10-27 07:56:32 +01:00
twinaphex ada6fc9258 (Zarch) Some refactors 2015-10-27 07:05:07 +01:00
twinaphex 240dc67e1b Update ID correctly according to menu entry 2015-10-27 07:03:02 +01:00
twinaphex 40313123dc (Zarch) Set default zarch tab 2015-10-27 06:22:50 +01:00
twinaphex 4afc123c84 (Zarch) Cleanups 2015-10-27 06:11:51 +01:00
twinaphex 9cae5d4493 (Zarch) Rename some variables 2015-10-27 05:45:24 +01:00
twinaphex e0bb45eda6 (Zarch) Cleanups 2015-10-27 05:23:45 +01:00
twinaphex 405e2fa370 Start hooking up saner gamepad controls 2015-10-27 04:34:16 +01:00
twinaphex dcd0abcfd0 (Zarch) Respect immediate mode code design better 2015-10-27 03:21:54 +01:00
twinaphex 0dc9c8df95 Rename extraction_directory to cache_directory 2015-10-27 00:48:35 +01:00
twinaphex 53fe928b7b Rename Extraction Directory to Cache Dir 2015-10-27 00:44:20 +01:00
Twinaphex c02f0c5342 Remove some unused variables 2015-10-26 22:45:12 +01:00
twinaphex 16976eac88 (Zarch) Load tab cleanups 2015-10-26 22:29:21 +01:00
twinaphex 774de49e4a Create zarch_zui_render_root_load_free 2015-10-26 22:13:30 +01:00
twinaphex a1effd5123 (Zarch) Fix 'Home' button 2015-10-26 22:01:22 +01:00
twinaphex ef21718235 (Zarch) Improve Load tab 2015-10-26 21:59:26 +01:00
twinaphex 9e2dc0745e Add param to dir_list_new_special 2015-10-26 21:30:58 +01:00
twinaphex 071f828b5e Check if collections list size is greater than 0 first 2015-10-26 21:06:14 +01:00
twinaphex 30296ff81e Refactor menu_displaylist.c's iteration of cores - use string_list_new_special 2015-10-26 21:03:28 +01:00
twinaphex db5d8d248b Create new char_list_new_special 2015-10-26 19:41:20 +01:00
twinaphex b9febe2eed Add void pointer to string_list_special_new 2015-10-26 19:16:20 +01:00
twinaphex 2dd30f743d (Android) Fix warnings 2015-10-26 18:49:20 +01:00
Jean-André Santoni 85fc46fd6c (Menu) prevent incrementing and decrementing animations when not needed, fixes an animation bug in XMB 2015-10-26 16:19:11 +07:00
twinaphex 08a97a4ca3 Create string_list_special.c 2015-10-26 08:39:35 +01:00
twinaphex 1b51882b8a Start implementing playlist association callbacks 2015-10-26 07:16:37 +01:00
twinaphex ba88e3a515 Add MENU_FILE_PLAYLIST_ASSOCIATION type 2015-10-26 07:09:14 +01:00
twinaphex 826079d58f Start listing all playlists inside playlist settings 2015-10-26 06:55:42 +01:00
twinaphex 33f21a4b1f zarch_zui_push_quad - use existing array 2015-10-26 05:39:27 +01:00
twinaphex a4b1915b50 zarch_zui_snow is not dependent on zui struct now 2015-10-26 05:33:47 +01:00
twinaphex 6900744f35 Refactor zarch_zui_push_quad 2015-10-26 05:30:41 +01:00