X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo.cpp;h=bfc3097662c23d08709457eab0b8ba12b7b15844;hb=ca2bc5872c6879c7d54ebf8913248de0bbf0a74e;hp=a035f4af4de3eddce6c82cfe73e9dea662162f4b;hpb=da2d8843238769dbc93dd978f48c2c3843fce52d;p=virtualjaguar diff --git a/src/video.cpp b/src/video.cpp index a035f4a..bfc3097 100644 --- a/src/video.cpp +++ b/src/video.cpp @@ -4,18 +4,130 @@ // by James L. Hammons // -#include "types.h" #include "tom.h" -#include "sdlemu_opengl.h" // For testing only... ;-) +#include "sdlemu_opengl.h" +#include "settings.h" #include "video.h" // External global variables -extern SDL_Surface * surface, * mainSurface; -extern Uint32 mainSurfaceFlags; -extern int16 * backbuffer; -extern bool useOpenGL; // Testing, testing... :-) -extern bool fullscreen; +//shouldn't these exist here??? Prolly. +//And now, they do! :-) +SDL_Surface * surface, * mainSurface; +Uint32 mainSurfaceFlags; +int16 * backbuffer; +SDL_Joystick * joystick; + +// +// Create SDL/OpenGL surfaces +// +bool InitVideo(void) +{ + // 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()); + return false; + } + + if (vjs.useOpenGL) + { + mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF | SDL_OPENGL; + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + } + else + { + if (info->hw_available) + mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF; + + if (info->blit_hw) + mainSurfaceFlags |= SDL_HWACCEL; + } + + if (vjs.fullscreen) + mainSurfaceFlags |= SDL_FULLSCREEN; + + if (!vjs.useOpenGL) +// mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH, VIRTUAL_SCREEN_HEIGHT_NTSC, 16, mainSurfaceFlags); + mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH, + (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL), + 16, mainSurfaceFlags); + else +// mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH * 2, VIRTUAL_SCREEN_HEIGHT_NTSC * 2, 16, mainSurfaceFlags); + mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH * 2, + (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL) * 2, + 16, mainSurfaceFlags); + + if (mainSurface == NULL) + { + WriteLog("VJ: SDL is unable to set the video mode: %s\n", SDL_GetError()); + return false; + } + + SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar"); + + // Create the primary SDL display (16 BPP, 5/5/5 RGB format) + surface = SDL_CreateRGBSurface(SDL_SWSURFACE, VIRTUAL_SCREEN_WIDTH, + (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL), + 16, 0x7C00, 0x03E0, 0x001F, 0); + + if (surface == NULL) + { + WriteLog("VJ: Could not create primary SDL surface: %s\n", SDL_GetError()); + return false; + } + + if (vjs.useOpenGL) +//Should make another setting here, for either linear or nearest (instead of just picking one) +//And we have! ;-) + sdlemu_init_opengl(surface, 1/*method*/, 2/*size*/, vjs.glFilter/*texture type (linear, nearest)*/); + + // Initialize Joystick support under SDL + if (vjs.useJoystick) + { + if (SDL_NumJoysticks() <= 0) + { + vjs.useJoystick = false; + printf("VJ: No joystick(s) or joypad(s) detected on your system. Using keyboard...\n"); + } + else + { + if ((joystick = SDL_JoystickOpen(vjs.joyport)) == 0) + { + vjs.useJoystick = false; + printf("VJ: Unable to open a Joystick on port: %d\n", (int)vjs.joyport); + } + else + printf("VJ: Using: %s\n", SDL_JoystickName(vjs.joyport)); + } + } + + // Set up the backbuffer +//To be safe, this should be 1280 * 625 * 2... +// backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); + backbuffer = (int16 *)malloc(1280 * 625 * sizeof(int16)); +// memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH * VIRTUAL_SCREEN_HEIGHT_NTSC * sizeof(int16)); + memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH * + (vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL) + * sizeof(int16)); + + return true; +} + +// +// Free various SDL components +// +void VideoDone(void) +{ + if (vjs.useOpenGL) + sdlemu_close_opengl(); + + SDL_JoystickClose(joystick); + SDL_FreeSurface(surface); + free(backbuffer); +} // // Render the backbuffer to the primary screen surface @@ -31,7 +143,7 @@ void RenderBackbuffer(void) if (SDL_MUSTLOCK(surface)) SDL_UnlockSurface(surface); - if (useOpenGL) + if (vjs.useOpenGL) sdlemu_draw_texture(mainSurface, surface, 1/*1=GL_QUADS*/); else { @@ -49,29 +161,38 @@ void ResizeScreen(uint32 width, uint32 height) char window_title[256]; SDL_FreeSurface(surface); - surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, - 16, 0x7C00, 0x03E0, 0x001F, 0); + surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 16, + 0x7C00, 0x03E0, 0x001F, 0); + if (surface == NULL) { - WriteLog("TOM: Could not create primary SDL surface: %s", SDL_GetError()); + WriteLog("Video: Could not create primary SDL surface: %s", SDL_GetError()); +//This is just crappy. We shouldn't exit this way--it leaves all kinds of memory leaks +//as well as screwing up SDL... !!! FIX !!! exit(1); } - sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)width, (int)height); -//Hmm. -/* mainSurface = SDL_SetVideoMode(tom_width, tom_height, 16, mainSurfaceFlags); - - if (mainSurface == NULL) + if (vjs.useOpenGL) { - WriteLog("Joystick: SDL is unable to set the video mode: %s\n", SDL_GetError()); - exit(1); - }//*/ +//Need to really resize the window height--no pixel height shenanigans! +//Err, we should only do this *if* we changed from PAL to NTSC or vice versa... !!! FIX !!! + mainSurface = SDL_SetVideoMode(VIRTUAL_SCREEN_WIDTH * 2, height * 2, 16, mainSurfaceFlags); + // This seems to work well for resizing (i.e., changes in the pixel width)... + sdlemu_resize_texture(surface, mainSurface, vjs.glFilter); + } + else + { + mainSurface = SDL_SetVideoMode(width, height, 16, mainSurfaceFlags); - SDL_WM_SetCaption(window_title, window_title); + if (mainSurface == NULL) + { + WriteLog("Video: SDL is unable to set the video mode: %s\n", SDL_GetError()); + exit(1); + } + } -//This seems to work well for resizing... - if (useOpenGL) - sdlemu_resize_texture(surface, mainSurface); + sprintf(window_title, "Virtual Jaguar (%i x %i)", (int)width, (int)height); + SDL_WM_SetCaption(window_title, window_title); } // @@ -79,28 +200,29 @@ void ResizeScreen(uint32 width, uint32 height) // uint32 GetSDLScreenPitch(void) { -// extern SDL_Surface * surface; - return surface->pitch; } // // Fullscreen <-> window switching // -//NOTE: This does *NOT* work with OpenGL rendering! !!! FIX !!! void ToggleFullscreen(void) { - fullscreen = !fullscreen; +//NOTE: This does *NOT* work with OpenGL rendering! !!! FIX !!! + if (vjs.useOpenGL) + return; // Until we can fix it... + + vjs.fullscreen = !vjs.fullscreen; mainSurfaceFlags &= ~SDL_FULLSCREEN; - if (fullscreen) + if (vjs.fullscreen) mainSurfaceFlags |= SDL_FULLSCREEN; mainSurface = SDL_SetVideoMode(tom_width, tom_height, 16, mainSurfaceFlags); if (mainSurface == NULL) { - WriteLog("Joystick: SDL is unable to set the video mode: %s\n", SDL_GetError()); + WriteLog("Video: SDL is unable to set the video mode: %s\n", SDL_GetError()); exit(1); }