Commit Graph

1669 Commits

Author SHA1 Message Date
Jean-André Santoni 0f6c3564dc (XMB) Use an easing function closer to the one used in PS3 2016-04-22 18:10:20 +07:00
Twinaphex 0f38dc8e3e Merge pull request #2886 from lakkatv/master
(XMB) Code cleaning
2016-04-22 12:56:21 +02:00
Jean-André Santoni f47c020946 (XMB) Code cleaning 2016-04-22 17:43:23 +07:00
Twinaphex 818009e75c Merge pull request #2885 from lakkatv/master
(Menu) Refactoring
2016-04-22 12:31:23 +02:00
Jean-André Santoni c7f8df9327 (Menu) Use MENU_DISPLAY_CTL_LIBRETRO_RUNNING in all menu drivers 2016-04-22 17:25:02 +07:00
Jean-André Santoni a06ebe33e4 (Menu) Remove useless variables 2016-04-22 17:21:52 +07:00
Jean-André Santoni d76cca7a47 (XMB) Use MENU_DISPLAY_CTL_LIBRETRO_RUNNING 2016-04-22 17:14:34 +07:00
Jean-André Santoni dad5215d93 (XMB) Rename variables 2016-04-22 17:11:56 +07:00
Twinaphex 397861ee7e Merge pull request #2884 from lakkatv/master
(XMB) Gradient improvements
2016-04-22 10:23:58 +02:00
Jean-André Santoni f8f8650349 (XMB) More gradients 2016-04-22 15:20:08 +07:00
Jean-André Santoni 171453ac1d (XMB) Use MENU_DISPLAY_CTL_DRAW instead of MENU_DISPLAY_CTL_DRAW_BG in xmb_draw_dark_layer 2016-04-22 14:27:34 +07:00
Jean-André Santoni fe255f103e (XMB) Use a separate function to darken the screen 2016-04-22 14:05:18 +07:00
Jean-André Santoni a4308640a2 (XMB) Gradient switching 2016-04-22 13:47:14 +07:00
twinaphex c11f06e584 (MaterialUI) Cleanups 2016-04-22 08:07:03 +02:00
Jean-André Santoni 989823691e (XMB) Normalize the shadows setting name 2016-04-22 12:46:56 +07:00
Jean-André Santoni a1e91ff606 (XMB) Ribbon Enable setting 2016-04-22 12:32:32 +07:00
twinaphex 0c0134d4d6 Revert "Cleanups"
This reverts commit d239bee4e8.
2016-04-21 21:24:14 +02:00
twinaphex d0a87a236d Do blending begin/end only once instead of for every item 2016-04-21 10:16:21 +02:00
twinaphex a908cf4101 Do blending begin / end only once for horizontal tabs 2016-04-21 10:14:46 +02:00
twinaphex d239bee4e8 Cleanups 2016-04-21 09:39:36 +02:00
twinaphex 15530a351b (MaterialUI) Cleanups 2016-04-21 09:28:22 +02:00
twinaphex 2c75c45f3b Refactor xmb_draw_icon 2016-04-21 09:18:03 +02:00
twinaphex ba91ae5909 (XMB) Refactor icon code 2016-04-21 09:14:25 +02:00
twinaphex 1add138dae (XMB) Cleanups 2016-04-21 07:02:30 +02:00
twinaphex 9ba0cbfac7 Cleanup menu_display_draw_cursor 2016-04-21 05:08:36 +02:00
twinaphex af976d5da3 Cleanup xmb_draw_bg 2016-04-21 05:04:01 +02:00
twinaphex 3ddb5d51b3 Cleanups 2016-04-21 04:54:07 +02:00
twinaphex c9ed624078 Create menu_display_set_alpha 2016-04-21 04:34:02 +02:00
twinaphex 02776fed31 (XMB) Cleanups 2016-04-21 04:17:45 +02:00
twinaphex f2ed54fcf3 (XMB) cleanups 2016-04-21 04:12:24 +02:00
Jean-André Santoni 01dcf48c5b (XMB) Fix some icons in the quick menu 2016-04-21 02:53:42 +07:00
twinaphex 8de7fa63ae Remove this - seems to be unnecessary 2016-04-20 21:40:30 +02:00
Jean-André Santoni 343824858b (XMB) Disable ribbon 2016-04-21 01:29:37 +07:00
Jean-André Santoni 04370c6597 (XMB) Separate xmb_draw_bg and xmb_draw_ribbon. Fixes the black help layer. 2016-04-21 01:20:52 +07:00
Jean-André Santoni 252414f4d7 (XMB) Move the ribbon display code to menu_display 2016-04-21 01:18:30 +07:00
Jean-André Santoni 0bdf68d0ea (XMB) Temporary fix for the GLSL ribbon on OSX 2016-04-21 00:26:05 +07:00
Jean-André Santoni 29d07d1ba6 (Menu) Fix a regression in xmb_draw_text 2016-04-20 23:25:52 +07:00
twinaphex a912a64514 (XMB) Cleanups 2016-04-20 17:37:31 +02:00
twinaphex a7142680ca (XMB) Cleanup 2016-04-20 17:34:15 +02:00
twinaphex a713325459 (XMB) Clenaups 2016-04-20 08:01:51 +02:00
Twinaphex 6fe8637f6a Merge pull request #2875 from fr500/master
[zr] update to the new toolkit
2016-04-20 07:52:58 +02:00
radius 2443c34ae2 [nk] make it render something again 2016-04-20 00:46:41 -05:00
twinaphex 9af9a1c89e Cleanups 2016-04-20 07:31:26 +02:00
twinaphex d7e6ada920 Rename mui_blit_line 2016-04-20 07:07:14 +02:00
twinaphex a1969de2c3 Create menu_display_draw_text 2016-04-20 06:56:19 +02:00
twinaphex 4325a323e5 Remove duplicate blending 2016-04-19 23:40:36 +02:00
twinaphex a29ac9598a (XMB) Don't need to include glsym anymore 2016-04-19 23:15:17 +02:00
twinaphex 1bbc2f09b5 (courtesy of teepee) Rewrite the ribbon code to use the coordinate
array
2016-04-19 23:00:55 +02:00
twinaphex 65bd8194cd Cleanup 2016-04-19 17:37:27 +02:00
twinaphex 17273493ef (Menu) Create viewport function callback 2016-04-19 08:50:35 +02:00
twinaphex cddeabd4ec (Zarch) Cleanup 2016-04-19 08:36:20 +02:00
twinaphex 1aa8a950ef Set draw->x/draw->y outside before calling MENU_DISPLAY_CTL_DRAW_BG 2016-04-19 07:58:50 +02:00
twinaphex cbcbd895d2 Create menu_display_draw_cursor - code de-duplication 2016-04-19 07:41:05 +02:00
twinaphex 528eddbed5 Cleanups for cursor code 2016-04-19 07:35:26 +02:00
twinaphex 846bea4074 (XMB) Cleanup 2016-04-19 07:24:37 +02:00
twinaphex 0283a87560 (XMB) Disable XMB ribbon 2016-04-19 07:17:39 +02:00
twinaphex ee639d8b20 (XMB/Zarch) Use same coord array for XMB/Zarch 2016-04-19 07:17:17 +02:00
twinaphex 03de4a0b35 Change argument order of menu_display_push_quad 2016-04-19 07:04:00 +02:00
twinaphex c761b14eb4 Move zarch_zui_push_quad and zarch_zui_snow to menu_display 2016-04-19 06:57:53 +02:00
radius 86388cddfe [zr] start moving to the new version 2016-04-18 18:46:33 -05:00
radius ddd8e29d87 [zr] start moving to the new version 2016-04-18 18:00:13 -05:00
radius 8b302c369e [zr] start moving to the new version 2016-04-18 17:59:32 -05:00
twinaphex c75143a62f CXX_BUILD fixes 2016-04-18 02:56:42 +02:00
twinaphex ab1c26d532 (XMB) Cleanups 2016-04-18 02:27:46 +02:00
twinaphex a8b8ca7a96 Cleanup mui_context_reset_textures 2016-04-18 02:24:37 +02:00
twinaphex 06796bcc14 Refactor xmb_context_reset_textures 2016-04-18 02:20:54 +02:00
twinaphex 8a8a270159 (XMB) Cleanups 2016-04-18 02:10:24 +02:00
twinaphex c7be8edd89 (XMB) Cleanups 2016-04-18 01:53:50 +02:00
twinaphex 38cc90d0e0 (XMB) Refactor ribbon 2016-04-18 01:52:16 +02:00
twinaphex 3264426a96 (XMB) Add coord_array 2016-04-17 23:23:48 +02:00
twinaphex 34389dbd22 Remove useless glVertexPointer call 2016-04-17 20:42:12 +02:00
twinaphex 2fc465ea83 Disable Ribbon by default 2016-04-17 20:14:12 +02:00
Twinaphex 287fa45e73 Merge pull request #2871 from lakkatv/master
(XMB) Ribbon: use gfx_coords_t, and unhardcode some numbers
2016-04-17 20:11:29 +02:00
Jean-André Santoni 0410d7a59e (XMB) Ribbon: use gfx_coords_t, and unhardcode some numbers 2016-04-18 01:05:27 +07:00
twinaphex 09b0a09ca2 Alpha needs to be set to 0.90 for gradient ribbon background,
otherwise fadeout will not work properly when we are at the info
screen
2016-04-17 18:20:41 +02:00
twinaphex ec4f961348 (XMB Cg) Ribbon works with Cg now too 2016-04-17 17:59:40 +02:00
twinaphex e48e294009 (XMB Ribbon) Make gradient background transparent when libretro
core is running
2016-04-17 06:56:26 +02:00
twinaphex 58f145282e (XMB) Set uniform to vertex program and add 'add_prefix' to uniform_info struct 2016-04-17 06:11:48 +02:00
Twinaphex 0f337d49c8 (XMB) Remove unused variable 2016-04-17 04:29:37 +02:00
twinaphex b3220cf53e Move zahnrad shaders to separate files 2016-04-17 02:36:07 +02:00
Twinaphex 3a717adbf9 Revert "(XMB) Apply the fade in animation on the ribbon when launching RA or…" 2016-04-16 23:18:25 +02:00
Jean-André Santoni 6f4e3079bd (XMB) Apply the fade in animation on the ribbon when launching RA or toggling the menu 2016-04-17 03:46:39 +07:00
Jean-André Santoni 8317c5849c (XMB) Draw gradient 2016-04-17 03:06:20 +07:00
Jean-André Santoni 1b0381ca02 (XMB) Slower the ribbon 2016-04-17 02:54:00 +07:00
Jean-André Santoni 5bdd9be52b (XMB) Refactor ribbon init 2016-04-17 02:50:17 +07:00
twinaphex a969547e81 Add XMB_RIBBON_ENABLE switch to XMB 2016-04-16 21:09:54 +02:00
twinaphex ad627701da (XMB) Cleanups 2016-04-16 17:57:51 +02:00
twinaphex 00c7d918e9 (XMB) Comment out unused variables 2016-04-16 07:33:56 +02:00
Twinaphex 5bba5813cf Cleanups - remove unused variables 2016-04-16 07:27:47 +02:00
twinaphex 6f0011fd9f xmb_thumbnails_ident - cleanup 2016-04-16 05:07:08 +02:00
Jean-André Santoni b5dc5470a4 (XMB) Thumbnails: workaround for titles containing slashes 2016-04-16 02:10:30 +07:00
twinaphex 6f6330576c (zr_common.c) Cleanups 2016-04-15 07:45:59 +02:00
twinaphex 9d85afd358 Refactor SHADER_CTL_USE 2016-04-15 07:37:06 +02:00
twinaphex e1a3ceaaee draw_bg operation should not implicitly enable/disable blending -
should be done outside
2016-04-12 22:24:33 +02:00
twinaphex 83efd732dd (XMB) Move set viewport call outside 2016-04-12 20:17:50 +02:00
twinaphex 033cecf08c (menu_display) Cleanups 2016-04-12 20:07:23 +02:00
twinaphex c390794452 (XMB) Change types 2016-04-12 16:26:36 +02:00
twinaphex 64f53d8237 (XMB) Refactor blend begin/end 2016-04-12 16:25:13 +02:00
Jean-André Santoni 0e393211f3 (XMB) White texture that will be used for the ribbon 2016-04-12 09:53:51 +07:00
Jean-André Santoni ea6bd2797c (Menu) Move the white texture stuff to menu_display 2016-04-12 04:30:25 +07:00
Jean-André Santoni 8e86d11f57 Add list_prepend to the menu ctx drivers 2016-04-11 23:31:49 +07:00
twinaphex 7e7a1fa5f9 Rename menu_entries_push to menu_entries_add 2016-04-11 05:49:39 +02:00
Twinaphex 2bcc36b387 Remove unused variables 2016-04-10 16:25:24 +02:00
Jean-André Santoni 64e2f9e2f0 (XMB) Subtler drop shadows 2016-04-09 13:23:59 +07:00
Jean-André Santoni 8c02d63f2e (XMB) Add support for the RetroActive theme 2016-04-09 12:46:40 +07:00
Twinaphex 5218be3a0c Merge pull request #2842 from lakkatv/master
(XMB) Thumbnail type switching
2016-04-07 20:48:19 +02:00
Jean-André Santoni 7dfb3c373a (XMB) Thumbnail type switching 2016-04-08 01:42:53 +07:00
Twinaphex 013e9cd8cb Merge pull request #2841 from lakkatv/master
(XMB) Shadows
2016-04-07 19:32:40 +02:00
Jean-André Santoni 53a1369dba (XMB) Shadows 2016-04-08 00:24:55 +07:00
Twinaphex 01f83ba289 Merge pull request #2840 from lakkatv/master
(XMB) Refactoring, draw_icon can call draw_icon_predone
2016-04-07 18:48:19 +02:00
Jean-André Santoni e96c2b4ef3 (XMB) Refactoring, draw_icon can call draw_icon_predone 2016-04-07 23:43:04 +07:00
radius 80ea008e77 [zr] make the wizard step 3 match the other steps 2016-03-23 23:46:05 -05:00
radius 9b1ada22b9 remove unused variable 2016-03-23 23:38:22 -05:00
radius 8fcfa3659a add gamepad POC panel 2016-03-23 23:32:49 -05:00
twinaphex e41127459e Rename 'filestream' functions 2016-03-24 04:09:25 +01:00
Jean-André Santoni 2640748b89 (XMB) Use a PSP-like layout for screen smaller than 640px 2016-03-24 07:23:04 +07:00
twinaphex 072d6ff125 Rename gfx_coord_array_add to gfx_coord_array_append 2016-03-23 07:01:54 +01:00
twinaphex 3e3cc9f2f2 Replace zr_common_file_load again 2016-03-22 05:58:16 +01:00
twinaphex 2e11895ef9 (zahnrad) Add HAVE_OPENGL ifdef 2016-03-22 05:52:46 +01:00
twinaphex 1af81201a0 Go back to this 2016-03-22 05:50:40 +01:00
twinaphex 6f37163675 CXX_BUILD warning fixes 2016-03-22 02:59:13 +01:00
twinaphex 6f5be6b3b3 (zahnrad) Style nits 2016-03-22 01:40:09 +01:00
twinaphex b00878a595 (zr_common.c) Cleanups 2016-03-22 01:20:41 +01:00
twinaphex ddb912b373 Use uintptr_t instead of GLuint 2016-03-22 01:17:00 +01:00
twinaphex e9fd6863ce Rewrite zr_common_file_load to use file_stream.h 2016-03-22 01:16:08 +01:00
twinaphex 79008d4fd6 (Zahnrad) We don't need the VAO 2016-03-22 01:04:00 +01:00
twinaphex c18da3039f zr_common_image_load - go through video_texture_image_load/video_driver_texture_load 2016-03-22 01:00:34 +01:00
twinaphex 5eba4984cf (zr_common.c) Refactor 2016-03-21 21:51:24 +01:00
twinaphex 42725179ec Refactor zr_common.c 2016-03-21 21:50:23 +01:00
twinaphex e83d460997 (zr_common) Call menu_display_ctl for blend end 2016-03-21 21:45:06 +01:00
twinaphex 7b48a0c57e (XMB) Prevent symbol collission 2016-03-21 21:18:25 +01:00
Jean-André Santoni 66544dcea4 (XMB) Theme switching 2016-03-22 02:54:16 +07:00
twinaphex 4d30df7a64 Header cleanup 2016-03-21 19:23:45 +01:00
twinaphex ac6362cae4 Combine list_special files 2016-03-20 17:28:24 +01:00
twinaphex 93b7dc1bdd (libretro-common) move 'lists' files to lists/ 2016-03-20 14:53:54 +01:00
radius 82084205d8 [zr] we don't need to pass the context we already have that in the menu handle 2016-03-09 20:14:01 -05:00
radius 53be91af9e style nits 2016-03-09 16:17:18 -05:00
radius 7f8c6f50e3 [zr] split GL code in another file
This makes zahnrad reusable in other menu drivers
2016-03-09 15:33:27 -05:00
radius 26e171cfbc [zr] add wizard page indicator 2016-03-07 18:17:57 -05:00
radius 58ef1541c2 [zr] start implementing wizard 2016-03-07 00:27:40 -05:00
radius 4e4c69a3dc [zr] save window state so it can be restored after a context reset 2016-03-07 00:27:39 -05:00
radius 34d618238b [zr] tidy up zr_common 2016-03-06 14:13:20 -05:00
radius cc250f755b [zr] fix message 2016-03-05 23:09:28 -05:00
radius 1ee45f2162 [zr] add an extra image to the wizard stub 2016-03-05 23:05:16 -05:00
radius f73d086abd [zr] add image loading code (stb) 2016-03-05 23:02:29 -05:00
radius 992c66ffc8 [zr] add image loading code (stb) 2016-03-05 22:54:56 -05:00
radius 0eba3fe791 [zr] add wizard window stub 2016-03-05 22:24:01 -05:00
radius a0eb17200b [zr] rename function 2016-03-05 21:59:01 -05:00
twinaphex 5e87fd5ecc Include stdarg.h 2016-03-06 03:57:37 +01:00
radius d860642c75 [zr] split the window code to zr_common 2016-03-05 21:52:09 -05:00
radius c2e4eb772d [zr] refactor structures pt.2 2016-03-05 21:13:25 -05:00
radius 2809074ccd [zr] refactor structures pt.1 2016-03-05 21:13:24 -05:00
twinaphex a73cbb6114 (zahnrad) Use menu_texture_item 2016-03-05 08:42:35 +01:00
twinaphex 1742b96ec0 Add menu_texture_item 2016-03-05 08:40:28 +01:00
radius d647c1b215 [zr] hook up the scroll wheel 2016-03-05 01:26:45 -05:00
radius 145979ddcb [zr] label fix 2016-03-05 00:52:59 -05:00
radius 052730bbf1 [zr] refactor most of the menu, have a global state, width, height now 2016-03-05 00:50:57 -05:00
radius 0ce76cbf5b [zr] remove more glui code 2016-03-04 15:08:43 -05:00
twinaphex acdf0eb74e Fix C89_BUILD 2016-03-04 19:48:05 +01:00
twinaphex 0140f989c3 Fix CXX_BUILD 2016-03-04 19:46:25 +01:00
twinaphex ed54600b41 (XMB) Start using DISPLAYLIST_SETTING 2016-03-04 07:41:45 +01:00
twinaphex b03487dc4f Start using DISPLAYLIST_SETTING 2016-03-04 07:37:40 +01:00
radius f86097aefb [zr] remove a lot of glui code 2016-03-03 22:31:38 -05:00
radius 5b11e290dd [zr] add entry for test window 2016-03-03 18:39:14 -05:00
radius d9bc760b46 [zr] fix window opening and closing 2016-03-03 18:39:13 -05:00
radius dfefefb416 [zr] change the window hiding method a bit 2016-03-03 18:39:10 -05:00
twinaphex 5a1d8a96d0 (Menu) Create new input_ctl actions for pointer dragging 2016-03-03 23:21:02 +01:00
twinaphex fe3c279f73 Cleanups 2016-03-03 06:59:54 +01:00
twinaphex 5cef419209 (zahnrad) Get past crash when shader is NULL 2016-03-03 06:21:40 +01:00
radius 4617f792c5 [zr] implement combo box for recents 2016-03-02 22:41:28 -05:00
radius c2bd46e3cb [zr] remove most glui drawing code 2016-03-02 19:28:46 -05:00
twinaphex b7ef5271ea zrmenu_set_style - C89 fix 2016-03-03 00:43:53 +01:00
radius 1cea6cd7be [zr] implement 'bool' parameters 2016-03-02 18:08:57 -05:00
radius e9ce64e854 [zr] implement shader parameters dialog 2016-03-02 17:14:50 -05:00
radius 55530dcbc3 [zr] implement exit, make clics respond even when the window is innactive 2016-03-02 16:24:36 -05:00
radius 7853815d45 [zr] change layout 2016-03-02 16:24:35 -05:00
twinaphex 1645ae54be (Zarch) Cleanups 2016-03-02 22:21:12 +01:00
twinaphex 30fa73dc8d (Zarch) Create typedef zarch_texture_item 2016-03-02 22:19:20 +01:00
twinaphex 7df467422b Create typedefs 2016-03-02 22:17:05 +01:00
radius 1d0beeb665 [zr] set focus properly 2016-03-02 11:03:10 -05:00
radius 4eb6f26d92 [zr] update zahnrad 2016-03-02 11:01:22 -05:00
radius 780974ef32 [zr] change menu label 2016-03-02 02:51:03 -05:00
radius 8c86c6a47c [zr] hide/unhide window concept 2016-03-02 02:49:07 -05:00
radius 272563f3ca [zr] hide/unhide window concept 2016-03-02 02:48:51 -05:00
radius 8d89b1fa86 [zr] draw window offscreen till a better solution is available 2016-03-02 01:49:57 -05:00
radius 2807f94a14 [zr] hide/unhide windows 2016-03-01 23:43:15 -05:00
radius 1b1b59692b [zr] add menu bar 2016-03-01 23:20:43 -05:00
radius d2d4312128 [zr] start adding main window 2016-03-01 21:49:30 -05:00
radius 0b9ea0943b [zr] cleanups 2016-03-01 18:54:46 -05:00
twinaphex 6f80e09ce1 Change MIN/MAX to upper-case 2016-03-02 00:07:31 +01:00
twinaphex cbc575eec0 (zarch) Prevent some more NULL pointer dereferences when using the mouse 2016-03-01 17:33:36 +01:00
radius 3f22d5cb33 make the gui a bit flatter 2016-02-28 23:52:33 -05:00
radius 7e1e330463 add context menu to demo window 2016-02-28 23:43:02 -05:00
radius a6f015623a stub function for kbd input 2016-02-28 23:35:22 -05:00
twinaphex 042e4b0ba7 (Zarch) Style nits 2016-02-29 02:52:00 +01:00
twinaphex 070f25131a (Zarch) Cleanups 2016-02-29 02:48:29 +01:00
Twinaphex e5e11ae716 Remove unused variable 2016-02-29 02:41:06 +01:00
twinaphex 28a02da5bf Cleanups 2016-02-29 02:38:11 +01:00
twinaphex 91d19a15ec Take this out 2016-02-29 02:36:18 +01:00
twinaphex 28bb5295f7 (menu/drivers/zarch.c) Use strlcpy instead of strncpy 2016-02-29 02:17:53 +01:00