X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=19f3c6768a4b8d1383239f6ce88c83f7a51c9c39;hb=c060a9ab9c428e1ed9c4159b56529a2a36031e44;hp=f580f8434b92f3fe726ba304ec6c3a94dccf84fa;hpb=213c16adcb630666f694646645a8ed4bc30c334b;p=picodrive.git diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c index f580f84..19f3c67 100644 --- a/platform/gp2x/emu.c +++ b/platform/gp2x/emu.c @@ -55,7 +55,7 @@ int reset_timing = 0; #define PICO_PEN_ADJUST_X 4 #define PICO_PEN_ADJUST_Y 2 -static int pico_pen_x = 320/2, pico_pen_y = 240/2, pico_inp_mode = 0; +static int pico_pen_x = 320/2, pico_pen_y = 240/2; static void emu_msg_cb(const char *msg); static void emu_msg_tray_open(void); @@ -140,8 +140,8 @@ void emu_Deinit(void) void emu_prepareDefaultConfig(void) { memset(&defaultConfig, 0, sizeof(defaultConfig)); - defaultConfig.EmuOpt = 0x1d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds - defaultConfig.s_PicoOpt = 0x0f | 0x20e00; // | <- use_940, cd_pcm, cd_cdda, svp drc + defaultConfig.EmuOpt = 0x9d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds + defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES; defaultConfig.s_PsndRate = 44100; defaultConfig.s_PicoRegion = 0; // auto defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP @@ -291,26 +291,39 @@ static void blit(const char *fps, const char *notice) // 8bit accurate renderer if (Pico.m.dirtyPal) { + int pallen = 0x40; Pico.m.dirtyPal = 0; - if(Pico.video.reg[0xC]&8) { // shadow/hilight mode + if (Pico.video.reg[0xC]&8) // shadow/hilight mode + { vidConvCpyRGB32(localPal, Pico.cram, 0x40); vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40); vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40); memcpy32(localPal+0xc0, localPal+0x40, 0x40); - localPal[0xc0] = 0x0000c000; - localPal[0xd0] = 0x00c00000; - localPal[0xe0] = 0x00000000; // reserved pixels for OSD - localPal[0xf0] = 0x00ffffff; - gp2x_video_setpalette(localPal, 0x100); - } else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes + pallen = 0x100; + } + else if (rendstatus & PDRAW_ACC_SPRITES) { + vidConvCpyRGB32(localPal, Pico.cram, 0x40); + memcpy32(localPal+0x40, localPal, 0x40); + memcpy32(localPal+0x80, localPal, 0x40); + memcpy32(localPal+0xc0, localPal, 0x40); + pallen = 0x100; + } + else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes vidConvCpyRGB32(localPal, Pico.cram, 0x40); vidConvCpyRGB32(localPal+0x40, HighPal, 0x40); vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40); - gp2x_video_setpalette(localPal, 0xc0); - } else { + pallen = 0xc0; + } + else { vidConvCpyRGB32(localPal, Pico.cram, 0x40); - gp2x_video_setpalette(localPal, 0x40); } + if (pallen > 0xc0) { + localPal[0xc0] = 0x0000c000; + localPal[0xd0] = 0x00c00000; + localPal[0xe0] = 0x00000000; // reserved pixels for OSD + localPal[0xf0] = 0x00ffffff; + } + gp2x_video_setpalette(localPal, pallen); } } @@ -423,31 +436,10 @@ static void emu_msg_tray_open(void) static void RunEventsPico(unsigned int events, unsigned int gp2x_keys) { - if (events & (1 << 3)) { - pico_inp_mode++; - if (pico_inp_mode > 2) pico_inp_mode = 0; - switch (pico_inp_mode) { - case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break; - case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break; - case 0: strcpy(noticeMsg, "Input: Joytick "); - PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; - break; - } - gettimeofday(¬iceMsgTime, 0); - } - if (events & (1 << 4)) { - PicoPicohw.page--; - if (PicoPicohw.page < 0) PicoPicohw.page = 0; - sprintf(noticeMsg, "Page %i ", PicoPicohw.page); - gettimeofday(¬iceMsgTime, 0); - } - if (events & (1 << 5)) { - PicoPicohw.page++; - if (PicoPicohw.page > 6) PicoPicohw.page = 6; - sprintf(noticeMsg, "Page %i ", PicoPicohw.page); - gettimeofday(¬iceMsgTime, 0); - } - if (pico_inp_mode != 0) { + emu_RunEventsPico(events); + + if (pico_inp_mode != 0) + { PicoPad[0] &= ~0x0f; // release UDLR if (gp2x_keys & GP2X_UP) { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; } if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 239-PICO_PEN_ADJUST_Y) pico_pen_y = 239-PICO_PEN_ADJUST_Y; } @@ -499,31 +491,6 @@ static void update_volume(int has_changed, int is_up) } } -static void change_fast_forward(int set_on) -{ - static void *set_PsndOut = NULL; - static int set_Frameskip, set_EmuOpt, is_on = 0; - - if (set_on && !is_on) { - set_PsndOut = PsndOut; - set_Frameskip = currentConfig.Frameskip; - set_EmuOpt = currentConfig.EmuOpt; - PsndOut = NULL; - currentConfig.Frameskip = 8; - currentConfig.EmuOpt &= ~4; - is_on = 1; - } - else if (!set_on && is_on) { - PsndOut = set_PsndOut; - currentConfig.Frameskip = set_Frameskip; - currentConfig.EmuOpt = set_EmuOpt; - PsndRerate(1); - update_volume(0, 0); - reset_timing = 1; - is_on = 0; - } -} - static void RunEvents(unsigned int which) { if (which & 0x1800) // save or load (but not both) @@ -655,14 +622,16 @@ static void updateKeys(void) if (events & 0x6000) update_volume(1, events & 0x2000); - if ((events ^ prevEvents) & 0x40) - change_fast_forward(events & 0x40); + if ((events ^ prevEvents) & 0x40) { + emu_changeFastForward(events & 0x40); + update_volume(0, 0); + reset_timing = 1; + } events &= ~prevEvents; if (PicoAHW == PAHW_PICO) RunEventsPico(events, keys); - if (events) RunEvents(events); if (movie_data) emu_updateMovie(); @@ -688,13 +657,13 @@ static void SkipFrame(int do_audio) } -void emu_forcedFrame(void) +void emu_forcedFrame(int opts) { int po_old = PicoOpt; int eo_old = currentConfig.EmuOpt; - PicoOpt &= ~0x0010; - PicoOpt |= 0x4080; // soft_scale | acc_sprites + PicoOpt &= ~0x10; + PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites currentConfig.EmuOpt |= 0x80; //vidResetMode(); @@ -1031,7 +1000,7 @@ void emu_Loop(void) frames_done++; frames_shown++; } - change_fast_forward(0); + emu_changeFastForward(0); if (PicoAHW & PAHW_MCD) PicoCDBufferFree(); @@ -1044,7 +1013,7 @@ void emu_Loop(void) // if in 8bit mode, generate 16bit image for menu background if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) - emu_forcedFrame(); + emu_forcedFrame(POPT_EN_SOFTSCALE); }