mirror of
https://github.com/libretro/RetroArch
synced 2025-03-15 13:21:29 +00:00
(PS3) Improved controls in menu - less twitchy controls
This commit is contained in:
parent
4acf66edfd
commit
ece5935ef9
31
ps3/colors.h
31
ps3/colors.h
@ -1,31 +0,0 @@
|
||||
/* SSNES - A Super Nintendo Entertainment System (SNES) Emulator frontend for libsnes.
|
||||
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
|
||||
* Copyright (C) 2011-2012 - Daniel De Matteis
|
||||
*
|
||||
* Some code herein may be based on code found in BSNES.
|
||||
*
|
||||
* SSNES is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* SSNES is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with SSNES.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/* ABGR color format */
|
||||
|
||||
#define WHITE 0xffffffffu
|
||||
#define RED 0xff0000ffu
|
||||
#define GREEN 0xff00ff00u
|
||||
#define BLUE 0xffff0000u
|
||||
#define YELLOW 0xff00ffffu
|
||||
#define PURPLE 0xffff00ffu
|
||||
#define CYAN 0xffffff00u
|
||||
#define ORANGE 0xff0063ffu
|
||||
#define SILVER 0xff8c848cu
|
||||
#define LIGHTBLUE 0xFFFFE0E0U
|
||||
#define LIGHTORANGE 0xFFE0EEFFu
|
@ -50,7 +50,6 @@ char usrDirPath[MAX_PATH_LENGTH];
|
||||
char DEFAULT_PRESET_FILE[MAX_PATH_LENGTH];
|
||||
char DEFAULT_BORDER_FILE[MAX_PATH_LENGTH];
|
||||
char DEFAULT_MENU_BORDER_FILE[MAX_PATH_LENGTH];
|
||||
char GAME_AWARE_SHADER_DIR_PATH[MAX_PATH_LENGTH];
|
||||
char PRESETS_DIR_PATH[MAX_PATH_LENGTH];
|
||||
char INPUT_PRESETS_DIR_PATH[MAX_PATH_LENGTH];
|
||||
char BORDERS_DIR_PATH[MAX_PATH_LENGTH];
|
||||
@ -347,7 +346,6 @@ static void get_environment_settings(int argc)
|
||||
snprintf(DEFAULT_PRESET_FILE, sizeof(DEFAULT_PRESET_FILE), "%s/presets/stock.conf", usrDirPath);
|
||||
snprintf(DEFAULT_BORDER_FILE, sizeof(DEFAULT_BORDER_FILE), "%s/borders/Centered-1080p/mega-man-2.png", usrDirPath);
|
||||
snprintf(DEFAULT_MENU_BORDER_FILE, sizeof(DEFAULT_MENU_BORDER_FILE), "%s/borders/Menu/main-menu.png", usrDirPath);
|
||||
snprintf(GAME_AWARE_SHADER_DIR_PATH, sizeof(GAME_AWARE_SHADER_DIR_PATH), "%s/gameaware", usrDirPath);
|
||||
snprintf(PRESETS_DIR_PATH, sizeof(PRESETS_DIR_PATH), "%s/presets", usrDirPath);
|
||||
snprintf(INPUT_PRESETS_DIR_PATH, sizeof(INPUT_PRESETS_DIR_PATH), "%s/input-presets", usrDirPath);
|
||||
snprintf(BORDERS_DIR_PATH, sizeof(BORDERS_DIR_PATH), "%s/borders", usrDirPath);
|
||||
|
@ -38,7 +38,7 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
|
||||
0.0f,
|
||||
0.0f,
|
||||
YELLOW,
|
||||
"",
|
||||
"INFO - Select a [CG Preset] script.",
|
||||
WHITE,
|
||||
0.91f,
|
||||
0.09f,
|
||||
@ -89,21 +89,6 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
|
||||
0,
|
||||
1
|
||||
},
|
||||
{
|
||||
SETTING_GAME_AWARE_SHADER,
|
||||
"Game Aware Shader Script",
|
||||
"",
|
||||
0.0f,
|
||||
0.0f,
|
||||
YELLOW,
|
||||
"INFO - Select a [Game Aware Shader] script.",
|
||||
WHITE,
|
||||
0.91f,
|
||||
0.09f,
|
||||
0.83f,
|
||||
0,
|
||||
1
|
||||
},
|
||||
{
|
||||
SETTING_FONT_SIZE,
|
||||
"Font Size",
|
||||
|
565
ps3/menu.c
565
ps3/menu.c
File diff suppressed because it is too large
Load Diff
@ -19,8 +19,6 @@
|
||||
#ifndef MENU_H_
|
||||
#define MENU_H_
|
||||
|
||||
#include "colors.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint32_t enum_id; /* enum ID of item */
|
||||
@ -80,7 +78,6 @@ enum
|
||||
SETTING_BORDER,
|
||||
SETTING_SHADER,
|
||||
SETTING_SHADER_2,
|
||||
SETTING_GAME_AWARE_SHADER,
|
||||
SETTING_FONT_SIZE,
|
||||
SETTING_KEEP_ASPECT_RATIO,
|
||||
SETTING_HW_TEXTURE_FILTER,
|
||||
|
0
ps3/pkg/USRDIR/presets/.empty
Normal file
0
ps3/pkg/USRDIR/presets/.empty
Normal file
@ -800,12 +800,7 @@ static void gl_free(void *data)
|
||||
glBindBuffer(GL_TEXTURE_REFERENCE_BUFFER_SCE, 0);
|
||||
glDeleteBuffers(1, &gl->pbo);
|
||||
|
||||
if (gl->fbo_inited)
|
||||
{
|
||||
glDeleteTextures(gl->fbo_pass, gl->fbo_texture);
|
||||
glDeleteFramebuffersOES(gl->fbo_pass, gl->fbo);
|
||||
}
|
||||
|
||||
gl_deinit_fbo(gl);
|
||||
psgl_deinit(gl);
|
||||
|
||||
if (gl->empty_buf)
|
||||
@ -834,9 +829,7 @@ static bool psgl_init_device(gl_t *gl, const video_info_t *video, uint32_t resol
|
||||
.maxSPUs = 1,
|
||||
.initializeSPUs = GL_FALSE,
|
||||
};
|
||||
#if CELL_SDK_VERSION > 0x340000
|
||||
options.enable |= PSGL_INIT_TRANSIENT_MEMORY_SIZE;
|
||||
#else
|
||||
#if CELL_SDK_VERSION < 0x340000
|
||||
options.enable |= PSGL_INIT_HOST_MEMORY_SIZE;
|
||||
#endif
|
||||
|
||||
|
15
ps3/shared.h
15
ps3/shared.h
@ -18,6 +18,20 @@
|
||||
|
||||
#define MAX_PATH_LENGTH 1024
|
||||
|
||||
/* ABGR color format */
|
||||
|
||||
#define WHITE 0xffffffffu
|
||||
#define RED 0xff0000ffu
|
||||
#define GREEN 0xff00ff00u
|
||||
#define BLUE 0xffff0000u
|
||||
#define YELLOW 0xff00ffffu
|
||||
#define PURPLE 0xffff00ffu
|
||||
#define CYAN 0xffffff00u
|
||||
#define ORANGE 0xff0063ffu
|
||||
#define SILVER 0xff8c848cu
|
||||
#define LIGHTBLUE 0xFFFFE0E0U
|
||||
#define LIGHTORANGE 0xFFE0EEFFu
|
||||
|
||||
enum
|
||||
{
|
||||
MODE_EMULATION,
|
||||
@ -65,7 +79,6 @@ extern char usrDirPath[MAX_PATH_LENGTH];
|
||||
extern char DEFAULT_PRESET_FILE[MAX_PATH_LENGTH];
|
||||
extern char DEFAULT_BORDER_FILE[MAX_PATH_LENGTH];
|
||||
extern char DEFAULT_MENU_BORDER_FILE[MAX_PATH_LENGTH];
|
||||
extern char GAME_AWARE_SHADER_DIR_PATH[MAX_PATH_LENGTH];
|
||||
extern char PRESETS_DIR_PATH[MAX_PATH_LENGTH];
|
||||
extern char INPUT_PRESETS_DIR_PATH[MAX_PATH_LENGTH];
|
||||
extern char BORDERS_DIR_PATH[MAX_PATH_LENGTH];
|
||||
|
Loading…
x
Reference in New Issue
Block a user