Commit Graph

679 Commits

Author SHA1 Message Date
Themaister c146206d30 Allow game selection directly if core is set.
Don't require core to be loaded if it's found in g_settings.libretro.
2013-04-22 16:58:00 +02:00
Themaister 45357cabdf Fix version rendering in RGUI. 2013-04-21 18:56:17 +02:00
Themaister b40933ba3b Allow core selection to traverse directories.
Drop use of RGUI_FILE_DEVICE as it adds many extra special casing for no
real gain.
2013-04-21 18:22:28 +02:00
Themaister 1f96c5aeb3 Don't spam apply_state_changes in RGUI. 2013-04-21 15:43:14 +02:00
Themaister 96c0fbc8bc Fix #ifdef for fullscreen toggle. 2013-04-21 11:15:30 +02:00
Themaister bb36aecadb Fix MSVC 2010 build. 2013-04-21 10:05:26 +02:00
Themaister b3eca2bb68 Fix back button in Core Options. 2013-04-21 01:25:56 +02:00
Themaister 4681fe2578 Fix casing consistency. 2013-04-21 00:11:55 +02:00
Themaister 610f33962a Add fullscreen toggle to RGUI.
Drop hotkey handling. Needed to add delay timer hackery in that case.
2013-04-21 00:01:49 +02:00
Themaister 43dc80c430 Don't push a file list before settings.
Not really needed, and is a source for confusion.
2013-04-20 23:37:57 +02:00
Themaister 4f7d3b5ea0 Add custom viewport + integer scale mode. 2013-04-20 12:48:33 +02:00
Themaister 7120e5842d Add integer scale to RGUI. 2013-04-20 11:48:26 +02:00
Themaister be01a0ea59 Refactor aspect ratio handling.
Rework aspect ratio handling in RGUI.
Custom viewports work on PC. Ensure that aspect_ratio_idx persist
through reentrancy. Change ASPECT_RATIO_AUTO to ASPECT_RATIO_SQUARE to
better signal that it's the square pixel option.

Add ASPECT_RATIO_CONFIG as an option to use config file defined aspect
ratio.
2013-04-20 10:56:04 +02:00
twinaphex c68d3fd512 (RMenu) Reduce calls to browser_update 2013-04-20 00:47:21 +02:00
twinaphex 419620a49e (360) Add viewport hack for now so that XUI doesn't get
cut off depending on the viewport of the game
2013-04-19 23:22:58 +02:00
Squarepusher 7c8ab66c30 Merge pull request #185 from CatalystG/cascades
BB10 Cascades UI
2013-04-19 13:28:13 -07:00
twinaphex 0f067fd093 (RMenu XUI) Start unwrapping macros 2013-04-19 21:50:19 +02:00
twinaphex dca93a406d (360) Improve menu_iterate_xui 2013-04-19 21:04:08 +02:00
CatalystG 387f81ba93 (BlackBerry) A working BB10 Cascades frontend to choose rom and core currently 2013-04-19 13:32:17 -04: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
meancoot c15463ad7c (iOS) Various:
Fix symbol conflict for audio_cb in CoreAudio driver and dummy lib
   Don't show a frame from the last loaded game when loading a new one
   Fix settings not being refreshed after a failed game load
   Fix issue that could cause the display time of the native pause button to be cut short
2013-04-18 20:39:43 -04:00
twinaphex 2cef7466a8 (RMenu/RGUI) Don't set first delay timer 2013-04-19 00:52:37 +02:00
twinaphex 576aafd5e4 (360) Drop setting timer_delay on deinit: in rmenu_iterate 2013-04-19 00:32:13 +02:00
twinaphex a979cba13c (RMenu/RGUI) Standardization pt. 1 2013-04-18 23:00:27 +02:00
twinaphex 16a40af173 (RGUI) Move menu_stack code back into rgui.c 2013-04-18 22:22:25 +02:00
twinaphex fbb82177f3 (RMenu XUI) Build fix 2013-04-18 19:09:38 +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 1f6d3a8610 (RMenu XUI) Build fix 2013-04-18 18:39:52 +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 41ec8b8fe8 (PS3/PSP) Remove dead code 2013-04-18 17:44:38 +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 bc4bd6b684 (RMenu XUI) Use rgui->browser 2013-04-18 17:27:11 +02:00
twinaphex d18e6d1315 (RMenu XUI) Don't use CXuiControl anymore 2013-04-18 17:18:34 +02:00
twinaphex 44661638b6 (RMenu XUI) Use m_controlnoslider directly 2013-04-18 16:52:30 +02:00
twinaphex c1f6f097df Use m_controlslist directly 2013-04-18 16:47:49 +02:00
twinaphex 3580d3fe67 (Rmenu XUI) Use m_list directly 2013-04-18 16:35:50 +02:00
twinaphex e3ee31cdb5 (RMenu XUI) Use m_settingslist directly 2013-04-18 16:26:46 +02:00
twinaphex 7b8709c61a (RMenu XUI) Use m_quickmenulist directly 2013-04-18 16:14:39 +02:00
twinaphex a6d7026cc5 (RMenu XUI) Use XuiTextElementSetText directly 2013-04-18 16:04:10 +02:00
twinaphex ca6e661663 (Rmenu XUI) Use XuiSceneNavigateForward 2013-04-18 15:48:13 +02:00
twinaphex b746d56e5c (RMenu XUI) Start using some non-OOP functions 2013-04-18 15:33:25 +02:00
twinaphex 0127f5eadd (RMenu/RGUI) menu_init - check for NULL return value and fail gracefully
if so
2013-04-18 15:14:19 +02:00
twinaphex ab5092d643 (RMenu XUI) Build fix 2013-04-18 15:11:28 +02:00
twinaphex a2fc2b1e4f (RMenu XUI) Use menu_common 2013-04-18 15:04:09 +02:00
twinaphex 7c4b730e51 (RMenu/RGUI) Move menu_init/menu_free to menu_common.c 2013-04-18 14:58:47 +02:00
Themaister 41573976b0 Fix ROM loading in RGUI.
menu_input_process() was skipped, so MODE_INIT wasn't set.
2013-04-18 09:44: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 99358421f1 (RMenu XUI) Don't increment g_extern.frame_count in
menu_iterate
2013-04-16 14:37:45 +02:00
twinaphex 892a8b1d48 (RMenu XUI) Take out msg_queue_pull in menu_iterate 2013-04-16 14:31:12 +02:00
Themaister a0f7a184fd Avoid potential segfaults if files are deleted.
Potentially, on a refresh, selection_ptr could be out of range
if files have been removed.
2013-04-16 12:32:03 +02:00
Themaister fa5e8b646c Preserve sram/state dir on reentrancy. 2013-04-16 12:22:27 +02:00
twinaphex 6f226c1c01 (RMenu) Drop msg_queue_pull from menu_iterate 2013-04-16 02:13:53 +02:00
Themaister 46f1374a27 Refactor selection_ptr push/pop logic.
Should make more sense now.
2013-04-16 01:53:07 +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
Themaister 2c8ddeb109 Add gfx_shader_resolve_relative.
Translates relative paths (from CGP) into absolute paths,
suitable for loading files, and saving cgp some place else.
2013-04-15 23:48:25 +02:00
Squarepusher e08339775f Merge pull request #182 from CatalystG/rgui
(BlackBerry) Make use of the new dummy lib to boot to RGUI.
2013-04-14 15:29:30 -07:00
CatalystG 50dced3612 (BlackBerry) Make use of the new dummy lib to boot to RGUI. 2013-04-14 17:27:36 -04:00
Themaister 4c15814bf7 Ensure that terminal doesn't get overflowed. 2013-04-14 23:27:15 +02:00
Themaister 2853e50aa2 Move Hardware Filtering to GEKKO ifdef. 2013-04-14 23:17:48 +02:00
Themaister 8c58ff191a Fix strange use of pointers in screenshot code. 2013-04-14 23:14:38 +02:00
Themaister 926707ae44 Avoid needless branch. 2013-04-14 23:05:25 +02:00
Themaister f8ac159fc2 Properly set RGUI shader struct on init.
Use g_settings.video.shader_path if configured.
2013-04-14 22:59:36 +02:00
Themaister 6373819a16 Use default shader type correctly.
Don't hardcode Cg as it's not supported everywhere.
2013-04-14 22:48:35 +02:00
twinaphex 250b52c130 (RARCH_CONSOLE) Build fix for now - dummy loading sidestepped
for now until solution arrives
2013-04-14 17:15:57 +02:00
Themaister c9a02273bb Check for fullscreen in RGUI. 2013-04-14 16:40:17 +02:00
Themaister 829840b415 Fallback in RGUI if libretro_path isn't set. 2013-04-14 16:34:42 +02:00
Themaister 5e45c31f06 Set selection_ptr when calling OPEN_FILEBROWSER. 2013-04-14 16:29:35 +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 4652f1570d (Salamander) Fix build on XDK1 2013-04-14 14:28:27 +02:00
twinaphex c1f6b80be9 (RMenu) Draw menu panel for currently selected Core option 2013-04-14 12:52:39 +02:00
Themaister ca5ff43b6f Add default filtering option to RGUI. 2013-04-14 01:45:33 +02:00
Themaister 241d55ccbf Add CGP preset load to RGUI. 2013-04-14 01:27:13 +02:00
Themaister f968ee6527 Refactor nonblock states.
Preserve nonblock state better across reinits, etc.
Try to keep vsync in RGUI.
2013-04-14 00:56:55 +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 1485da361b (RMenu XUI) Build fix 2013-04-13 17:07:47 +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
Themaister c17714ffbb Add full screen mode to set_texture_enable. 2013-04-13 16:49:25 +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
ToadKing 4782522dbd (WII) fix RGUI controls
(CONSOLES) fix logging
2013-04-12 09:19:02 -04:00
twinaphex 5a9194a95c (360) Cleanup shader_hlsl.c 2013-04-12 15:14:34 +02:00
twinaphex 0ef62f24c4 (360 RMenu XUI) Cleanups 2013-04-12 15:03:31 +02:00
twinaphex d53d92967c (360 RMenu XUI) Works now with refactored filebrowser
code
2013-04-12 14:23:25 +02:00
twinaphex 26c765a559 (XDK1) Strip platform_xdk.h 2013-04-12 13:41:07 +02:00
twinaphex 3b4ee38245 (XDK1) Remove some unused XDK1 I/O code 2013-04-12 13:27:10 +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 54ec513e7e (Filebrowser) Cleanup to directory_parse 2013-04-12 10:07:47 +02:00
twinaphex 8d8abcbdc5 (RMenu XUI) Move to new filebrowser dir popping logic 2013-04-12 09:58:16 +02:00
twinaphex 4e188a0e00 (Wii/RGUI) Take out QUIT_KEY button combo shortcuts - current
RGUI works such that it goes directly into the ingame menu
after pressing menu toggle and you can quit from there.
2013-04-12 09:28:12 +02:00
Themaister 97095852f0 Should fix Wii and shader manager. 2013-04-12 09:08:07 +02:00
ToadKing ded105746c fix RGUI file browser 2013-04-11 21:00:13 -04:00
twinaphex e75ed86fde (Filebrowser) Cleanups 2013-04-12 00:27:00 +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 63020f42d7 (Android) Some leftover Android garbage that was never expanded upon - scrub 2013-04-11 17:31:46 +02:00
twinaphex 30e190bdae Remove superfluous wcstombs / mbstowcs wrappers 2013-04-11 17:18:23 +02:00
twinaphex 74edbf7339 (RMenu XUI / 360) Made RMenu XUI independent of MODE_MENU_DRAW - MODE_MENU_DRAW
removed
2013-04-11 16:38:41 +02:00
Themaister 91c8fea8e9 Fix crash in shader browser. 2013-04-11 16:15:09 +02:00
Themaister aebb2cb52e Add initial GLSL loading in RGUI. 2013-04-11 16:15:09 +02:00
twinaphex a49fe27d21 (GX) Make Wii/Gamecube gx_video no longer depend on MODE_MENU_DRAW 2013-04-11 16:10:09 +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
CatalystG a54c377e6f (BlackBerry) Fix BB10 this time. Previous change didn't work on both. 2013-04-10 21:25:38 -04:00
CatalystG fdcc6e2087 (BlackBerry) Fix PlayBook crash after selecting a game from RGUI 2013-04-10 20:27:49 -04:00
Themaister acd3b481be Let RGUI CGP be used across driver reinit. 2013-04-10 21:04:28 +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 22ce22ca14 (360) Take out obsolete resampler type option 2013-04-10 07:55:59 +02:00
twinaphex 87d0843b13 (360) RMenu XUI now goes through the same RGUI functions for
rendering
2013-04-10 07:47:11 +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