Merge branch 'master' of https://github.com/libretro/RetroArch

2025-03-16 07:21:03 +00:00 · 2018-11-11 22:29:50 +01:00 · 2018-11-11 22:29:50 +01:00 · a20fc528e1
commit a20fc528e1
parent 4c11295c99 62eb7822e0
10 changed files with 836 additions and 194 deletions
--- a/cores/libretro-video-processor/Makefile
+++ b/cores/libretro-video-processor/Makefile
@ -109,7 +109,7 @@ else
   SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
 endif

-LDFLAGS += $(LIBV4L2) $(LIBASOUND) $(LIBUDEV)
+LDFLAGS += $(LIBV4L2) $(LIBASOUND) $(LIBUDEV) -lm

 ifeq ($(DEBUG), 1)
   CFLAGS += -O0 -g
--- a/cores/libretro-video-processor/video_processor_v4l2.c
+++ b/cores/libretro-video-processor/video_processor_v4l2.c
--- a/input/input_driver.c
+++ b/input/input_driver.c
@ -1180,9 +1180,14 @@ void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_sta
   joypad_info.auto_binds                       = input_autoconf_binds[joypad_info.joy_idx];
   joypad_info.axis_threshold                   = input_driver_axis_threshold;

+   if (!joypad_driver)
+      return;
+
   for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
   {
      bool bit_pressed = false;
+      int16_t val;
+      val = input_joypad_analog(joypad_driver, joypad_info, port, RETRO_DEVICE_INDEX_ANALOG_BUTTON, i, libretro_input_binds[port]);

      if (input_driver_input_state(joypad_info, libretro_input_binds,
               port, RETRO_DEVICE_JOYPAD, 0, i) != 0)
@ -1190,11 +1195,10 @@ void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_sta

      if (bit_pressed)
         BIT256_SET_PTR(p_new_state, i);
+      if (bit_pressed && val)
+         p_new_state->analog_buttons[i] = val;
   }

-   if (!joypad_driver)
-      return;
-
   for (i = 0; i < 2; i++)
   {
      for (j = 0; j < 2; j++)
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@ -195,7 +195,7 @@ void input_mapper_poll(input_mapper_t *handle)

                     handle->analog_value[i][
                        remap_button - RARCH_FIRST_CUSTOM_BIND] =
-                           32767 * invert;
+                           (current_input.analog_buttons[j] ? current_input.analog_buttons[j] : 32767) * invert;
                  }
               }
            }
--- a/input/input_types.h
+++ b/input/input_types.h
@ -25,6 +25,7 @@ typedef struct input_keyboard_ctx_wait input_keyboard_ctx_wait_t;
 typedef struct {
   uint32_t data[8];
   uint16_t analogs[8];
+   uint16_t analog_buttons[16];
 } input_bits_t;
 typedef struct joypad_connection joypad_connection_t;
 typedef struct pad_connection_listener_interface pad_connection_listener_t;
--- a/intl/msg_hash_pl.h
+++ b/intl/msg_hash_pl.h
@ -3770,28 +3770,28 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
      "Użyj motywu kolorystycznego systemu operacyjnego (jeśli jest dostępny) - zastępuje ustawienia kompozycji.")
 MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
-      "Lowest")
+      "Najniższa")
 MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
-      "Lower")
+      "Niższa")
 MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
-      "Normal")
+      "Normalna")
 MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
-      "Higher")
+      "Wyższa")
 MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
-      "Highest")
+      "Najwyższa")
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
-    "No music available."
+    "Brak muzyki."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
-    "No videos available."
+    "Brak filmów."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
-    "No images available."
+    "Brak zdjęć."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
-    "No favorites available."
+    "Brak ulubionych."
    )
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@ -346,8 +346,6 @@ static unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST] = {
   HEX_R(hex), HEX_G(hex), HEX_B(hex), alpha  \
 }

-#define OZONE_COLOR_BACKGROUND(hex) hex, HEX_R(hex), HEX_G(hex), HEX_B(hex)
-
 static float ozone_sidebar_background_light[16] = {
      0.94, 0.94, 0.94, 1.00,
      0.94, 0.94, 0.94, 1.00,
@ -399,10 +397,7 @@ static float ozone_border_1_dark[16] = COLOR_HEX_TO_FLOAT(0x89F1F2, 1.00);
 typedef struct ozone_theme
 {
   /* Background color */
-   uint32_t background_rgb;
-   float background_r;
-   float background_g;
-   float background_b;
+   float background[16];

   /* Float colors for quads and icons */
   float header_footer_separator[16];
@ -436,7 +431,7 @@ typedef struct ozone_theme
 } ozone_theme_t;

 ozone_theme_t ozone_theme_light = {
-   OZONE_COLOR_BACKGROUND(0xEBEBEB),
+   COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00),

   COLOR_HEX_TO_FLOAT(0x2B2B2B, 1.00),
   COLOR_HEX_TO_FLOAT(0x333333, 1.00),
@ -464,7 +459,7 @@ ozone_theme_t ozone_theme_light = {
 };

 ozone_theme_t ozone_theme_dark = {
-   OZONE_COLOR_BACKGROUND(0x2D2D2D),
+   COLOR_HEX_TO_FLOAT(0x2D2D2D, 1.00),

   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),
   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),
@ -3081,7 +3076,6 @@ end:

 static void ozone_frame(void *data, video_frame_info_t *video_info)
 {
-   menu_display_ctx_clearcolor_t clearcolor;
   ozone_handle_t* ozone = (ozone_handle_t*) data;
   settings_t  *settings = config_get_ptr();
   unsigned color_theme  = video_info->ozone_color_theme;
@ -3125,12 +3119,11 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
   ozone->raster_blocks.sidebar.carr.coords.vertices = 0;

   /* Background */
-   clearcolor.r = ozone->theme->background_r;
-   clearcolor.g = ozone->theme->background_g;
-   clearcolor.b = ozone->theme->background_b;
-   clearcolor.a = 1.0f;
-
-   menu_display_clear_color(&clearcolor, video_info);
+   menu_display_draw_quad(video_info, 
+      0, 0, video_info->width, video_info->height, 
+      video_info->width, video_info->height, 
+      ozone->theme->background
+   );

   /* Header, footer */
   ozone_draw_header(ozone, video_info);
@ -3534,10 +3527,6 @@ static void ozone_toggle(void *userdata, bool menu_on)
   bool tmp              = false;
   ozone_handle_t *ozone = (ozone_handle_t*) userdata;

-   /* Restore content black background */
-   if (!menu_on)
-      menu_display_restore_clear_color();
-
   if (!ozone)
      return;

--- a/pkg/emscripten/README.md
+++ b/pkg/emscripten/README.md
@ -31,8 +31,13 @@ I you want a self hosted version you need
 - Unzip it in the same dir you extracted the rest, inside **/assets/frontend/bundle**
 - Create an **assets/cores** dir, you can put game data in that dir so it's available under **downloads**
 - chmod +x the indexer script
- run the indexer script (you need coffeescript) like this: ./indexer ./assets/frontend > ./assets/frontend/.index-xhr
- run the indexer script (you need coffeescript) like this: ./indexer ./assets/cores > ./assets/cores/.index-xhr
+- run the indexer script (you need coffeescript) like this:
+```
+cd ${ROOT_WWW_PATH}/assets/frontend/bundle
+../../../indexer > .index-xhr
+cd ${ROOT_WWW_PATH}/assets/cores
+../../indexer > .index-xhr
+```

 That should be it, you can add more cores to the list by editing index.html

--- a/pkg/emscripten/libretro/embed.html
+++ b/pkg/emscripten/libretro/embed.html
@ -34,6 +34,7 @@
                          <a class="dropdown-item" href="." data-core="genesis_plus_gx">Genesis Plus GX</a>
                          <a class="dropdown-item" href="." data-core="nestopia">Nestopia (NES)</a>
                          <a class="dropdown-item" href="." data-core="snes9x2010">Snes9x 2010 (SNES)</a>
+                          <a class="dropdown-item" href="." data-core="theodore">Theodore (Thomson TO8/TO9)</a>
                          <a class="dropdown-item" href="." data-core="vba_next">VBA Next (Gameboy Advance)</a>
                        </div>
                        <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()" disabled>
--- a/pkg/emscripten/libretro/index.html
+++ b/pkg/emscripten/libretro/index.html
@ -57,6 +57,7 @@
                           <a class="dropdown-item" href="." data-core="mednafen_snes">Mednafen/Beetle SNES</a>
                           <a class="dropdown-item" href="." data-core="mednafen_vb">Mednafen/Beetle Virtual Boy</a>
                           <a class="dropdown-item" href="." data-core="mednafen_wswan">Mednafen/Beetle WonderSwan</a>
+                           <a class="dropdown-item" href="." data-core="mu">Mu</a>
                           <a class="dropdown-item" href="." data-core="mupen64plus">Mupen64 Plus</a>
                           <a class="dropdown-item" href="." data-core="nestopia">Nestopia</a>
                           <a class="dropdown-item" href="." data-core="nxengine">NX Engine</a>
@ -71,6 +72,7 @@
                           <a class="dropdown-item" href="." data-core="snes9x">Snes9x</a>
                           <a class="dropdown-item" href="." data-core="stella">Stella</a>
                           <a class="dropdown-item" href="." data-core="tgbdual">TGB Dual</a>
+                           <a class="dropdown-item" href="." data-core="theodore">Theodore (Thomson TO8/TO9)</a>
                           <a class="dropdown-item" href="." data-core="tyrquake">TyrQuake</a>
                           <a class="dropdown-item" href="." data-core="vba_next">VBA Next</a>
                           <a class="dropdown-item" href="." data-core="vecx">Vecx</a>