The lump is open anyway at that time so deferring this action until the information is needed doesn't give any speed improvements. Now GetDimensions and all its associated overhead is gone. - Added support for TGA textures. It can handle all of the common variations of this format. - Changed: GI_PAGESARERAW is no longer checked. It wasn't really necessary before because the chance of texture misidentification is absolutely minimal. But raw pages are now restricted to textures of type TEX_MiscPatch only. - Changed the automap parchment to use a regular texture. The previous FAutomapTexture is only used as a last resort fallback now. If the code finds a recognizable graphic it will create a proper texture for it now. - Fixed: Flats were only auto-scaled when in Doom flat format. - Fixed: FMultiPatchTexture::CheckForHacks blindly assumed that all patches were FPstchTextures. Since the texture code does not have any type information I added a new flag bIsPatch for this purpose. - Moved all texture classes into their own source files and created a new subdirectory 'textures' for that. - Cleaned up the texture management code and added some stricter checks for the validity of Doom patches. The old code liked to crash when being passed some non-graphic data. SVN r300 (trunk)
201 lines
4.8 KiB
C++
201 lines
4.8 KiB
C++
/*
|
|
** rawpagetexture.cpp
|
|
** Texture class for Raven's raw fullscreen pages
|
|
**
|
|
**---------------------------------------------------------------------------
|
|
** Copyright 2004-2006 Randy Heit
|
|
** All rights reserved.
|
|
**
|
|
** Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions
|
|
** are met:
|
|
**
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
** documentation and/or other materials provided with the distribution.
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
** derived from this software without specific prior written permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**---------------------------------------------------------------------------
|
|
**
|
|
**
|
|
*/
|
|
|
|
#include "doomtype.h"
|
|
#include "files.h"
|
|
#include "r_data.h"
|
|
#include "w_wad.h"
|
|
|
|
|
|
|
|
bool FRawPageTexture::Check(FileReader & data)
|
|
{
|
|
if (data.GetLength() != 64000) return false;
|
|
|
|
// This is probably a raw page graphic, but do some checking to be sure
|
|
patch_t *foo;
|
|
int height;
|
|
int width;
|
|
|
|
foo = (patch_t *)M_Malloc (data.GetLength());
|
|
data.Seek (0, SEEK_SET);
|
|
data.Read (foo, data.GetLength());
|
|
|
|
height = LittleShort(foo->height);
|
|
width = LittleShort(foo->width);
|
|
|
|
if (height > 0 && height < 510 && width > 0 && width < 15997)
|
|
{
|
|
// The dimensions seem like they might be valid for a patch, so
|
|
// check the column directory for extra security. At least one
|
|
// column must begin exactly at the end of the column directory,
|
|
// and none of them must point past the end of the patch.
|
|
bool gapAtStart = true;
|
|
int x;
|
|
|
|
for (x = 0; x < width; ++x)
|
|
{
|
|
DWORD ofs = LittleLong(foo->columnofs[x]);
|
|
if (ofs == (DWORD)width * 4 + 8)
|
|
{
|
|
gapAtStart = false;
|
|
}
|
|
else if (ofs >= 64000-1) // Need one byte for an empty column
|
|
{
|
|
free (foo);
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
// Ensure this column does not extend beyond the end of the patch
|
|
const BYTE *foo2 = (const BYTE *)foo;
|
|
while (ofs < 64000)
|
|
{
|
|
if (foo2[ofs] == 255)
|
|
{
|
|
free (foo);
|
|
return true;
|
|
}
|
|
ofs += foo2[ofs+1] + 4;
|
|
}
|
|
if (ofs >= 64000)
|
|
{
|
|
free (foo);
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
if (gapAtStart || (x != width))
|
|
{
|
|
free (foo);
|
|
return true;
|
|
}
|
|
free(foo);
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
free (foo);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
FTexture *FRawPageTexture::Create(FileReader & file, int lumpnum)
|
|
{
|
|
return new FRawPageTexture(lumpnum);
|
|
}
|
|
|
|
|
|
const FTexture::Span FRawPageTexture::DummySpans[2] =
|
|
{
|
|
{ 0, 200 }, { 0, 0 }
|
|
};
|
|
|
|
FRawPageTexture::FRawPageTexture (int lumpnum)
|
|
: SourceLump(lumpnum), Pixels(0)
|
|
{
|
|
Wads.GetLumpName (Name, lumpnum);
|
|
Name[8] = 0;
|
|
|
|
Width = 320;
|
|
Height = 200;
|
|
WidthBits = 8;
|
|
HeightBits = 8;
|
|
WidthMask = 255;
|
|
}
|
|
|
|
FRawPageTexture::~FRawPageTexture ()
|
|
{
|
|
Unload ();
|
|
}
|
|
|
|
void FRawPageTexture::Unload ()
|
|
{
|
|
if (Pixels != NULL)
|
|
{
|
|
delete[] Pixels;
|
|
Pixels = NULL;
|
|
}
|
|
}
|
|
|
|
const BYTE *FRawPageTexture::GetColumn (unsigned int column, const Span **spans_out)
|
|
{
|
|
if (Pixels == NULL)
|
|
{
|
|
MakeTexture ();
|
|
}
|
|
if ((unsigned)column >= (unsigned)Width)
|
|
{
|
|
column %= 320;
|
|
}
|
|
if (spans_out != NULL)
|
|
{
|
|
*spans_out = DummySpans;
|
|
}
|
|
return Pixels + column*Height;
|
|
}
|
|
|
|
const BYTE *FRawPageTexture::GetPixels ()
|
|
{
|
|
if (Pixels == NULL)
|
|
{
|
|
MakeTexture ();
|
|
}
|
|
return Pixels;
|
|
}
|
|
|
|
void FRawPageTexture::MakeTexture ()
|
|
{
|
|
FMemLump lump = Wads.ReadLump (SourceLump);
|
|
const BYTE *source = (const BYTE *)lump.GetMem();
|
|
const BYTE *source_p = source;
|
|
BYTE *dest_p;
|
|
|
|
Pixels = new BYTE[Width*Height];
|
|
dest_p = Pixels;
|
|
|
|
// Convert the source image from row-major to column-major format
|
|
for (int y = 200; y != 0; --y)
|
|
{
|
|
for (int x = 320; x != 0; --x)
|
|
{
|
|
*dest_p = GPalette.Remap[*source_p];
|
|
dest_p += 200;
|
|
source_p++;
|
|
}
|
|
dest_p -= 200*320-1;
|
|
}
|
|
}
|
|
|