X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=ef6ea79772d992bf0c0184773e7439e0750bffe2;hb=a1ad40785ac6d954051e4e5882436da9a58cc3a6;hp=376c3e2a1e73aa4ba66585d36579b8474ba46501;hpb=7b8f7a2f13727201b2e6b6bcdbe60e31e56cfcd9;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index 376c3e2..ef6ea79 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -1,120 +1,106 @@ // // Virtual Jaguar Emulator // -// by cal2 +// Original codebase by Cal2 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) -// Cleanups/fixes by James L. Hammons +// Cleanups/fixes/enhancements by James L. Hammons and Adam Green // -// Added by SDLEMU (http://sdlemu.ngemu.com) -// Added for GCC UNIX compatibility #ifdef __GCCUNIX__ #include -#endif // __GCCUNIX__ +#endif +//#include // POSIX, but should compile with linux & mingw... #include #include -//#include "SDLptc.h" // Ick! Aargh! Bleah! #include "jaguar.h" -#include "crc32.h" -#include "unzip.h" - -// Uncomment this for speed control +//#include "crc32.h" +//#include "zlib.h" +//#include "unzip.h" +#include "video.h" +#include "gui.h" +#include "sdlemu_opengl.h" +#include "settings.h" // Pull in "vjs" struct + +// Uncomment this for speed control (?) //#define SPEED_CONTROL // Private function prototypes -uint32 JaguarLoadROM(uint8 *, char *); -void JaguarLoadCart(uint8 *, char *); +//uint32 JaguarLoadROM(uint8 *, char *); +//void JaguarLoadCart(uint8 *, char *); +//int gzfilelength(gzFile gd); // External variables -//These two should be local! -extern bool jaguar_use_bios; -extern bool dsp_enabled; - extern uint8 * jaguar_mainRam; extern uint8 * jaguar_bootRom; 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; -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; -//Console console; -//Surface * surface; -//Format format(16, 0x007C00, 0x00003E0, 0x0000001F); bool finished = false; -bool fullscreen = false; -bool hardwareTypeNTSC = true; // Set to false for PAL - -bool useJoystick = false; - +bool showGUI = false; +bool showMessage = false; +uint32 showMessageTimeout; +char messageBuffer[200]; -// Added/changed by SDLEMU http://sdlemu.ngemu.com - -uint32 totalFrames;//so we can grab this from elsewhere... +// +// 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 !!! [DONE] +uint32 totalFrames;//temp, so we can grab this from elsewhere... int main(int argc, char * argv[]) { uint32 startTime;//, totalFrames;//, endTime;//, w, h; -// int32 * vs; uint32 nNormalLast = 0; int32 nNormalFrac = 0; -// int32 i = 0; -//unused int32 nTime = 0; -//unused int32 nCount = 0; - int32 nFrameskip = 0; // Default: Show every frame - int32 nFrame = 0; // No. of Frame - int32 nJoyport = 0; // Joystick port - - printf("Virtual Jaguar/SDL v1.0.5 (GCC/SDL Port)\n"); - printf("Based upon Virtual Jaguar core v1.0.0 by cal2 of Potato emulation.\n"); - printf("Written by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)\n"); - printf("Portions massaged by James L. Hammons (WIN32)\n"); + int32 nFrameskip = 0; // Default: Show every frame + int32 nFrame = 0; // No. of Frame + + 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"); printf("Contact: http://sdlemu.ngemu.com/ | sdlemu@ngemu.com\n"); -// console.option("windowed output"); + bool haveCart = false; // Assume there is no cartridge...! - // BIOS is now ON by default--use the -nobios switch to turn it off! - jaguar_use_bios = true; - bool haveCart = false; // Assume there is no cartridge...! + log_init("vj.log"); + LoadVJSettings(); // Get config file settings... - // Checking the switches ;) + // Check the switches... ;-) + // NOTE: Command line switches can override any config file settings, thus the + // proliferation of the noXXX switches. ;-) for(int i=1; i 3) - nJoyport = 3; + vjs.joyport = atoi(argv[++i]) + 1; + if (vjs.joyport > 3) + vjs.joyport = 3; } if (!strcmp(argv[i], "-frameskip")) @@ -127,131 +113,90 @@ int main(int argc, char * argv[]) #endif } + if (!strcmp(argv[i], "-bios")) + vjs.useJaguarBIOS = true; + if (!strcmp(argv[i], "-nobios")) - jaguar_use_bios = false; + vjs.useJaguarBIOS = false; + + if (!strcmp(argv[i], "-dsp")) + vjs.DSPEnabled = true; + + 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], "-dspon")) - dsp_enabled = 1; + 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")) - hardwareTypeNTSC = false; + 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 (windowed default)\n"); - printf(" -frameskip 1-10 : Enable frameskip 1 (default) - 10 \n"); - printf(" -joystick : Enable joystick/gamepad \n"); - printf(" -joyport 0-3 : Select desired joystick port \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(" -? or -help : Display usage and switches \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(" -bios : Boot cart using Jaguar BIOS ROM \n"); + printf(" -nobios : Boot cart without using Jaguar BIOS ROM \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()); jaguar_init(); // Get the BIOS ROM - if (jaguar_use_bios) - JaguarLoadROM(jaguar_bootRom, jaguar_bootRom_path); + if (vjs.useJaguarBIOS) + JaguarLoadROM(jaguar_bootRom, vjs.jagBootPath); SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack... + InitVideo(); + InitGUI(); + // Get the cartridge ROM (if passed in) - if (haveCart) - JaguarLoadCart(jaguar_mainRom, argv[1]); + // Now with crunchy GUI goodness! +// JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : vjs.ROMPath)); +//Need to find a better way to handle this crap... + GUIMain(); - jaguar_reset(); +/* jaguar_reset(); - // Set up the backbuffer - int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); - memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16)); - - // Set up SDL library - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0) - { - WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError()); - exit(1); - } - - // Let's get proper info about the platform we're running on. - const SDL_VideoInfo * info = SDL_GetVideoInfo(); - - if (!info) - { - WriteLog("VJ: SDL is unable to get the video query: %s\n", SDL_GetError()); - exit(1); - } - - if (info->hw_available) - mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF; - - if (info->blit_hw) - mainSurfaceFlags |= SDL_HWACCEL; - - if (fullscreen) - mainSurfaceFlags |= SDL_FULLSCREEN; - - // Note: mainSurface is *never* used again! - //Not true--had to look at what's what here... - mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags); - - if (mainSurface == NULL) - { - WriteLog("VJ: SDL is unable to set the video mode: %s\n", SDL_GetError()); - exit(1); - } - - SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar"); - - // Create the primary SDL display (16 BPP, 5/5/5 RGB format) -// surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); -//Format format(16, 0x007C00, 0x00003E0, 0x0000001F); - surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_getVideoModeWidth(), - tom_getVideoModeHeight(), 16, 0x7C00, 0x03E0, 0x001F, 0); - if (surface == NULL) - { - WriteLog("VJ: Could not create primary SDL surface: %s", SDL_GetError()); - exit(1); - } - - // Initialize Joystick support under SDL -// if (console.JoyEnabled() == 1) - if (useJoystick) - { - if (SDL_NumJoysticks() <= 0) - { -// console.option("joystick disabled"); - useJoystick = false; - printf("No joystick(s) or joypad(s) detected on your system. Using keyboard...\n"); - } - else - { -// if ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0) - if ((joystick = SDL_JoystickOpen(nJoyport)) == 0) - { -// console.option("joystick disabled"); - useJoystick = false; - printf("Unable to open a Joystick on port: %d\n", (int)nJoyport); - } - else - printf("Using: %s\n", SDL_JoystickName(nJoyport)); - } - } - - // Open the display and start emulating some 3l337 Atari Jaguar games :P -// console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); - totalFrames = 0; startTime = clock(); nNormalLast = 0; // Last value of timeGetTime() @@ -285,115 +230,47 @@ int main(int argc, char * argv[]) for(int i=0; ilock(); - if (SDL_MUSTLOCK(surface)) - while (SDL_LockSurface(surface) < 0) - SDL_Delay(10); -// uint8 * vs = (Uint8 *)surface->pixels; -// memcpy(vs, backbuffer, tom_width * tom_height * 2); - memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2); -// surface->unlock(); - if (SDL_MUSTLOCK(surface)) - SDL_UnlockSurface(surface); -// surface->copy(console); - SDL_Rect srcrect, dstrect; - srcrect.x = srcrect.y = 0, srcrect.w = surface->w, srcrect.h = surface->h; - dstrect.x = dstrect.y = 0, dstrect.w = surface->w, dstrect.h = surface->h; -// SDL_LowerBlit(surface, &srcrect, dst.surface, &dstrect); - SDL_BlitSurface(surface, &srcrect, mainSurface, &dstrect); -// dst.updates[dst.nupdates++] = dstrect; -// console.update(); - SDL_Flip(mainSurface); -// nupdates = 0; - + RenderBackbuffer(); nFrame = 0; } else nFrame++; joystick_exec(); - + #ifdef SPEED_CONTROL } #endif - } + }*/ int elapsedTime = clock() - startTime; int fps = (1000 * totalFrames) / elapsedTime; - fprintf(log_get(), "Statistics: %i FPS\n", fps); + WriteLog("VJ: Ran at an average of %i FPS.\n", fps); jaguar_done(); version_done(); memory_done(); + VideoDone(); // Free SDL components last...! log_done(); -// console.close(); // Close SDL items as last! - SDL_JoystickClose(joystick); - SDL_FreeSurface(surface); - SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER); - SDL_Quit(); return 0; } - -// -// Generic ROM loading -// -uint32 JaguarLoadROM(uint8 * rom, char * path) -{ - uint32 romSize; - - WriteLog("JagEm: Loading %s...", path); - - char * ext = strrchr(path, '.'); - if (strcmpi(ext, ".zip") == 0) - { - // Handle ZIP file loading here... - WriteLog("(ZIPped)..."); - - if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) - { - WriteLog("Failed!\n"); - log_done(); - exit(0); - } - } - else - { - FILE * fp = fopen(path, "rb"); - - if (fp == NULL) - { - WriteLog("Failed!\n"); - log_done(); - exit(0); - } - - fseek(fp, 0, SEEK_END); - romSize = ftell(fp); - fseek(fp, 0, SEEK_SET); - fread(rom, 1, romSize, fp); - fclose(fp); - } - - WriteLog("OK (%i bytes)\n", romSize); - return romSize; -} - -// -// Jaguar cartridge ROM loading -// -void JaguarLoadCart(uint8 * mem, char * path) -{ - uint32 romsize = JaguarLoadROM(mem, path); - jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romsize); - WriteLog( "CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); - eeprom_init(); -}