X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=adb10a351ef4c71614afea976e9259038a6f62e8;hb=c7a4ff64287b12487c7e9cc13ce3b7d2aa6e1f06;hp=bfbc0c11b2ef400a84427cbfd278508eb122ca47;hpb=b9f8cb3d6d8d0b5965fab83a27fc356a56442ddb;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index bfbc0c1..adb10a3 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -18,7 +18,8 @@
 #include "gp2x.h"
 #include "usbjoy.h"
 #include "menu.h"
-#include "asmutils.h"
+#include "../common/arm_utils.h"
+#include "../common/fonts.h"
 #include "cpuctrl.h"
 
 #include <Pico/PicoInt.h>
@@ -51,7 +52,7 @@ static int combo_keys = 0, combo_acts = 0;	// keys and actions which need button
 static int gp2x_old_gamma = 100;
 static unsigned char *movie_data = NULL;
 static int movie_size = 0;
-unsigned char *framebuff = 0;  // temporary buffer for alt renderer
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer
 int state_slot = 0;
 int reset_timing = 0;
 int config_slot = 0, config_slot_current = 0;
@@ -277,7 +278,7 @@ int emu_ReloadRom(void)
 		// bios_help() ?
 		return 0;
 	} else {
-		if (PicoMCD & 1) PicoExitMCD();
+		if (PicoMCD & 1) Stop_CD();
 		PicoMCD &= ~1;
 	}
 
@@ -388,10 +389,10 @@ static void emu_msg_tray_open(void);
 void emu_Init(void)
 {
 	// make temp buffer for alt renderer
-	framebuff = malloc((8+320)*(8+240+8));
-	if (!framebuff)
+	PicoDraw2FB = malloc((8+320)*(8+240+8));
+	if (!PicoDraw2FB)
 	{
-		printf("framebuff == 0\n");
+		printf("PicoDraw2FB == 0\n");
 	}
 
 	// make dirs for saves, cfgs, etc.
@@ -625,7 +626,7 @@ void emu_Deinit(void)
 		}
 	}
 
-	free(framebuff);
+	free(PicoDraw2FB);
 
 	PicoExit();
 
@@ -634,6 +635,53 @@ void emu_Deinit(void)
 		set_gamma(100, 0);
 }
 
+static void text_out8_builtin(int x, int y, const char *text)
+{
+	int i,l,len=strlen(text);
+	unsigned char *screen = (unsigned char *)gp2x_screen + x + y*320;
+
+	/* always using built-in font */
+	for (i = 0; i < len; i++)
+	{
+		for (l=0;l<8;l++)
+		{
+			unsigned char fd = fontdata8x8[((text[i])*8)+l];
+			if (fd&0x80) screen[l*320+0]=0xf0;
+			if (fd&0x40) screen[l*320+1]=0xf0;
+			if (fd&0x20) screen[l*320+2]=0xf0;
+			if (fd&0x10) screen[l*320+3]=0xf0;
+			if (fd&0x08) screen[l*320+4]=0xf0;
+			if (fd&0x04) screen[l*320+5]=0xf0;
+			if (fd&0x02) screen[l*320+6]=0xf0;
+			if (fd&0x01) screen[l*320+7]=0xf0;
+		}
+		screen += 8;
+	}
+}
+
+static void text_out16_builtin(int x, int y, const char *text)
+{
+	int i,l,len=strlen(text);
+	unsigned short *screen = (unsigned short *)gp2x_screen + x + y*320;
+
+	for (i = 0; i < len; i++)
+	{
+		for (l=0;l<8;l++)
+		{
+			unsigned char fd = fontdata8x8[((text[i])*8)+l];
+			if(fd&0x80) screen[l*320+0]=0xffff;
+			if(fd&0x40) screen[l*320+1]=0xffff;
+			if(fd&0x20) screen[l*320+2]=0xffff;
+			if(fd&0x10) screen[l*320+3]=0xffff;
+			if(fd&0x08) screen[l*320+4]=0xffff;
+			if(fd&0x04) screen[l*320+5]=0xffff;
+			if(fd&0x02) screen[l*320+6]=0xffff;
+			if(fd&0x01) screen[l*320+7]=0xffff;
+		}
+		screen += 8;
+	}
+}
+
 
 void osd_text(int x, int y, const char *text)
 {
@@ -647,7 +695,7 @@ void osd_text(int x, int y, const char *text)
 			p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));
 			for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
 		}
-		gp2x_text_out8_2(x, y, text, 0xf0);
+		text_out8_builtin(x, y, text);
 	} else {
 		int *p, i, h;
 		x &= ~1; // align x
@@ -656,7 +704,7 @@ void osd_text(int x, int y, const char *text)
 			p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));
 			for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;
 		}
-		gp2x_text_out15(x, y, text);
+		text_out16_builtin(x, y, text);
 	}
 }
 
@@ -720,7 +768,7 @@ static void blit(const char *fps, const char *notice)
 			// feed new palette to our device
 			gp2x_video_setpalette(localPal, 0x40);
 		}
-		vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+		vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
 	} else if (!(emu_opt&0x80)) {
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal) {
@@ -794,7 +842,7 @@ static void vidResetMode(void)
 	if (PicoOpt&0x10) {
 		gp2x_video_changemode(8);
 	} else if (currentConfig.EmuOpt&0x80) {
-		gp2x_video_changemode(15);
+		gp2x_video_changemode(16);
 		PicoDrawSetColorFormat(1);
 		PicoScan = EmuScan16;
 		PicoScan(0, 0);
@@ -1045,20 +1093,31 @@ static void SkipFrame(int do_audio)
 void emu_forced_frame(void)
 {
 	int po_old = PicoOpt;
+	int eo_old = currentConfig.EmuOpt;
+
+	PicoOpt &= ~0x0010;
+	PicoOpt |=  0x4080; // soft_scale | acc_sprites
+	currentConfig.EmuOpt |= 0x80;
 
-	PicoOpt |= 0x10;
-	PicoFrameFull();
+	//vidResetMode();
+	PicoDrawSetColorFormat(1);
+	PicoScan = EmuScan16;
+	PicoScan(0, 0);
+	Pico.m.dirtyPal = 1;
+	PicoFrameDrawOnly();
 
+/*
 	if (!(Pico.video.reg[12]&1)) {
 		vidCpyM2 = vidCpyM2_32col;
 		clearArea(1);
 	} else	vidCpyM2 = vidCpyM2_40col;
 
-	vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+	vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);
 	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
 	gp2x_video_setpalette(localPal, 0x40);
-
+*/
 	PicoOpt = po_old;
+	currentConfig.EmuOpt = eo_old;
 }
 
 static void simpleWait(int thissec, int lim_time)
@@ -1375,12 +1434,9 @@ if (Pico.m.frame_count == 31563) {
 		SRam.changed = 0;
 	}
 
-	// if in 16bit mode, generate 8it image for menu background
-	if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80))
+	// if in 8bit mode, generate 16bit image for menu background
+	if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))
 		emu_forced_frame();
-
-	// for menu bg
-	gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);
 }