unsigned char *PicoDraw2FB = NULL; // temporary buffer for alt renderer\r
int reset_timing = 0;\r
\r
-static int pico_pen_x = 0, pico_pen_y = 0, pico_inp_mode = 0;\r
+#define PICO_PEN_ADJUST_X 4\r
+#define PICO_PEN_ADJUST_Y 2\r
+static int pico_pen_x = 320/2, pico_pen_y = 240/2;\r
\r
static void emu_msg_cb(const char *msg);\r
static void emu_msg_tray_open(void);\r
void emu_prepareDefaultConfig(void)\r
{\r
memset(&defaultConfig, 0, sizeof(defaultConfig));\r
- defaultConfig.EmuOpt = 0x1d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds\r
- defaultConfig.s_PicoOpt = 0x0f | 0x20e00; // | <- use_940, cd_pcm, cd_cdda, svp drc\r
+ defaultConfig.EmuOpt = 0x9d | 0x00700; // | <- ram_tmng, confirm_save, cd_leds\r
+ defaultConfig.s_PicoOpt = 0x0f | POPT_EXT_FM|POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;\r
defaultConfig.s_PsndRate = 44100;\r
defaultConfig.s_PicoRegion = 0; // auto\r
defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
}\r
}\r
\r
-static void cd_leds(void)\r
+static void draw_cd_leds(void)\r
{\r
// static\r
int old_reg;\r
}\r
}\r
\r
+static void draw_pico_ptr(void)\r
+{\r
+ unsigned short *p = (unsigned short *)gp2x_screen;\r
+\r
+ // only if pen enabled and for 16bit modes\r
+ if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;\r
+\r
+ if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))\r
+ p += 32;\r
+\r
+ p += 320 * (pico_pen_y + PICO_PEN_ADJUST_Y);\r
+ p += pico_pen_x + PICO_PEN_ADJUST_X;\r
+ p[0] ^= 0xffff;\r
+ p[319] ^= 0xffff;\r
+ p[320] ^= 0xffff;\r
+ p[321] ^= 0xffff;\r
+ p[640] ^= 0xffff;\r
+}\r
+\r
static int EmuScanBegin16(unsigned int num)\r
{\r
if (!(Pico.video.reg[1]&8)) num += 8;\r
// 8bit accurate renderer\r
if (Pico.m.dirtyPal)\r
{\r
+ int pallen = 0x40;\r
Pico.m.dirtyPal = 0;\r
- if(Pico.video.reg[0xC]&8) { // shadow/hilight mode\r
+ if (Pico.video.reg[0xC]&8) // shadow/hilight mode\r
+ {\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);\r
vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);\r
memcpy32(localPal+0xc0, localPal+0x40, 0x40);\r
- localPal[0xc0] = 0x0000c000;\r
- localPal[0xd0] = 0x00c00000;\r
- localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
- localPal[0xf0] = 0x00ffffff;\r
- gp2x_video_setpalette(localPal, 0x100);\r
- } else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
+ pallen = 0x100;\r
+ }\r
+ else if (rendstatus & PDRAW_ACC_SPRITES) {\r
+ vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
+ memcpy32(localPal+0x40, localPal, 0x40);\r
+ memcpy32(localPal+0x80, localPal, 0x40);\r
+ memcpy32(localPal+0xc0, localPal, 0x40);\r
+ pallen = 0x100;\r
+ }\r
+ else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);\r
vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);\r
- gp2x_video_setpalette(localPal, 0xc0);\r
- } else {\r
+ pallen = 0xc0;\r
+ }\r
+ else {\r
vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
- gp2x_video_setpalette(localPal, 0x40);\r
}\r
+ if (pallen > 0xc0) {\r
+ localPal[0xc0] = 0x0000c000;\r
+ localPal[0xd0] = 0x00c00000;\r
+ localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
+ localPal[0xf0] = 0x00ffffff;\r
+ }\r
+ gp2x_video_setpalette(localPal, pallen);\r
}\r
}\r
\r
osd_text(osd_fps_x, h, fps);\r
}\r
if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))\r
- cd_leds();\r
+ draw_cd_leds();\r
+ if (PicoAHW & PAHW_PICO)\r
+ draw_pico_ptr();\r
\r
//gp2x_video_wait_vsync();\r
gp2x_video_flip();\r
\r
static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)\r
{\r
- if (events & (1 << 3)) {\r
- pico_inp_mode++;\r
- if (pico_inp_mode > 2) pico_inp_mode = 0;\r
- switch (pico_inp_mode) {\r
- case 0: strcpy(noticeMsg, "Input: Joytick "); break;\r
- case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break;\r
- case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break;\r
- }\r
- gettimeofday(¬iceMsgTime, 0);\r
- }\r
- if (events & (1 << 4)) {\r
- PicoPicohw.page--;\r
- if (PicoPicohw.page < 0) PicoPicohw.page = 0;\r
- sprintf(noticeMsg, "Page %i ", PicoPicohw.page);\r
- gettimeofday(¬iceMsgTime, 0);\r
- }\r
- if (events & (1 << 5)) {\r
- PicoPicohw.page++;\r
- if (PicoPicohw.page > 6) PicoPicohw.page = 6;\r
- sprintf(noticeMsg, "Page %i ", PicoPicohw.page);\r
- gettimeofday(¬iceMsgTime, 0);\r
- }\r
- if (pico_inp_mode != 0) {\r
+ emu_RunEventsPico(events);\r
+\r
+ if (pico_inp_mode != 0)\r
+ {\r
PicoPad[0] &= ~0x0f; // release UDLR\r
- if (gp2x_keys & GP2X_UP) { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; }\r
- if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 251) pico_pen_y = 251; }\r
- if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }\r
- if (gp2x_keys & GP2X_RIGHT){ pico_pen_x++; if (pico_pen_x > 353) pico_pen_x = 353; }\r
- PicoPicohw.pen_pos[0] = 0x03c + pico_pen_x;\r
+ if (gp2x_keys & GP2X_UP) { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; }\r
+ 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; }\r
+ if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }\r
+ if (gp2x_keys & GP2X_RIGHT) {\r
+ int lim = (Pico.video.reg[12]&1) ? 319 : 255;\r
+ pico_pen_x++;\r
+ if (pico_pen_x > lim-PICO_PEN_ADJUST_X)\r
+ pico_pen_x = lim-PICO_PEN_ADJUST_X;\r
+ }\r
+ PicoPicohw.pen_pos[0] = pico_pen_x;\r
+ if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;\r
+ PicoPicohw.pen_pos[0] += 0x3c;\r
PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);\r
}\r
}\r
}\r
}\r
\r
-static void change_fast_forward(int set_on)\r
-{\r
- static void *set_PsndOut = NULL;\r
- static int set_Frameskip, set_EmuOpt, is_on = 0;\r
-\r
- if (set_on && !is_on) {\r
- set_PsndOut = PsndOut;\r
- set_Frameskip = currentConfig.Frameskip;\r
- set_EmuOpt = currentConfig.EmuOpt;\r
- PsndOut = NULL;\r
- currentConfig.Frameskip = 8;\r
- currentConfig.EmuOpt &= ~4;\r
- is_on = 1;\r
- }\r
- else if (!set_on && is_on) {\r
- PsndOut = set_PsndOut;\r
- currentConfig.Frameskip = set_Frameskip;\r
- currentConfig.EmuOpt = set_EmuOpt;\r
- PsndRerate(1);\r
- update_volume(0, 0);\r
- reset_timing = 1;\r
- is_on = 0;\r
- }\r
-}\r
-\r
static void RunEvents(unsigned int which)\r
{\r
if (which & 0x1800) // save or load (but not both)\r
}\r
}\r
\r
-\r
static void updateKeys(void)\r
{\r
unsigned int keys, keys2, allActions[2] = { 0, 0 }, events;\r
if (events & 0x6000)\r
update_volume(1, events & 0x2000);\r
\r
- if ((events ^ prevEvents) & 0x40)\r
- change_fast_forward(events & 0x40);\r
+ if ((events ^ prevEvents) & 0x40) {\r
+ emu_changeFastForward(events & 0x40);\r
+ update_volume(0, 0);\r
+ reset_timing = 1;\r
+ }\r
\r
events &= ~prevEvents;\r
\r
if (PicoAHW == PAHW_PICO)\r
RunEventsPico(events, keys);\r
-\r
if (events) RunEvents(events);\r
if (movie_data) emu_updateMovie();\r
\r
}\r
\r
\r
-void emu_forcedFrame(void)\r
+void emu_forcedFrame(int opts)\r
{\r
int po_old = PicoOpt;\r
int eo_old = currentConfig.EmuOpt;\r
\r
- PicoOpt &= ~0x0010;\r
- PicoOpt |= 0x4080; // soft_scale | acc_sprites\r
+ PicoOpt &= ~0x10;\r
+ PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
currentConfig.EmuOpt |= 0x80;\r
\r
//vidResetMode();\r
frames_done++; frames_shown++;\r
}\r
\r
- change_fast_forward(0);\r
+ emu_changeFastForward(0);\r
\r
if (PicoAHW & PAHW_MCD) PicoCDBufferFree();\r
\r
\r
// if in 8bit mode, generate 16bit image for menu background\r
if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))\r
- emu_forcedFrame();\r
+ emu_forcedFrame(POPT_EN_SOFTSCALE);\r
}\r
\r
\r