X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=ef6ea79772d992bf0c0184773e7439e0750bffe2;hb=a1ad40785ac6d954051e4e5882436da9a58cc3a6;hp=303da5310aecf2e1f127e28913815a9858b66857;hpb=91b25f65139b827132c4deb7f9d9b2501d249454;p=virtualjaguar

diff --git a/src/vj.cpp b/src/vj.cpp
index 303da53..ef6ea79 100644
--- a/src/vj.cpp
+++ b/src/vj.cpp
@@ -10,13 +10,13 @@
 #include <unistd.h>
 #endif
 
-#include <dirent.h>									// POSIX, but should compile with linux & mingw...
+//#include <dirent.h>									// POSIX, but should compile with linux & mingw...
 #include <time.h>
 #include <SDL.h>
 #include "jaguar.h"
-#include "crc32.h"
-#include "zlib.h"
-#include "unzip.h"
+//#include "crc32.h"
+//#include "zlib.h"
+//#include "unzip.h"
 #include "video.h"
 #include "gui.h"
 #include "sdlemu_opengl.h"
@@ -27,10 +27,9 @@
 
 // Private function prototypes
 
-//void InitSDL(void);
-uint32 JaguarLoadROM(uint8 *, char *);
-void JaguarLoadCart(uint8 *, char *);
-int gzfilelength(gzFile gd);
+//uint32 JaguarLoadROM(uint8 *, char *);
+//void JaguarLoadCart(uint8 *, char *);
+//int gzfilelength(gzFile gd);
 
 // External variables
 
@@ -40,16 +39,18 @@ extern uint8 * jaguar_mainRom;
 
 // Various paths
 
-static char * jaguar_bootRom_path = "./bios/jagboot.rom";
+//static char * jaguar_bootRom_path = "./bios/jagboot.rom";
 //static char  *jaguar_bootRom_path="c:/jaguarEmu/newload.img";
 //static char  *jaguar_bootRom_path="./bios/JagOS.bin";
-char * jaguar_eeproms_path = "./eeproms/";
-char jaguar_boot_dir[1024];
+//char * jaguar_eeproms_path = "./eeproms/";
+//char jaguar_boot_dir[MAX_PATH];
 
-SDL_Surface * surface, * mainSurface;
-int16 * backbuffer = NULL;
-SDL_Joystick * joystick;
-Uint32 mainSurfaceFlags = SDL_SWSURFACE;
+//These should go into video.cpp...
+//And they will!
+//SDL_Surface * surface, * mainSurface;
+//int16 * backbuffer = NULL;
+//SDL_Joystick * joystick;
+//Uint32 mainSurfaceFlags = SDL_SWSURFACE;
 
 bool finished = false;
 bool showGUI = false;
@@ -61,7 +62,7 @@ char messageBuffer[200];
 // The main emulator loop (what else?)
 //
 //Maybe we should move the video stuff to TOM? Makes more sense to put it there...
-//Actually, it would probably be better served in VIDEO.CPP... !!! FIX !!!
+//Actually, it would probably be better served in VIDEO.CPP... !!! FIX !!! [DONE]
 uint32 totalFrames;//temp, so we can grab this from elsewhere...
 int main(int argc, char * argv[])
 {
@@ -71,7 +72,7 @@ int main(int argc, char * argv[])
     int32 nFrameskip = 0;							// Default: Show every frame
     int32 nFrame = 0;								// No. of Frame
 
-	printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v1.0.6\n");
+	printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v1.0.7\n");
 	printf("Based upon Virtual Jaguar core v1.0.0 by Cal2 of Potato emulation.\n");
 	printf("Written by Niels Wagenaar (Linux/WIN32), Caz (BeOS),\n");
 	printf("James L. Hammons (WIN32) and Adam Green (MacOS)\n");
@@ -79,10 +80,12 @@ int main(int argc, char * argv[])
 
 	bool haveCart = false;							// Assume there is no cartridge...!
 
+	log_init("vj.log");
 	LoadVJSettings();								// Get config file settings...
 
 	// Check the switches... ;-)
-	// NOTE: Command line switches can override any config file settings.
+	// NOTE: Command line switches can override any config file settings, thus the
+	//       proliferation of the noXXX switches. ;-)
 
 	for(int i=1; i<argc || argv[i]!=NULL; i++)
 	{
@@ -90,9 +93,6 @@ int main(int argc, char * argv[])
 		if (argv[i][0] != '-')
 			haveCart = true;						// It looks like we have a cartridge!
 
-		if (!strcmp(argv[i], "-fullscreen")) 
-			vjs.fullscreen = true;
-
 		if (!strcmp(argv[i], "-joystick")) 
 			vjs.useJoystick = true;
 
@@ -119,37 +119,62 @@ int main(int argc, char * argv[])
 		if (!strcmp(argv[i], "-nobios"))
 			vjs.useJaguarBIOS = false;
 
-		if (!strcmp(argv[i], "-dspon"))
+		if (!strcmp(argv[i], "-dsp"))
 			vjs.DSPEnabled = true;
 
-		if (!strcmp(argv[i], "-pal"))
-			vjs.hardwareTypeNTSC = false;
+		if (!strcmp(argv[i], "-nodsp"))
+			vjs.DSPEnabled = false;
+
+		if (!strcmp(argv[i], "-pipeline"))
+			vjs.usePipelinedDSP = true;
+
+		if (!strcmp(argv[i], "-nopipeline"))
+			vjs.usePipelinedDSP = false;
+
+		if (!strcmp(argv[i], "-gl"))
+			vjs.useOpenGL = true;
 
 		if (!strcmp(argv[i], "-nogl"))
 			vjs.useOpenGL = false;
 
+		if (!strcmp(argv[i], "-fullscreen")) 
+			vjs.fullscreen = true;
+
+		if (!strcmp(argv[i], "-window")) 
+			vjs.fullscreen = false;
+
+		if (!strcmp(argv[i], "-pal"))
+			vjs.hardwareTypeNTSC = false;
+
+		if (!strcmp(argv[i], "-ntsc"))
+			vjs.hardwareTypeNTSC = true;
+
 		if (!strcmp(argv[i], "-help") || !strcmp(argv[i], "-?"))
 		{
 		    printf("Usage: \n\n");
 			printf("vj [romfile] [switches]\n");
 			printf("  -? or -help     : Display usage and switches                \n");
-			printf("  -fullscreen     : Enable fullscreen mode (default: windowed)\n");
 			printf("  -frameskip 1-10 : Enable frameskip 1 - 10 (default: none)   \n");
 			printf("  -joystick       : Enable joystick/gamepad                   \n");
-			printf("  -joyport   0-3  : Select desired joystick port              \n");
+			printf("  -joyport 0-3    : Select desired joystick port              \n");
 			printf("  -bios           : Boot cart using Jaguar BIOS ROM           \n");
 			printf("  -nobios         : Boot cart without using Jaguar BIOS ROM   \n");
-			printf("  -dspon          : Force VJ to use the DSP                   \n");
-			printf("  -pal            : Force VJ to PAL mode (default is NTSC)    \n");
+			printf("  -dsp            : Force VJ to use the DSP                   \n");
+			printf("  -nodsp          : Force VJ to run without the DSP           \n");
+			printf("  -pipeline       : Use the DSP pipelined core                \n");
+			printf("  -nopipeline     : Use the DSP non-pipelined core            \n");
+			printf("  -gl             : Use OpenGL rendering                      \n");
 			printf("  -nogl           : Use old non-OpenGL rendering              \n");
+			printf("  -fullscreen     : Enable fullscreen mode (default: windowed)\n");
+			printf("  -window         : Enable windowed mode                      \n");
+			printf("  -pal            : Force VJ to PAL mode (default: NTSC)      \n");
+			printf("  -ntsc           : Force VJ to NTSC mode                     \n");
 			printf("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n");
 			printf("with the Jaguar BIOS.\n");
  			return 1;
 		}
     }
 
-	getcwd(jaguar_boot_dir, 1024);
-	log_init("vj.log");
 	memory_init();
 	version_init();
 	version_display(log_get());
@@ -157,23 +182,20 @@ int main(int argc, char * argv[])
 
 	// Get the BIOS ROM
 	if (vjs.useJaguarBIOS)
-		JaguarLoadROM(jaguar_bootRom, jaguar_bootRom_path);
+		JaguarLoadROM(jaguar_bootRom, vjs.jagBootPath);
 
 	SET32(jaguar_mainRam, 0, 0x00200000);			// Set top of stack...
 
-	// Set up the backbuffer
-//To be safe, this should be 1280 * 625 * 2...
-	backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
-	memset(backbuffer, 0x22, VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT * sizeof(int16));
-
 	InitVideo();
 	InitGUI();
 
 	// Get the cartridge ROM (if passed in)
 	// Now with crunchy GUI goodness!
-	JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : (char *)""));
+//	JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : vjs.ROMPath));
+//Need to find a better way to handle this crap...
+	GUIMain();
 
-	jaguar_reset();
+/*	jaguar_reset();
 	
 	totalFrames = 0;
 	startTime = clock();
@@ -211,6 +233,10 @@ int main(int argc, char * argv[])
             // Set up new backbuffer with new pixels and data
 			JaguarExecute(backbuffer, true);
 			totalFrames++;
+//WriteLog("Frame #%u...\n", totalFrames);
+//extern bool doDSPDis;
+//if (totalFrames == 373)
+//	doDSPDis = true;
 
 			// Some QnD GUI stuff here...
 			if (showGUI)
@@ -234,7 +260,7 @@ int main(int argc, char * argv[])
 #ifdef SPEED_CONTROL
 		}
 #endif
-	}
+	}*/
 
 	int elapsedTime = clock() - startTime;
 	int fps = (1000 * totalFrames) / elapsedTime;
@@ -248,124 +274,3 @@ int main(int argc, char * argv[])
 
     return 0;
 }
-
-//
-// Generic ROM loading
-//
-uint32 JaguarLoadROM(uint8 * rom, char * path)
-{
-	uint32 romSize = 0;
-
-	char * ext = strrchr(path, '.');
-	if (ext != NULL)
-	{
-		WriteLog("VJ: Loading %s...", path);
-
-		if (stricmp(ext, ".zip") == 0)
-		{
-			// Handle ZIP file loading here...
-			WriteLog("(ZIPped)...");
-
-			if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
-			{
-				WriteLog("Failed!\n");
-				return 0;
-			}
-		}
-		else
-		{
-/*			FILE * fp = fopen(path, "rb");
-
-			if (fp == NULL)
-			{
-				WriteLog("Failed!\n");
-				return 0;
-			}
-
-			fseek(fp, 0, SEEK_END);
-			romSize = ftell(fp);
-			fseek(fp, 0, SEEK_SET);
-			fread(rom, 1, romSize, fp);
-			fclose(fp);*/
-
-			gzFile fp = gzopen(path, "rb");
-
-			if (fp == NULL)
-			{
-				WriteLog("Failed!\n");
-				return 0;
-			}
-
-			romSize = gzfilelength(fp);
-			gzseek(fp, 0, SEEK_SET);
-			gzread(fp, rom, romSize);
-			gzclose(fp);
-		}
-
-		WriteLog("OK (%i bytes)\n", romSize);
-	}
-
-	return romSize;
-}
-
-//
-// Jaguar cartridge ROM loading
-//
-void JaguarLoadCart(uint8 * mem, char * path)
-{
-	uint32 romSize = JaguarLoadROM(mem, path);
-
-	if (romSize == 0)
-	{
-		char newPath[2048];
-		WriteLog("VJ: Trying GUI...\n");
-
-//This is not *nix friendly for some reason...
-//		if (!UserSelectFile(path, newPath))
-		if (!UserSelectFile((path == "" ? (char *)"." : path), newPath))
-		{
-			WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path);
-			log_done();
-			exit(0);
-		}
-
-		romSize = JaguarLoadROM(mem, newPath);
-
-		if (romSize == 0)
-		{
-			WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath);
-			log_done();
-			exit(0);
-		}
-	}
-
-	jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize);
-	WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
-	eeprom_init();
-}
-
-//
-// Get the length of a (possibly) gzipped file
-//
-int gzfilelength(gzFile gd)
-{
-   int size = 0, length = 0;
-   unsigned char buffer[0x10000];
-
-   gzrewind(gd);
-
-   do
-   {
-      // Read in chunks until EOF
-      size = gzread(gd, buffer, 0x10000);
-
-      if (size <= 0)
-      	break;
-
-      length += size;
-   }
-   while (!gzeof(gd));
-
-   gzrewind(gd);
-   return length;
-}