X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=376c3e2a1e73aa4ba66585d36579b8474ba46501;hb=7b8f7a2f13727201b2e6b6bcdbe60e31e56cfcd9;hp=9d28b92339e11dbb1b0299f707ba7e5bc7460575;hpb=fa566a2c8ec532eb5325b4d5a663fb2a7d72adc6;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index 9d28b92..376c3e2 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -14,7 +14,7 @@ #include #include -#include "SDLptc.h" +//#include "SDLptc.h" // Ick! Aargh! Bleah! #include "jaguar.h" #include "crc32.h" #include "unzip.h" @@ -22,59 +22,49 @@ // Uncomment this for speed control //#define SPEED_CONTROL -// // Private function prototypes -// uint32 JaguarLoadROM(uint8 *, char *); void JaguarLoadCart(uint8 *, char *); -// +// 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="c:/jaguarEmu/newload.img"; 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]; -//static char romLoadDialog_filePath[1024]; +SDL_Surface * surface, * mainSurface; +SDL_Joystick * joystick; +Uint32 mainSurfaceFlags = SDL_SWSURFACE; -Console console; -Surface * surface; -Format format(16, 0x007C00, 0x00003E0, 0x0000001F); +//Console console; +//Surface * surface; +//Format format(16, 0x007C00, 0x00003E0, 0x0000001F); bool finished = false; bool fullscreen = false; bool hardwareTypeNTSC = true; // Set to false for PAL -// -// External variables -// - -extern bool jaguar_use_bios; -extern bool dsp_enabled; -extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_bootRom; -extern uint8 * jaguar_mainRom; - +bool useJoystick = false; -void main_screen_switch(void) -{ - fullscreen = !fullscreen; - if (fullscreen) - console.option("fullscreen output"); - else - console.option("windowed output"); - console.close(); - console.open("Virtual Jaguar", tom_width, tom_height, format); -} // Added/changed by SDLEMU http://sdlemu.ngemu.com +uint32 totalFrames;//so we can grab this from elsewhere... int main(int argc, char * argv[]) { - uint32 startTime, totalFrames;//, endTime;//, w, h; + uint32 startTime;//, totalFrames;//, endTime;//, w, h; // int32 * vs; uint32 nNormalLast = 0; int32 nNormalFrac = 0; @@ -85,13 +75,13 @@ int main(int argc, char * argv[]) int32 nFrame = 0; // No. of Frame int32 nJoyport = 0; // Joystick port - printf("Virtual Jaguar/SDL v1.0.4 (GCC/SDL Port)\n"); + 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"); printf("Contact: http://sdlemu.ngemu.com/ | sdlemu@ngemu.com\n"); - console.option("windowed output"); +// console.option("windowed output"); // BIOS is now ON by default--use the -nobios switch to turn it off! jaguar_use_bios = true; @@ -106,16 +96,19 @@ int main(int argc, char * argv[]) haveCart = true; // It looks like we have a cartridge! if (!strcmp(argv[i], "-fullscreen")) - { +// { fullscreen = true; - console.option("fullscreen output"); - } +// console.option("fullscreen output"); +// } - if (!strcmp(argv[i], "-window")) - console.option("windowed output"); +//We *don't* need this option! +/* if (!strcmp(argv[i], "-window")) +// console.option("windowed output"); + fullscreen = false;*/ if (!strcmp(argv[i], "-joystick")) - console.option("joystick enabled"); +// console.option("joystick enabled"); + useJoystick = true; if (!strcmp(argv[i], "-joyport")) { @@ -147,18 +140,17 @@ int main(int argc, char * argv[]) { printf("Usage: \n\n"); printf("vj [romfile] [switches]\n"); - printf(" -? or -help : Display usage and switches \n"); - printf(" -fullscreen : Enable fullscreen mode \n"); - printf(" -window : Enable windowed mode (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 (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("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n"); printf("with the Jaguar BIOS.\n"); - return true; + return 1; } } @@ -177,33 +169,79 @@ int main(int argc, char * argv[]) // Get the cartridge ROM (if passed in) if (haveCart) - { JaguarLoadCart(jaguar_mainRom, argv[1]); - eeprom_init(); - } jaguar_reset(); - // Setting up the backbuffer + // Set up the backbuffer int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16)); - // Setting up the primary SDL display - surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); + // 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 (console.JoyEnabled() == 1) + if (useJoystick) { if (SDL_NumJoysticks() <= 0) { - console.option("joystick disabled"); +// 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 ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0) + if ((joystick = SDL_JoystickOpen(nJoyport)) == 0) { - console.option("joystick disabled"); +// console.option("joystick disabled"); + useJoystick = false; printf("Unable to open a Joystick on port: %d\n", (int)nJoyport); } else @@ -212,8 +250,8 @@ int main(int argc, char * argv[]) } // Open the display and start emulating some 3l337 Atari Jaguar games :P - console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); - +// console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); + totalFrames = 0; startTime = clock(); nNormalLast = 0; // Last value of timeGetTime() @@ -248,17 +286,34 @@ int main(int argc, char * argv[]) jaguar_exec(backbuffer, false); #endif // Setting up new backbuffer with new pixels and data - jaguar_exec(backbuffer, true); +// jaguar_exec(backbuffer, true); + JaguarExecute(backbuffer, true); totalFrames++; // Simple frameskip if (nFrame == nFrameskip) { - int32 * vs = (int32 *)surface->lock(); - memcpy(vs, backbuffer, tom_width * tom_height * 2); - surface->unlock(); - surface->copy(console); - console.update(); +// int32 * vs = (int32 *)surface->lock(); + 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; + nFrame = 0; } else @@ -274,14 +329,16 @@ int main(int argc, char * argv[]) int elapsedTime = clock() - startTime; int fps = (1000 * totalFrames) / elapsedTime; fprintf(log_get(), "Statistics: %i FPS\n", fps); - - if (console.JoyEnabled() == 1) {} - + jaguar_done(); version_done(); memory_done(); log_done(); - console.close(); // Close SDL items as last! +// 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; } @@ -338,4 +395,5 @@ 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(); }