admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove incomplete Use NTSC core option

Browse Source 
Use NTSC colors option is incomplete due to missing int,hue adjustments. This can be added but there is no smooth way using core options or hotkey to selec ranges 1-256 for fine tuning

Using shaders instead can work better at this with more adjustments possible
This commit is contained in:
retro-wertz
2018-06-15 10:59:25 +08:00
parent 7439630dab
commit 1811ea1e06
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/drivers/libretro/libretro.c
View File

@@ -218,10 +218,8 @@ FILE *FCEUD_UTF8fopen(const char *n, const char *m)
/*palette for FCEU*/ /*palette for FCEU*/
#define MAXPAL 17 /* raw palette # */ #define MAXPAL 17 /* raw palette # */
static int use_ntsc = 0;
static int external_palette_exist = 0; static int external_palette_exist = 0;
extern int ipalette; extern int ipalette;
extern int ntsccol;
struct st_palettes { struct st_palettes {
char name[32]; char name[32];
@@ -584,7 +582,6 @@ void retro_set_environment(retro_environment_t cb)
{ "fceumm_aspect", "Preferred aspect ratio; 8:7 PAR|4:3" }, { "fceumm_aspect", "Preferred aspect ratio; 8:7 PAR|4:3" },
{ "fceumm_palette", "Color Palette; default|asqrealc|nintendo-vc|rgb|yuv-v3|unsaturated-final|sony-cxa2025as-us|pal|bmf-final2|bmf-final3|smooth-fbx|composite-direct-fbx|pvm-style-d93-fbx|ntsc-hardware-fbx|nes-classic-fbx-fs|nescap|wavebeam|raw|custom" }, { "fceumm_palette", "Color Palette; default|asqrealc|nintendo-vc|rgb|yuv-v3|unsaturated-final|sony-cxa2025as-us|pal|bmf-final2|bmf-final3|smooth-fbx|composite-direct-fbx|pvm-style-d93-fbx|ntsc-hardware-fbx|nes-classic-fbx-fs|nescap|wavebeam|raw|custom" },
{ "fceumm_up_down_allowed", "Allow Opposing Directions; disabled|enabled" }, { "fceumm_up_down_allowed", "Allow Opposing Directions; disabled|enabled" },
{ "fceumm_use_ntsc", "Use NTSC Palette; disabled|enabled" },
#ifdef PSP #ifdef PSP
{ "fceumm_overscan", "Crop Overscan; enabled|disabled" }, { "fceumm_overscan", "Crop Overscan; enabled|disabled" },
#else #else
@@ -691,20 +688,17 @@ static void retro_set_custom_palette(void)
uint8_t i,r,g,b; uint8_t i,r,g,b;
ipalette = 0; ipalette = 0;
ntsccol = 0;
use_raw_palette = false; use_raw_palette = false;
if (current_palette == 0 || current_palette > MAXPAL if (!current_palette || current_palette > MAXPAL || (GameInfo->type == GIT_VSUNI))
|| (GameInfo->type == GIT_VSUNI))
{ {
if (current_palette > MAXPAL && GameInfo->type != GIT_VSUNI) if (current_palette > MAXPAL && GameInfo->type != GIT_VSUNI)
{ {
if (external_palette_exist) if (external_palette_exist)
{
ipalette = 1; ipalette = 1;
} }
}
if (current_palette == 0)
ntsccol = use_ntsc;
FCEU_ResetPalette(); /* Do palette reset. Priority will be: FCEU_ResetPalette(); /* Do palette reset. Priority will be:
* -ipalette : sets external palette * -ipalette : sets external palette
@@ -946,14 +940,6 @@ static void check_variables(bool startup)
else else
up_down_allowed = false; up_down_allowed = false;
var.key = "fceumm_use_ntsc";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
use_ntsc = (!strcmp(var.value, "enabled")) ? 1 : 0;
retro_set_custom_palette();
}
var.key = "fceumm_nospritelimit"; var.key = "fceumm_nospritelimit";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)

2
src/palette.c
View File

@@ -34,7 +34,7 @@
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846
#endif #endif
int ntsccol = 0; static int ntsccol = 0;
static int ntsctint = 46 + 10; static int ntsctint = 46 + 10;
static int ntschue = 72; static int ntschue = 72;

1
src/palette.h
View File

@@ -6,7 +6,6 @@ typedef struct {
} pal; } pal;
extern pal *palo; extern pal *palo;
extern int ntsccol;
extern int ipalette; extern int ipalette;
void FCEU_ResetPalette(void); void FCEU_ResetPalette(void);