X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=32d7e3797cc20b601c05d78f12754ddc403fb291;hb=b42338b5d2eefdb3062c9a3363b580d6594ccb32;hp=21d8ffbf8a6dbbde130c8bc1d30755caf5b5bd04;hpb=053fb8314018df7866ade5c62c98d90007e47199;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index 21d8ffb..32d7e37 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -1,39 +1,38 @@ // // 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 // POSIX, but should compile with linux & mingw... #include #include #include "jaguar.h" #include "crc32.h" +#include "zlib.h" #include "unzip.h" +#include "video.h" #include "gui.h" +#include "sdlemu_opengl.h" // For testing only... ;-) // Uncomment this for speed control //#define SPEED_CONTROL // Private function prototypes +void InitSDL(void); 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; @@ -47,48 +46,46 @@ char * jaguar_eeproms_path = "./eeproms/"; char jaguar_boot_dir[1024]; SDL_Surface * surface, * mainSurface; +int16 * backbuffer = NULL; SDL_Joystick * joystick; Uint32 mainSurfaceFlags = SDL_SWSURFACE; bool finished = false; bool fullscreen = false; -bool hardwareTypeNTSC = true; // Set to false for PAL +bool hardwareTypeNTSC = true; // Set to false for PAL bool useJoystick = false; +int32 nJoyport = 0; // Joystick port bool showGUI = false; +//These two should be local! +// And now they are! ;-) +bool jaguar_use_bios = false; // Default is now to USE the BIOS +bool dsp_enabled = false; -int16 * backbuffer = NULL; +// Keybindings in order of L, R, U, D, C, B, A, Op, Pa, 0-9, #, * +uint16 p1KeyBindings[21] = {}; +uint16 p2KeyBindings[21] = {}; -// Added/changed by SDLEMU http://sdlemu.ngemu.com +bool showMessage = false; +uint32 showMessageTimeout; +char messageBuffer[200]; -uint32 totalFrames;//so we can grab this from elsewhere... -int main(int argc, char * argv[]) -{ +bool useOpenGL = true; // ! ;-) -/*DIR * dp = opendir("../../ROMs/"); -if (dp == NULL) - printf("Could not open directory!\n"); -else +// +// The main emulator loop (what else?) +// +//Maybe we should move the video stuff to TOM? Makes more sense to put it there... +uint32 totalFrames;//temp, so we can grab this from elsewhere... +int main(int argc, char * argv[]) { - dirent * de; - while ((de = readdir(dp)) != NULL) - { - char * ext = strrchr(de->d_name, '.'); - if (strcmpi(ext, ".zip") == 0 || strcmpi(ext, ".jag") == 0) - printf("--> %s\n", de->d_name); - } - - closedir(dp); -}*/ - uint32 startTime;//, totalFrames;//, endTime;//, w, h; uint32 nNormalLast = 0; int32 nNormalFrac = 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("Virtual Jaguar/SDL v1.0.6 (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"); @@ -96,7 +93,7 @@ else // 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...! + bool haveCart = false; // Assume there is no cartridge...! // Checking the switches ;) @@ -147,14 +144,14 @@ else { 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(" -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(" -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("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n"); printf("with the Jaguar BIOS.\n"); return 1; @@ -174,6 +171,7 @@ else SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack... +//This is done here, so that we get valid numbers from TOM... !!! FIX !!! jaguar_reset(); // Set up the backbuffer @@ -181,78 +179,13 @@ else backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); memset(backbuffer, 0x22, 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 info: %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... It's the primary surface... - 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 = 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\n", SDL_GetError()); - exit(1); - } - - // Initialize Joystick support under SDL - if (useJoystick) - { - if (SDL_NumJoysticks() <= 0) - { - useJoystick = false; - printf("VJ: No joystick(s) or joypad(s) detected on your system. Using keyboard...\n"); - } - else - { - if ((joystick = SDL_JoystickOpen(nJoyport)) == 0) - { - useJoystick = false; - printf("VJ: Unable to open a Joystick on port: %d\n", (int)nJoyport); - } - else - printf("VJ: Using: %s\n", SDL_JoystickName(nJoyport)); - } - } + InitSDL(); // 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] : (char *)".")); + JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : (char *)"")); //Do this again??? Hmm... This is not very nice. //Maybe it's not necessary??? Seems to be, at least for PD ROMs... !!! FIX !!! @@ -298,37 +231,22 @@ else // GUI stuff here... if (showGUI) { - extern uint32 gpu_pc; - extern uint32 dsp_pc; - DrawText(backbuffer, 8, 0, true, "Friendly GUI brought to you by JLH ;-)"); - DrawText(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc); - DrawText(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc); + extern uint32 gpu_pc, dsp_pc; + DrawString(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc); + DrawString(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc); } // Simple frameskip if (nFrame == nFrameskip) { - if (SDL_MUSTLOCK(surface)) - while (SDL_LockSurface(surface) < 0) - SDL_Delay(10); - - memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2); - - if (SDL_MUSTLOCK(surface)) - SDL_UnlockSurface(surface); - - 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_BlitSurface(surface, &srcrect, mainSurface, &dstrect); - SDL_Flip(mainSurface); + RenderBackbuffer(); nFrame = 0; } else nFrame++; joystick_exec(); - + #ifdef SPEED_CONTROL } #endif @@ -343,6 +261,8 @@ else memory_done(); log_done(); + if (useOpenGL) + sdlemu_close_opengl(); SDL_JoystickClose(joystick); SDL_FreeSurface(surface); SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER); @@ -352,137 +272,89 @@ else } // -// Very very crude GUI file selector +// Prime SDL and create surfaces // -uint32 DoROMFind(uint8 * mem, char * path) +void InitSDL(void) { - char cartName[2048]; // Really, should be MAX_PATH or something like it - uint32 numFiles = 0; - DIR * dp = opendir(path); - - if (dp == NULL) - { - WriteLog("VJ: Could not open directory \"%s\"!\nAborting!\n", path); - log_done(); - exit(0); - } - else + // Set up SDL library + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0) { - dirent * de; - while ((de = readdir(dp)) != NULL) - { - char * ext = strrchr(de->d_name, '.'); - if (ext != NULL) - if (strcmpi(ext, ".zip") == 0 || strcmpi(ext, ".jag") == 0) - numFiles++; - } - closedir(dp); + WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError()); + exit(1); } - if (numFiles == 0) + // Get proper info about the platform we're running on... + const SDL_VideoInfo * info = SDL_GetVideoInfo(); + + if (!info) { - WriteLog("Found no ROM files!\nAborting!\n"); - log_done(); - exit(0); + WriteLog("VJ: SDL is unable to get the video info: %s\n", SDL_GetError()); + exit(1); } - char * names = (char *)malloc(numFiles * 2048); - if (names == NULL) + if (useOpenGL) { - WriteLog("Could not allocate memory for %u files!\nAborting!\n", numFiles); - log_done(); - exit(0); + mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF | SDL_OPENGL; + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); } - - int i = 0; - dp = opendir(path); - dirent * de; - while ((de = readdir(dp)) != NULL) + else { - char * ext = strrchr(de->d_name, '.'); - if (ext != NULL) - if (strcmpi(ext, ".zip") == 0 || strcmpi(ext, ".jag") == 0) - strcpy(&names[i++ * 2048], de->d_name); + if (info->hw_available) + mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF; + + if (info->blit_hw) + mainSurfaceFlags |= SDL_HWACCEL; } - closedir(dp); - // Main GUI selection loop + if (fullscreen) + mainSurfaceFlags |= SDL_FULLSCREEN; - uint32 cursor = 0; +// mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags); +//Testing purposes... :-) + mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth()*2, tom_getVideoModeHeight()*2, 16, mainSurfaceFlags); - if (numFiles > 1) // Only go GUI if more than one possibility! - { - bool done = false; - uint32 limit = (numFiles > 24 ? 24 : numFiles); - SDL_Event event; - while (!done) - - while (SDL_PollEvent(&event)) + if (mainSurface == NULL) { - // Draw the GUI... - memset(backbuffer, 0x11, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2); - uint32 startFile = (cursor >= limit ? cursor - limit + 1 : 0); - for(uint32 i=0; ipixels, backbuffer, tom_width * tom_height * 2); - memcpy(surface->pixels, backbuffer, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2); + SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar"); - if (SDL_MUSTLOCK(surface)) - SDL_UnlockSurface(surface); + // Create the primary SDL display (16 BPP, 5/5/5 RGB format) + surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_getVideoModeWidth(), + tom_getVideoModeHeight(), 16, 0x7C00, 0x03E0, 0x001F, 0); - 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_BlitSurface(surface, &srcrect, mainSurface, &dstrect); - SDL_Flip(mainSurface); + if (surface == NULL) + { + WriteLog("VJ: Could not create primary SDL surface: %s\n", SDL_GetError()); + exit(1); + } + if (useOpenGL) +// sdlemu_init_opengl(surface, 1/*method*/, 1/*size*/, 0/*texture type (linear, nearest)*/); +//Testing purposes... :-) + sdlemu_init_opengl(surface, 1/*method*/, 2/*size*/, 0/*texture type (linear, nearest)*/); - if (event.type == SDL_KEYDOWN) + // Initialize Joystick support under SDL + if (useJoystick) + { + if (SDL_NumJoysticks() <= 0) { - switch (event.key.keysym.sym) + useJoystick = false; + printf("VJ: No joystick(s) or joypad(s) detected on your system. Using keyboard...\n"); + } + else + { + if ((joystick = SDL_JoystickOpen(nJoyport)) == 0) { - case SDLK_UP: - if (cursor != 0) - cursor--; - break; - case SDLK_DOWN: - if (cursor != numFiles - 1) - cursor++; - break; - case SDLK_RETURN: - done = true; - break; + useJoystick = false; + printf("VJ: Unable to open a Joystick on port: %d\n", (int)nJoyport); } + else + printf("VJ: Using: %s\n", SDL_JoystickName(nJoyport)); } } - } - - strcpy(cartName, path); - if (path[strlen(path) - 1] != '/') - strcat(cartName, "/"); - strcat(cartName, &names[cursor * 2048]); - free(names); - - uint32 romSize = JaguarLoadROM(mem, cartName); - if (romSize == 0) - { - log_done(); - exit(0); - } - return romSize; } // @@ -497,7 +369,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) { WriteLog("VJ: Loading %s...", path); - if (strcmpi(ext, ".zip") == 0) + if (stricmp(ext, ".zip") == 0) { // Handle ZIP file loading here... WriteLog("(ZIPped)..."); @@ -505,20 +377,16 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) { WriteLog("Failed!\n"); -// log_done(); -// exit(0); return 0; } } else { - FILE * fp = fopen(path, "rb"); +/* FILE * fp = fopen(path, "rb"); if (fp == NULL) { WriteLog("Failed!\n"); -// log_done(); -// exit(0); return 0; } @@ -526,7 +394,21 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) romSize = ftell(fp); fseek(fp, 0, SEEK_SET); fread(rom, 1, romSize, fp); - fclose(fp); + fclose(fp);*/ + + gzFile fp = gzopen(path, "rb"); + + if (fp == NULL) + { + WriteLog("Failed!\n"); + return 0; + } + + //fseek(fp, 0, SEEK_END); + romSize = gzfilelength(fp);//ftell(fp); + gzseek(fp, 0, SEEK_SET); + gzread(fp, rom, romSize); + gzclose(fp); } WriteLog("OK (%i bytes)\n", romSize); @@ -544,11 +426,55 @@ void JaguarLoadCart(uint8 * mem, char * path) if (romSize == 0) { + char newPath[2048]; WriteLog("VJ: Trying GUI...\n"); - romSize = DoROMFind(mem, path); + +//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); + 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; +}