Commit Graph

339 Commits

Author SHA1 Message Date
twinaphex e6b3bb079b (RMenu/RGUI) Add rgui->current_pad 2013-05-04 16:15:05 +02:00
Themaister 81e8a51728 Should fix RMenu zip support. 2013-05-01 01:18:01 +02:00
Themaister e2229ec3c3 Use strcasecmp in extension checking. 2013-04-30 23:58:49 +02:00
Themaister c87e79556d Add zip extensions to RMenu as well. 2013-04-30 23:48:14 +02:00
twinaphex eeaa53b127 (XDK1/RMenu) Build fix 2013-04-29 17:08:24 +02:00
twinaphex 6cee86c768 (RMenu) Get rid of main_wrap savestate_dir/sram_dir 2013-04-29 05:44:32 +02:00
twinaphex b0968790c6 (RMenu) Add preliminary Load Game History - now just need to
properly set up rarch_console_exec for arg passing (PS3/Xbox 1/360)
2013-04-29 05:17:22 +02:00
twinaphex 7eafb676e3 (RMenu) Cleanups 2013-04-29 04:55:49 +02:00
twinaphex 51aa5b170f (RMenu) Fixes/cleanups 2013-04-29 03:59:48 +02:00
twinaphex 4a772c3fa8 (Wii) Working Load Game History 2013-04-29 03:05:46 +02:00
twinaphex 5aa4101620 (Menu) Move MODE_LOAD_GAME mechanics to upper function rarch_main 2013-04-28 15:00:37 +02:00
twinaphex 6b6dd4fc4e (RMenu) Fixes rotation 2013-04-27 18:37:05 +02:00
twinaphex 40ac65f8ef (RMenu) Cleanups 2013-04-27 18:09:47 +02:00
twinaphex e61ef2322c (RMenu) fixes menu toggle 2013-04-27 17:44:39 +02:00
twinaphex c92585e6a3 (RMenu) Sligtly better menu toggle but still screwed up 2013-04-27 16:49:39 +02:00
twinaphex 19b8877e18 (RMenu )(Very glitchy) menu toggle 2013-04-27 16:22:26 +02:00
twinaphex 3dba1b2cb4 (RMenu) Menu pop/push stack refactors 2013-04-27 15:42:33 +02:00
twinaphex 28eaf7b128 (RARCH_CONSOLE) Build fix 2013-04-27 15:07:59 +02:00
twinaphex 3b2d41360c (RMenu) Initial 'doing menu toggle' without delay timers 2013-04-27 14:52:39 +02:00
twinaphex 5f449fc870 (RMenu) Add Settings link to Quick Menu 2013-04-27 03:50:42 +02:00
twinaphex 34619412bc (RARCH_CONSOLE) Get rid of video_stop_func 2013-04-24 16:08:18 +02:00
twinaphex 36d34871fb (RMenu) Change ingame menu ordering to match RGUI's 2013-04-23 23:22:50 +02:00
twinaphex fda5db7476 (CONSOLE) Get rid of system_deinit_save and system_post_init 2013-04-23 01:55:00 +02:00
twinaphex e303156ffc (RMenu) Fix title at bootup 2013-04-22 22:25:57 +02:00
twinaphex 7a2c78ae68 Start unifying global init/deinit code for console 2013-04-22 22:16:46 +02:00
twinaphex c68d3fd512 (RMenu) Reduce calls to browser_update 2013-04-20 00:47:21 +02:00
twinaphex b7e71f17b8 (RMenu/RGUI) Move menu_iterate to upper-layer menu_common 2013-04-19 17:53:01 +02:00
twinaphex dd9e6029c2 (RMenu/RGUI) Make menu_iterate almost the same in both RGUI and RMenu - now we
can start moving it to the upper layer
2013-04-19 17:34:46 +02:00
twinaphex 2cef7466a8 (RMenu/RGUI) Don't set first delay timer 2013-04-19 00:52:37 +02:00
twinaphex a979cba13c (RMenu/RGUI) Standardization pt. 1 2013-04-18 23:00:27 +02:00
twinaphex 24e3f0d2ee (RMenu/RGUI) Move DEVICE_NAV_* enums to menu_common.h 2013-04-18 19:08:17 +02:00
twinaphex 798f40b6a1 (RMenu/RMenu XUI) Move browser_update to upper-layer menu_common.c -
use same function for both RMenu and RMenu XUI
2013-04-18 19:05:43 +02:00
twinaphex 96f2ecce20 (RMenu/RGUI) Move filebrowser/menu stack initialization to upper-layer
menu_init() function
2013-04-18 18:33:03 +02:00
twinaphex 5b35feddae (RMenu/RGUI) Free rgui and filebrowser in upper-layer menu_free() function 2013-04-18 17:29:04 +02:00
twinaphex 7c4b730e51 (RMenu/RGUI) Move menu_init/menu_free to menu_common.c 2013-04-18 14:58:47 +02:00
twinaphex 54725d009c (RMenu/RGUI) Use similar defines for menu 2013-04-18 02:48:18 +02:00
twinaphex 84f80dc2c1 (RMenu/RGUI) Create menu_common to tie RMenu/RGUI more closely together 2013-04-17 23:31:49 +02:00
twinaphex 161dd5741f (RGUI/RMenu) Standardize somewhat 2013-04-17 21:11:13 +02:00
twinaphex 6f226c1c01 (RMenu) Drop msg_queue_pull from menu_iterate 2013-04-16 02:13:53 +02:00
twinaphex c0deb826de (RMenu) Backport shader_manager_init to RMenu 2013-04-16 01:27:43 +02:00
twinaphex 909e1fadc8 (RMenu) Refactors - create rmenu_iterate - try to make
menu_iterate / menu_free / menu_init as much like RGUI as possible
2013-04-16 01:10:53 +02:00
twinaphex 71faee1d4d (RMenu) Fix logic error in applying CGP changes 2013-04-16 00:16:26 +02:00
twinaphex 6e56c552b4 (RMenu) Use g_settings.video.shader_path - properly set g_settings.video.shader_enable
based on return of video_set_shader_func - remove g_extern.file_state.cgp_path
2013-04-14 15:43:02 +02:00
twinaphex f9c383e86e (RMenu/XDK1) Fix some warnings 2013-04-14 14:59:36 +02:00
twinaphex c1f6b80be9 (RMenu) Draw menu panel for currently selected Core option 2013-04-14 12:52:39 +02:00
twinaphex 23fff4cb9d (RMenu) Xbox build fix 2013-04-13 23:51:13 +02:00
twinaphex 0fa54e6db0 (RMenu) Need to call set_texture_frame when menu texture changes as well 2013-04-13 22:43:59 +02:00
twinaphex b006f01029 (RMenu) Do set_texture_frame only once in menu_init - solves busy loop
problem with XMB overlay
2013-04-13 22:38:57 +02:00
twinaphex 08f5ee4dc0 (RMenu) Shader Manager build fix 2013-04-13 22:20:02 +02:00
twinaphex 4586b12173 (RMenu) Fix Shader Manager bug 2013-04-13 22:07:20 +02:00
twinaphex e575e3acc7 (RMenu) Pop menu behavior management 2013-04-13 21:40:48 +02:00
twinaphex 16c984b5e0 (RMenu) Cleanups 2013-04-13 19:13:00 +02:00
twinaphex a7a4b071c4 (RMenu) Cleanups to select_setting 2013-04-13 18:56:05 +02:00
twinaphex a4ae3f0679 (RMenu) Don't use item struct anymore 2013-04-13 18:47:42 +02:00
twinaphex 5a7f6b4471 (RMenu) Less verbose help messages, less clutter 2013-04-13 18:10:39 +02:00
twinaphex 6824617031 (XDK1/RMenu) Build fix 2013-04-13 17:00:46 +02:00
twinaphex e9fb07e352 (RMenu) ifndef HW_TEXTURE_FILTER so that Hardware Filtering only appears
for devices with fixed-function GPUs
2013-04-13 16:53:58 +02:00
twinaphex 53d5678b85 (RMenu) Take out RMENU_LOW_RAM_MODE 2013-04-13 16:32:40 +02:00
twinaphex 34a66a45ea (RMenu) Only set y member of menu_panel 2013-04-13 15:53:44 +02:00
twinaphex 6b01ce78cc (XDK1) Reduce menu image to 320x240 and upscale to 640x480 -
to hell with how this looks - it saves over 2MB of RAM - you
try and justify that over stupid eye candy on an outdated
console and I'll call you a damn fool
2013-04-13 15:19:57 +02:00
twinaphex 6b94b53bfc (XDK1) Reduced size of menu panel PNG - SFA3 now fits into RAM 2013-04-13 14:55:11 +02:00
Themaister e389220df8 Refactor frame_counter.
Graphics drivers get the task of updating this.
If threaded driver is used, main thread cannot update the counter
due to race conditions.
2013-04-13 14:28:12 +02:00
twinaphex c51347c532 Drop MODE_VIDEO_SCREENSHOTS_ENABLE 2013-04-13 09:09:56 +02:00
twinaphex 2b3334fc23 (RMenu) use memcpy/memset to copy over/flush from one struct to another
(for pop_menu_stack/push_menu_stack purposes)
2013-04-12 12:41:49 +02:00
twinaphex f8a040e286 (Filebrowser) Refactor filebrowser - get rid of second filebrowser
instance in rmenu.c
2013-04-12 12:25:36 +02:00
twinaphex 345a9c77e8 (Filebrowser) Don't expose filebrowser_get_current_path function 2013-04-12 10:33:55 +02:00
twinaphex 459a371982 (RMenu) Slimmer filebrowser dir popping 2013-04-12 00:16:23 +02:00
twinaphex 9d53311e33 (Filebrowser) Get rid of unnecessary filebrowser_init 2013-04-11 23:00:01 +02:00
twinaphex 7bb9f0d288 (RMenu) No longer rely on MODE_MENU_DRAW 2013-04-11 15:29:43 +02:00
twinaphex ea969282f4 (XDK1 RMenu) Don't call texture_image_render for panel anymore in rmenu.c 2013-04-11 15:05:42 +02:00
twinaphex 0f60833cac (RMenu) Do video rendering in RMenu after input - same as RGUI - will also
avoid having to 'skip' video swap when doing the render cached
frame call
2013-04-11 15:00:58 +02:00
twinaphex 8c777110f7 (RMenu) Run glClear or equivalent function at start of driver_frame function
so that we can use rarch_render_cached_frame for menu purposes at
all times (instead of doing explicit clearing in our menu loops
beforehand for low-RAM modes where no menu texture is being drawn
but we don't want ghosting in the picture)
2013-04-11 13:42:02 +02:00
twinaphex 1171b7576a Get rid of set_blend callback - the rgui draw texture function is
now in charge of making sure texture is properly blended - note
to OV2/maister - test if this breaks D3D9 PC driver and if so
fix accordingly
2013-04-11 13:13:37 +02:00
twinaphex 2c29884d7d (RMenu) Don't break menu stack when shortcut exiting from screenshot mode 2013-04-10 19:12:25 +02:00
twinaphex 37b90574ac (PS3 RMenu) Fullblown shader manager support - still unsure whether
I'm setting FBO values right though - maister - please code review
the FBO scaling incrementing/decrementing logic
2013-04-10 15:57:36 +02:00
twinaphex adbfa4af90 (RMenu) Get rid of checks for main_is_init (for load/save CGP) 2013-04-10 13:24:56 +02:00
twinaphex 872c0a8133 (RMenu XDK1) Build fix 2013-04-10 13:24:27 +02:00
twinaphex ad31643b51 (PS3 RMenu) Add initial options to Shader Manager - Load CGP function
works
2013-04-10 13:17:01 +02:00
twinaphex c52530d03e (RMenu) Stub Shader Manager menu in - now to fill it in 2013-04-10 11:20:28 +02:00
twinaphex 4c0da898ae (RMenu) Simplify some more lengthy strings that won't fit on 640x480
screen
2013-04-10 10:20:27 +02:00
twinaphex 65bc6850d5 (RMenu) shorter descriptions so that they fit on Xbox 1 resolution 2013-04-10 10:15:03 +02:00
twinaphex a871b6da54 (XDK) Remove texture_image_free - will have to manually do freeing
memory management without a public function for Xbox
2013-04-10 09:59:29 +02:00
twinaphex de31ccef3e Revert "(XDK1 RMenu) Free up tmpBrowser for every switch between game and menu as well"
This reverts commit 4fa02a1952.
2013-04-10 09:57:13 +02:00
twinaphex 4fa02a1952 (XDK1 RMenu) Free up tmpBrowser for every switch between game and menu as well 2013-04-10 09:49:04 +02:00
twinaphex c0f9c0dc6f (RMenu) Get casts working for C99 as well - argh 2013-04-10 09:48:56 +02:00
twinaphex 9cabedca58 (RMenu) C++98 compatibility casts 2013-04-10 09:46:52 +02:00
twinaphex 5f24e5daf4 (RMenu) Put menu_texture and menu_panel textures on heap - free
them for Xbox 1 after going out of the menu and into the game
2013-04-10 09:34:46 +02:00
twinaphex 9d6f4590e8 (RMenu XDK1) Updated RMenu for Xbox 1 to use new
RGUI/RMenu rendering funtions
2013-04-10 06:54:16 +02:00
twinaphex d313e9b8f9 (PS3 RMenu) RMenu now renders background texture the same way
as RGUI
2013-04-10 06:22:37 +02:00
twinaphex 7cf75e5eb4 SETTING_EMU_SKIN action was mistakenly inside a HAVE_SHADER_MANAGER
ifdef
2013-04-10 04:57:49 +02:00
twinaphex af5dcd106a (XDK1 RMenu) Show panel again even in low RAM mode 2013-04-10 04:54:22 +02:00
twinaphex 80390d8143 (XDK1 RMenu) Build fixes 2013-04-10 04:51:36 +02:00
twinaphex 43c9195a77 Get rid of rarch_position_t structure and move RMenu texture to
rmenu.c instead of somewhere in g_extern global
2013-04-10 04:26:18 +02:00
twinaphex 7728e80e0f (RMenu) Get rid of messy set_default_pos functions 2013-04-10 01:34:40 +02:00
twinaphex 6a87900f1a (RMenu) Use HAVE_SHADER_MANAGER define for RMenu now as well 2013-04-10 00:47:14 +02:00
twinaphex b91527749e (RMenu) Some RMenu fixes - deal with overflow on 'pressed up'
state in core options menu along with some other things
2013-04-09 09:58:26 +02:00
twinaphex 6a845dec64 (RMenu) Fix - Pops menu stack for a submenu - hack - needs a cleaner implementation 2013-04-09 09:16:23 +02:00
twinaphex 56de3696d0 (RMenu) Initial core options working - only FBA core currently shows
'extra garbage' characters when updating a specific option -
"CPU Speed Overclock; 100%|110%|120%|130%|140%" etc - doesn't
happen in RGUI - could be the percentage sign
2013-04-09 08:55:54 +02:00
twinaphex b02e9f374c (RMenu) Further implement ingame_menu_core_options 2013-04-07 19:21:20 +02:00
twinaphex 3b82e779fe (RMenu) Implement stub Core Options menu - real implementation
tomorrow
2013-04-07 08:30:30 +02:00
twinaphex b430ded254 (RMenu/Xbox 1) Hardcode some positioning values 2013-04-07 05:20:19 +02:00
twinaphex 4102d1cfb8 Make sinc resampler the default and remove Hermite - audio
quality at high samplerates was too bad to be of any use
2013-04-07 03:41:06 +02:00
twinaphex 15eba51b22 (PS3) Get it at least compiling 2013-04-07 02:34:41 +02:00
twinaphex 909122122d Take out obsolete console-style overscan options - just use
Resize Mode instead
2013-04-07 01:23:10 +02:00
twinaphex 69c460bbec (RMenu) Set 'selected' to FIRST_VIDEO_SETTING after selecting 'Change Game'
in Ingame Menu
2013-04-07 00:31:12 +02:00
twinaphex 81896840f0 (RMenu) Remove ingame_menu function / make it part of select_setting 2013-04-06 23:49:28 +02:00
twinaphex 2ab049fd05 (Xbox 1) Addendum to 'always load panel' prior commit 2013-04-06 23:17:50 +02:00
twinaphex ff19ff671d (Xbox 1) Panel should always be loaded regardless of low RAM mode 2013-04-06 23:13:35 +02:00
twinaphex bb0821b514 Remove screenshots_dir and cgp_dir from default_paths - cgp_dir
is now the same as shaders_dir
2013-04-06 22:37:07 +02:00
twinaphex bcbac5aac7 (RARCH_CONSOLE) Remove shader_dir from default_paths struct 2013-04-06 22:16:12 +02:00
twinaphex cc05981455 (PS3/360) Now uses embedded shaders instead of stock shader from
common-shaders
2013-04-06 21:53:03 +02:00
twinaphex ec0e3e6087 (RMenu) Remove RMenu screenshot_dump function pointer - implement
screenshot_dump instead for XDK1
2013-04-06 18:14:06 +02:00
twinaphex 1c5144f9bd (RMenu) Move RMenu logic out of graphics driver context files 2013-04-06 17:44:07 +02:00
twinaphex a2d9129782 Kill off set_fbo_state and get_fbo_state function pointers 2013-04-06 06:21:11 +02:00
twinaphex eb0feac9e3 (PS3/All) Purge fixed-style shaders again - this time avoiding
breakage on PS3. Maister -you will need to redo shader_parse.c
again though - and this time I need to test it on PS3 to avoid
a regression that happened two pages prior again
2013-04-06 05:46:09 +02:00
twinaphex 4f1cd6a5ee Revert "(PS3) Remove fixed shader slots"
This reverts commit f58a038a5f.
2013-04-06 03:54:57 +02:00
twinaphex cbfe5ff111 Revert "More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,"
This reverts commit 7155dd9ca9.
2013-04-06 03:53:57 +02:00
twinaphex 09c123859d Revert "(RMenu) take out no longer used HAVE_FBO ifdef"
This reverts commit 5f6601ac7e.
2013-04-06 03:53:18 +02:00
twinaphex 5f6601ac7e (RMenu) take out no longer used HAVE_FBO ifdef 2013-04-06 00:24:11 +02:00
twinaphex 7155dd9ca9 More scrubbing - no more render_to_texture, fbo_scale_x / fbo_scale_y,
etc
2013-04-06 00:16:10 +02:00
twinaphex f58a038a5f (PS3) Remove fixed shader slots 2013-04-05 23:58:30 +02:00
twinaphex 52d6c0158f (RMenu) Fixes INGAME_MENU_CHANGE_GAME 2013-04-01 09:53:31 +02:00
twinaphex f5667f0297 (RMenu) Fixed 'Change Game' action 2013-04-01 09:38:16 +02:00
twinaphex 5d3949c610 (RMenu) Rewritten ingame menu 2013-04-01 09:18:30 +02:00
twinaphex 6f8a008d1b (RMenu) Change menu labels 2013-04-01 06:31:17 +02:00
twinaphex d2521204a0 (RMenu) Change 'Return to menu' to 'Change game' 2013-03-31 01:47:00 +01:00
twinaphex 57b4de45a3 (RMenu) Can now use L3 + R3 to exit ingame menu 2013-03-30 19:56:16 +01:00
twinaphex 426b3a255d Revert "(PS3) Add third-pass shaders (ifdeffed for PS3 for now - could" -
going to do this better

This reverts commit 8b4e6bed93.
2013-03-29 01:55:08 +01:00
twinaphex 8b4e6bed93 (PS3) Add third-pass shaders (ifdeffed for PS3 for now - could
be added to PC as well)
2013-03-28 20:59:49 +01:00
twinaphex fa80fbf5bb (RMenu) select_setting - cleanups 2013-03-26 15:26:16 +01:00
twinaphex d58122c655 (RMenu) select_setting refactor pt. 2 - don't put array of struct
on heap anymore
2013-03-26 15:15:38 +01:00
twinaphex 32791fe59c (RMenu) Refactor of select_setting 2013-03-26 15:06:08 +01:00
twinaphex 7d9ca5bf6a (RMenu) Rewrite select_setting 2013-03-26 08:15:48 +01:00
twinaphex 0fb415fa82 (RMenu) Move pressed_down/pressed_up logic inside for loop - select_settings 2013-03-26 00:23:05 +01:00
twinaphex d1b691a696 (RMenu) Take input states out of rmenu_state 2013-03-25 22:37:40 +01:00
twinaphex f0794daa34 (RMenu) Pass input states by value instead of by reference 2013-03-25 22:31:09 +01:00
twinaphex 9b893e2154 (RMenu) More cleanups pt. 2 2013-03-25 21:55:42 +01:00
twinaphex afda4b1a63 (RMenu) More cleanups 2013-03-25 21:24:51 +01:00
twinaphex 8568246454 (RMenu) Clean up init_filebrowser and free_filebrowser - make part of
RMenu
2013-03-25 21:01:04 +01:00
twinaphex fee0d9d77a Embed menu_stack into rmenu.c 2013-03-25 20:41:53 +01:00
twinaphex d57484e6eb Revert "(RMenu) RMenu cleanups pt. 3"
This reverts commit bcc5f906b6.
2013-03-25 20:19:43 +01:00
twinaphex bcc5f906b6 (RMenu) RMenu cleanups pt. 3 2013-03-25 19:04:23 +01:00
twinaphex 986806ca78 (RMenu) RMenu cleanups pt. 2 2013-03-25 18:36:15 +01:00
twinaphex 5a8aa57ae9 (RMenu) Cleanups 2013-03-25 17:47:47 +01:00
twinaphex f004e98f85 (RMenu) Fix build 2013-03-25 08:06:40 +01:00
twinaphex c9e2dd937d (Android) Update overlays - now adds an RGUI toggle button
(RMenu PS3) Clean up some unneeded function callbacks
2013-03-25 03:07:58 +01:00
twinaphex 0fa8c04984 Remove menu_settings.c 2013-03-23 19:34:38 +01:00
twinaphex 9058143953 Move create_menu_item_label to rmenu_xui.cpp 2013-03-23 18:11:03 +01:00
twinaphex 6d8871c76c Combine menu_settings_set and menu_settings_set_default and
move to settings.c
2013-03-23 17:21:42 +01:00
twinaphex 82d80cf24f (PS3) Multiman cleanups 2013-03-23 05:17:39 +01:00