diff options
Diffstat (limited to 'src/v_video.c')
| -rw-r--r-- | src/v_video.c | 588 |
1 files changed, 291 insertions, 297 deletions
diff --git a/src/v_video.c b/src/v_video.c index 82d9f357..ad3bee1e 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -26,30 +26,29 @@ // //----------------------------------------------------------------------------- - - - #include "i_system.h" -#include "r_local.h" -#include "doomdef.h" -#include "doomdata.h" +#include "doomtype.h" -#include "deh_main.h" -#include "m_bbox.h" +#include "deh_str.h" #include "i_swap.h" #include "i_video.h" +#include "m_bbox.h" #include "m_misc.h" #include "v_video.h" #include "w_wad.h" #include "z_zone.h" -// Each screen is [SCREENWIDTH*SCREENHEIGHT]; -byte* screens[5]; - -int dirtybox[4]; +// Blending table used for fuzzpatch, etc. +// Only used in Heretic/Hexen + +byte *tinttable = NULL; + +// The screen buffer that the v_video.c code draws to. +static byte *dest_screen = NULL; +int dirtybox[4]; // Now where did these came from? const byte gammatable[5][256] = @@ -137,66 +136,56 @@ const byte gammatable[5][256] = }; -// Gamma correction level to use - -int usegamma = 0; - // // V_MarkRect // -void -V_MarkRect -( int x, - int y, - int width, - int height ) +void V_MarkRect(int x, int y, int width, int height) { - M_AddToBox (dirtybox, x, y); - M_AddToBox (dirtybox, x+width-1, y+height-1); + // If we are temporarily using an alternate screen, do not + // affect the update box. + + if (dest_screen == I_VideoBuffer) + { + M_AddToBox (dirtybox, x, y); + M_AddToBox (dirtybox, x + width-1, y + height-1); + } } // // V_CopyRect // -void -V_CopyRect -( int srcx, - int srcy, - int srcscrn, - int width, - int height, - int destx, - int desty, - int destscrn ) +void V_CopyRect(int srcx, int srcy, byte *source, + int width, int height, + int destx, int desty) { - byte* src; - byte* dest; - + byte *src; + byte *dest; + #ifdef RANGECHECK - if (srcx<0 - ||srcx+width >SCREENWIDTH - || srcy<0 - || srcy+height>SCREENHEIGHT - ||destx<0||destx+width >SCREENWIDTH - || desty<0 - || desty+height>SCREENHEIGHT - || (unsigned)srcscrn>4 - || (unsigned)destscrn>4) + if (srcx < 0 + || srcx + width > SCREENWIDTH + || srcy < 0 + || srcy + height > SCREENHEIGHT + || destx < 0 + || destx + width > SCREENWIDTH + || desty < 0 + || desty + height > SCREENHEIGHT) { - I_Error ("Bad V_CopyRect"); + I_Error ("Bad V_CopyRect"); } #endif - V_MarkRect (destx, desty, width, height); - - src = screens[srcscrn]+SCREENWIDTH*srcy+srcx; - dest = screens[destscrn]+SCREENWIDTH*desty+destx; + + V_MarkRect(destx, desty, width, height); + + src = source + SCREENWIDTH * srcy + srcx; + dest = dest_screen + SCREENWIDTH * desty + destx; for ( ; height>0 ; height--) { - memcpy (dest, src, width); - src += SCREENWIDTH; - dest += SCREENWIDTH; + memcpy(dest, src, width); + src += SCREENWIDTH; + dest += SCREENWIDTH; } } @@ -205,196 +194,234 @@ V_CopyRect // V_DrawPatch // Masks a column based masked pic to the screen. // -void -V_DrawPatch -( int x, - int y, - int scrn, - patch_t* patch ) -{ - int count; - int col; - column_t* column; - byte* desttop; - byte* dest; - byte* source; - int w; - - y -= SHORT(patch->topoffset); - x -= SHORT(patch->leftoffset); -#ifdef RANGECHECK - if (x<0 - ||x+SHORT(patch->width) >SCREENWIDTH - || y<0 - || y+SHORT(patch->height)>SCREENHEIGHT - || (unsigned)scrn>4) +void V_DrawPatch(int x, int y, patch_t *patch) +{ + int count; + int col; + column_t *column; + byte *desttop; + byte *dest; + byte *source; + int w; + + y -= SHORT(patch->topoffset); + x -= SHORT(patch->leftoffset); + +#ifdef RANGECHECK + if (x < 0 + || x + SHORT(patch->width) > SCREENWIDTH + || y < 0 + || y + SHORT(patch->height) > SCREENHEIGHT) { I_Error("Bad V_DrawPatch"); } -#endif - - if (!scrn) - V_MarkRect (x, y, SHORT(patch->width), SHORT(patch->height)); +#endif - col = 0; - desttop = screens[scrn]+y*SCREENWIDTH+x; - - w = SHORT(patch->width); + V_MarkRect(x, y, SHORT(patch->width), SHORT(patch->height)); + + col = 0; + desttop = dest_screen + y * SCREENWIDTH + x; + + w = SHORT(patch->width); for ( ; col<w ; x++, col++, desttop++) - { - column = (column_t *)((byte *)patch + LONG(patch->columnofs[col])); - - // step through the posts in a column - while (column->topdelta != 0xff ) - { - source = (byte *)column + 3; - dest = desttop + column->topdelta*SCREENWIDTH; - count = column->length; - - while (count--) - { - *dest = *source++; - dest += SCREENWIDTH; - } - column = (column_t *)( (byte *)column + column->length - + 4 ); - } - } -} - + { + column = (column_t *)((byte *)patch + LONG(patch->columnofs[col])); + + // step through the posts in a column + while (column->topdelta != 0xff) + { + source = (byte *)column + 3; + dest = desttop + column->topdelta*SCREENWIDTH; + count = column->length; + + while (count--) + { + *dest = *source++; + dest += SCREENWIDTH; + } + column = (column_t *)((byte *)column + column->length + 4); + } + } +} + // -// V_DrawPatchFlipped +// V_DrawPatchFlipped // Masks a column based masked pic to the screen. // Flips horizontally, e.g. to mirror face. // -void -V_DrawPatchFlipped -( int x, - int y, - int scrn, - patch_t* patch ) -{ - int count; - int col; - column_t* column; - byte* desttop; - byte* dest; - byte* source; - int w; - +void V_DrawPatchFlipped(int x, int y, patch_t *patch) +{ + int count; + int col; + column_t *column; + byte *desttop; + byte *dest; + byte *source; + int w; + y -= SHORT(patch->topoffset); x -= SHORT(patch->leftoffset); + #ifdef RANGECHECK - if (x<0 - ||x+SHORT(patch->width) >SCREENWIDTH - || y<0 - || y+SHORT(patch->height)>SCREENHEIGHT - || (unsigned)scrn>4) + if (x < 0 + || x + SHORT(patch->width) > SCREENWIDTH + || y < 0 + || y + SHORT(patch->height) > SCREENHEIGHT) { I_Error("Bad V_DrawPatchFlipped"); } -#endif - - if (!scrn) - V_MarkRect (x, y, SHORT(patch->width), SHORT(patch->height)); +#endif - col = 0; - desttop = screens[scrn]+y*SCREENWIDTH+x; - - w = SHORT(patch->width); + V_MarkRect (x, y, SHORT(patch->width), SHORT(patch->height)); + + col = 0; + desttop = dest_screen + y * SCREENWIDTH + x; + + w = SHORT(patch->width); + + for ( ; col<w ; x++, col++, desttop++) + { + column = (column_t *)((byte *)patch + LONG(patch->columnofs[w-1-col])); + + // step through the posts in a column + while (column->topdelta != 0xff ) + { + source = (byte *)column + 3; + dest = desttop + column->topdelta*SCREENWIDTH; + count = column->length; + + while (count--) + { + *dest = *source++; + dest += SCREENWIDTH; + } + column = (column_t *)((byte *)column + column->length + 4); + } + } +} - for ( ; col<w ; x++, col++, desttop++) - { - column = (column_t *)((byte *)patch + LONG(patch->columnofs[w-1-col])); - - // step through the posts in a column - while (column->topdelta != 0xff ) - { - source = (byte *)column + 3; - dest = desttop + column->topdelta*SCREENWIDTH; - count = column->length; - - while (count--) - { - *dest = *source++; - dest += SCREENWIDTH; - } - column = (column_t *)( (byte *)column + column->length - + 4 ); - } - } -} - // // V_DrawPatchDirect // Draws directly to the screen on the pc. // -void -V_DrawPatchDirect -( int x, - int y, - int scrn, - patch_t* patch ) + +void V_DrawPatchDirect(int x, int y, patch_t *patch) { - V_DrawPatch (x,y,scrn, patch); - - /* - int count; - int col; - column_t* column; - byte* desttop; - byte* dest; - byte* source; - int w; - - y -= SHORT(patch->topoffset); - x -= SHORT(patch->leftoffset); + V_DrawPatch(x, y, patch); +} -#ifdef RANGECHECK - if (x<0 - ||x+SHORT(patch->width) >SCREENWIDTH - || y<0 - || y+SHORT(patch->height)>SCREENHEIGHT - || (unsigned)scrn>4) +// +// V_DrawFuzzPatch +// +// Masks a column based translucent masked pic to the screen. +// + +void V_DrawFuzzPatch(int x, int y, patch_t * patch) +{ + int count, col; + column_t *column; + byte *desttop, *dest, *source; + int w; + + y -= SHORT(patch->topoffset); + x -= SHORT(patch->leftoffset); + + if (x < 0 + || x + SHORT(patch->width) > SCREENWIDTH + || y < 0 + || y + SHORT(patch->height) > SCREENHEIGHT) { - I_Error ("Bad V_DrawPatchDirect"); + I_Error("Bad V_DrawFuzzPatch"); } -#endif - - // V_MarkRect (x, y, SHORT(patch->width), SHORT(patch->height)); - desttop = destscreen + y*SCREENWIDTH/4 + (x>>2); - - w = SHORT(patch->width); - for ( col = 0 ; col<w ; col++) - { - outp (SC_INDEX+1,1<<(x&3)); - column = (column_t *)((byte *)patch + LONG(patch->columnofs[col])); - - // step through the posts in a column - - while (column->topdelta != 0xff ) - { - source = (byte *)column + 3; - dest = desttop + column->topdelta*SCREENWIDTH/4; - count = column->length; - - while (count--) - { - *dest = *source++; - dest += SCREENWIDTH/4; - } - column = (column_t *)( (byte *)column + column->length - + 4 ); - } - if ( ((++x)&3) == 0 ) - desttop++; // go to next byte, not next plane - }*/ -} + + col = 0; + desttop = dest_screen + y * SCREENWIDTH + x; + + w = SHORT(patch->width); + for (; col < w; x++, col++, desttop++) + { + column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col])); + + // step through the posts in a column + + while (column->topdelta != 0xff) + { + source = (byte *) column + 3; + dest = desttop + column->topdelta * SCREENWIDTH; + count = column->length; + + while (count--) + { + *dest = tinttable[((*dest) << 8) + *source++]; + dest += SCREENWIDTH; + } + column = (column_t *) ((byte *) column + column->length + 4); + } + } +} + +// +// V_DrawShadowedPatch +// +// Masks a column based masked pic to the screen. +// + +void V_DrawShadowedPatch(int x, int y, patch_t *patch) +{ + int count, col; + column_t *column; + byte *desttop, *dest, *source; + byte *desttop2, *dest2; + int w; + + y -= SHORT(patch->topoffset); + x -= SHORT(patch->leftoffset); + + if (x < 0 + || x + SHORT(patch->width) > SCREENWIDTH + || y < 0 + || y + SHORT(patch->height) > SCREENHEIGHT) + { + I_Error("Bad V_DrawShadowedPatch"); + } + + col = 0; + desttop = dest_screen + y * SCREENWIDTH + x; + desttop2 = dest_screen + (y + 2) * SCREENWIDTH + x + 2; + + w = SHORT(patch->width); + for (; col < w; x++, col++, desttop++, desttop2++) + { + column = (column_t *) ((byte *) patch + LONG(patch->columnofs[col])); + + // step through the posts in a column + + while (column->topdelta != 0xff) + { + source = (byte *) column + 3; + dest = desttop + column->topdelta * SCREENWIDTH; + dest2 = desttop2 + column->topdelta * SCREENWIDTH; + count = column->length; + + while (count--) + { + *dest2 = tinttable[((*dest2) << 8)]; + dest2 += SCREENWIDTH; + *dest = *source++; + dest += SCREENWIDTH; + + } + column = (column_t *) ((byte *) column + column->length + 4); + } + } +} + + @@ -402,23 +429,16 @@ V_DrawPatchDirect // V_DrawBlock // Draw a linear block of pixels into the view buffer. // -void -V_DrawBlock -( int x, - int y, - int scrn, - int width, - int height, - byte* src ) + +void V_DrawBlock(int x, int y, int width, int height, byte *src) { - byte* dest; - + byte *dest; + #ifdef RANGECHECK - if (x<0 - ||x+width >SCREENWIDTH - || y<0 - || y+height>SCREENHEIGHT - || (unsigned)scrn>4 ) + if (x < 0 + || x + width >SCREENWIDTH + || y < 0 + || y + height > SCREENHEIGHT) { I_Error ("Bad V_DrawBlock"); } @@ -426,7 +446,7 @@ V_DrawBlock V_MarkRect (x, y, width, height); - dest = screens[scrn] + y*SCREENWIDTH+x; + dest = dest_screen + y * SCREENWIDTH + x; while (height--) { @@ -435,64 +455,39 @@ V_DrawBlock dest += SCREENWIDTH; } } - - // -// V_GetBlock -// Gets a linear block of pixels from the view buffer. +// Draw a "raw" screen (lump containing raw data to blit directly +// to the screen) // -void -V_GetBlock -( int x, - int y, - int scrn, - int width, - int height, - byte* dest ) -{ - byte* src; - -#ifdef RANGECHECK - if (x<0 - ||x+width >SCREENWIDTH - || y<0 - || y+height>SCREENHEIGHT - || (unsigned)scrn>4 ) - { - I_Error ("Bad V_DrawBlock"); - } -#endif - src = screens[scrn] + y*SCREENWIDTH+x; - - while (height--) - { - memcpy (dest, src, width); - src += SCREENWIDTH; - dest += width; - } -} - - - +void V_DrawRawScreen(byte *raw) +{ + memcpy(dest_screen, raw, SCREENWIDTH * SCREENHEIGHT); +} // // V_Init // void V_Init (void) { - int i; - byte* base; - - // stick these in low dos memory on PCs + // no-op! + // There used to be separate screens that could be drawn to; these are + // now handled in the upper layers. +} - base = Z_Malloc(SCREENWIDTH * SCREENHEIGHT * 4, PU_STATIC, NULL); +// Set the buffer that the code draws to. - for (i=0 ; i<4 ; i++) - { - screens[i] = base + i*SCREENWIDTH*SCREENHEIGHT; - } +void V_UseBuffer(byte *buffer) +{ + dest_screen = buffer; +} + +// Restore screen buffer to the i_video screen buffer. + +void V_RestoreBuffer(void) +{ + dest_screen = I_VideoBuffer; } // @@ -587,32 +582,31 @@ void WritePCXfile(char *filename, byte *data, // V_ScreenShot // -void V_ScreenShot (void) +void V_ScreenShot(char *format) { - int i; - byte* linear; - char lbmname[12]; - - // munge planar buffer to linear - linear = screens[2]; - I_ReadScreen (linear); + int i; + char lbmname[12]; // find a file name to save it to - strcpy(lbmname,"DOOM00.pcx"); - - for (i=0 ; i<=99 ; i++) + + for (i=0; i<=99; i++) { - lbmname[4] = i/10 + '0'; - lbmname[5] = i%10 + '0'; - if (!M_FileExists(lbmname)) - break; // file doesn't exist + sprintf(lbmname, format, i); + + if (!M_FileExists(lbmname)) + { + break; // file doesn't exist + } } - if (i==100) - I_Error ("V_ScreenShot: Couldn't create a PCX"); - + + if (i == 100) + { + I_Error ("V_ScreenShot: Couldn't create a PCX"); + } + // save the pcx file - WritePCXfile (lbmname, linear, - SCREENWIDTH, SCREENHEIGHT, - W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE)); + WritePCXfile(lbmname, I_VideoBuffer, + SCREENWIDTH, SCREENHEIGHT, + W_CacheLumpName (DEH_String("PLAYPAL"), PU_CACHE)); } |