Menu
▾
▴
[Opde-commits] SF.net SVN: opde:[1268] trunk/src/base/loaders
|
From: <vo...@us...> - 2009-09-14 07:03:07
|
Revision: 1268
http://opde.svn.sourceforge.net/opde/?rev=1268&view=rev
Author: volca
Date: 2009-09-14 07:03:00 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
getting rid of conflicting elem. types type definitions (hopefully)
Modified Paths:
--------------
trunk/src/base/loaders/FonFormat.cpp
trunk/src/base/loaders/FonFormat.h
trunk/src/base/loaders/ManualFonFileLoader.cpp
trunk/src/base/loaders/ManualFonFileLoader.h
Modified: trunk/src/base/loaders/FonFormat.cpp
===================================================================
--- trunk/src/base/loaders/FonFormat.cpp 2009-09-11 07:07:29 UTC (rev 1267)
+++ trunk/src/base/loaders/FonFormat.cpp 2009-09-14 07:03:00 UTC (rev 1268)
@@ -85,13 +85,13 @@
return st;
}
- File& operator<<(File& st, const RGBQUAD& h) {
+ File& operator<<(File& st, const RGBQuad& h) {
st << h.rgbBlue << h.rgbGreen << h.rgbRed << h.rgbReserved;
return st;
}
- File& operator>>(File& st, RGBQUAD& h) {
+ File& operator>>(File& st, RGBQuad& h) {
st >> h.rgbBlue >> h.rgbGreen >> h.rgbRed >> h.rgbReserved;
return st;
Modified: trunk/src/base/loaders/FonFormat.h
===================================================================
--- trunk/src/base/loaders/FonFormat.h 2009-09-11 07:07:29 UTC (rev 1267)
+++ trunk/src/base/loaders/FonFormat.h 2009-09-14 07:03:00 UTC (rev 1268)
@@ -35,13 +35,6 @@
{
class File;
- typedef uint32_t DWORD;
- typedef int32_t BOOL;
- typedef uint8_t BYTE;
- typedef uint16_t WORD;
- typedef DWORD COLORREF;
-
-
struct DarkFontHeader
{
uint16_t Format; /* 1 - anti-aliased, 0xCCCC - 8bpp, else - 1bpp */
@@ -62,11 +55,11 @@
struct ExternalPaletteHeader
{
- DWORD RiffSig;
- DWORD RiffLength;
- DWORD PSig1;
- DWORD PSig2;
- DWORD Length;
+ uint32_t RiffSig;
+ uint32_t RiffLength;
+ uint32_t PSig1;
+ uint32_t PSig2;
+ uint32_t Length;
};
File& operator<<(File& st, const ExternalPaletteHeader& h);
@@ -86,48 +79,48 @@
typedef std::vector<CharInfo> CharInfoList;
struct BITMAPFILEHEADER {
- WORD bfType;
- DWORD bfSize;
- WORD bfReserved1;
- WORD bfReserved2;
- DWORD bfOffBits;
+ uint16_t bfType;
+ uint32_t bfSize;
+ uint16_t bfReserved1;
+ uint16_t bfReserved2;
+ uint32_t bfOffBits;
};
File& operator<<(File& st, const BITMAPFILEHEADER& h);
File& operator>>(File& st, BITMAPFILEHEADER& h);
struct BITMAPINFOHEADER {
- DWORD biSize;
- DWORD biWidth;
- DWORD biHeight;
- WORD biPlanes;
- WORD biBitCount;
- DWORD biCompression;
- DWORD biSizeImage;
- DWORD biXPelsPerMeter;
- DWORD biYPelsPerMeter;
- DWORD biClrUsed;
- DWORD biClrImportant;
+ uint32_t biSize;
+ uint32_t biWidth;
+ uint32_t biHeight;
+ uint16_t biPlanes;
+ uint16_t biBitCount;
+ uint32_t biCompression;
+ uint32_t biSizeImage;
+ uint32_t biXPelsPerMeter;
+ uint32_t biYPelsPerMeter;
+ uint32_t biClrUsed;
+ uint32_t biClrImportant;
};
File& operator<<(File& st, const BITMAPINFOHEADER& h);
File& operator>>(File& st, BITMAPINFOHEADER& h);
- struct RGBQUAD {
- BYTE rgbBlue;
- BYTE rgbGreen;
- BYTE rgbRed;
- BYTE rgbReserved;
+ struct RGBQuad {
+ uint8_t rgbBlue;
+ uint8_t rgbGreen;
+ uint8_t rgbRed;
+ uint8_t rgbReserved;
};
- File& operator<<(File& st, const RGBQUAD& h);
- File& operator>>(File& st, RGBQUAD& h);
+ File& operator<<(File& st, const RGBQuad& h);
+ File& operator>>(File& st, RGBQuad& h);
struct BITMAPINFO {
BITMAPINFOHEADER bmiHeader;
- RGBQUAD bmiColors[1];
+ RGBQuad bmiColors[1];
};
File& operator<<(File& st, const BITMAPINFO& h);
@@ -135,15 +128,15 @@
struct RGBTRIPLE {
- BYTE rgbtBlue;
- BYTE rgbtGreen;
- BYTE rgbtRed;
+ uint8_t rgbtBlue;
+ uint8_t rgbtGreen;
+ uint8_t rgbtRed;
};
File& operator<<(File& st, const RGBTRIPLE& h);
File& operator>>(File& st, RGBTRIPLE& h);
- static const COLORREF ColorTable[] = {
+ static const uint32_t ColorTable[] = {
0x000000, 0xDDDDDD, 0xB6B6B6, 0x969696, 0x7C7C7C, 0x666666, 0x545454, 0x454545,
0x393939, 0x2F2F2F, 0x272727, 0x202020, 0x1A1A1A, 0x161616, 0x121212, 0x0F0F0F,
0x0C0C0C, 0x0A0A0A, 0x080808, 0x060606, 0x050505, 0x040404, 0x030303, 0x7A8449,
@@ -179,7 +172,7 @@
};
/* Anti-aliased fonts have a pixel Width of 8 bits, but only the lower 4 bits are used. */
- static const COLORREF AntiAliasedColorTable[] = {
+ static const uint32_t AntiAliasedColorTable[] = {
0xFFFFFF, 0xEEEEEE, 0xDDDDDD, 0xCCCCCC, 0xBBBBBB, 0xAAAAAA, 0x999999, 0x888888,
0x777777, 0x666666, 0x555555, 0x444444, 0x333333, 0x222222, 0x111111, 0x000000,
0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF, 0xFFFFFF,
Modified: trunk/src/base/loaders/ManualFonFileLoader.cpp
===================================================================
--- trunk/src/base/loaders/ManualFonFileLoader.cpp 2009-09-11 07:07:29 UTC (rev 1267)
+++ trunk/src/base/loaders/ManualFonFileLoader.cpp 2009-09-14 07:03:00 UTC (rev 1268)
@@ -224,12 +224,12 @@
//-------------------------------------------------------------------
- RGBQUAD* ManualFonFileLoader::ReadPalette()
+ RGBQuad* ManualFonFileLoader::ReadPalette()
{
ExternalPaletteHeader PaletteHeader;
- WORD Count;
+ uint16_t Count;
char *Buffer, *C;
- BYTE S;
+ uint8_t S;
unsigned int I;
// Open the file
@@ -242,16 +242,16 @@
} catch(Ogre::FileNotFoundException) {
// Could not find resource, use the default table
LogManager::getSingleton().logMessage("Specified palette file not found - using default palette!");
- return (RGBQUAD*)ColorTable;
+ return (RGBQuad*)ColorTable;
}
- RGBQUAD *Palette = new RGBQUAD[256];
+ RGBQuad *Palette = new RGBQuad[256];
if (!Palette)
return NULL;
if((mPaletteType == ePT_PCX) || (mPaletteType == ePT_DefaultBook)) // PCX file specified...
{
- RGBQUAD *Palette = new RGBQUAD[256];
+ RGBQuad *Palette = new RGBQuad[256];
// Test to see if we're facing a PCX file. (0A) (xx) (01)
uint8_t Manuf, Enc;
@@ -263,19 +263,19 @@
{
delete[] Palette; // Clean up!
LogManager::getSingleton().logMessage("Invalid palette file specified - seems not to be a PCX file!");
- return (RGBQUAD*)ColorTable; // Should not matter - the cast (if packed)
+ return (RGBQuad*)ColorTable; // Should not matter - the cast (if packed)
}
- BYTE BPP;
+ uint8_t BPP;
mPaletteFile->readElem(&BPP, 1);
mPaletteFile->seek(3 * 256 + 1, File::FSEEK_END);
- BYTE Padding;
+ uint8_t Padding;
mPaletteFile->readElem(&Padding, 1);
if((BPP == 8) && (Padding == 0x0C)) //Make sure it is an 8bpp and a valid PCX
{
- // Byte sized structures - endianness always ok
+ // uint8_t sized structures - endianness always ok
for (unsigned int I = 0; I < 256; I++)
{
@@ -288,7 +288,7 @@
{
delete[] Palette; // Clean up!
LogManager::getSingleton().logMessage("Invalid palette file specified - not 8 BPP or invalid Padding!");
- return (RGBQUAD*)ColorTable; // Return default palette
+ return (RGBQuad*)ColorTable; // Return default palette
}
return Palette;
}
@@ -297,7 +297,7 @@
{
delete[] Palette; // Clean up!
LogManager::getSingleton().logMessage("Invalid palette type specified!");
- return (RGBQUAD*)ColorTable;
+ return (RGBQuad*)ColorTable;
}
// We're sure that we have external palette here:
@@ -339,17 +339,17 @@
}
C = strchr(Buffer, '\n')+1;
C = strchr(C, '\n')+1;
- Count = (WORD)strtoul(C, NULL, 10);
+ Count = (uint16_t)strtoul(C, NULL, 10);
if (Count > 256)
Count = 256;
for (I = 0; I < Count; I++)
{
C = strchr(C, '\n')+1;
- Palette[I].rgbRed = (BYTE)strtoul(C, &C, 10);
+ Palette[I].rgbRed = (uint8_t)strtoul(C, &C, 10);
C++;
- Palette[I].rgbGreen = (BYTE)strtoul(C, &C, 10);
+ Palette[I].rgbGreen = (uint8_t)strtoul(C, &C, 10);
C++;
- Palette[I].rgbBlue = (BYTE)strtoul(C, &C, 10);
+ Palette[I].rgbBlue = (uint8_t)strtoul(C, &C, 10);
}
delete []Buffer;
}
@@ -369,7 +369,7 @@
}
//-------------------------------------------------------------------
- int ManualFonFileLoader::WriteImage(RGBQUAD *ColorTable, unsigned char **RowPointers)
+ int ManualFonFileLoader::WriteImage(RGBQuad *ColorTable, unsigned char **RowPointers)
{
BITMAPFILEHEADER FileHeader;
BITMAPINFOHEADER BitmapHeader;
@@ -377,7 +377,7 @@
char Zero[4] = {0,0,0,0};
unsigned char *pMemBuff;
- mBmpFileSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (sizeof(RGBQUAD) * 256) + (mImageDim * mImageDim);
+ mBmpFileSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (sizeof(RGBQuad) * 256) + (mImageDim * mImageDim);
pMemBuff = new unsigned char[mBmpFileSize];
if(!pMemBuff)
return -1;
@@ -386,7 +386,7 @@
FileHeader.bfType = 0x4D42;
FileHeader.bfReserved1 = 0;
FileHeader.bfReserved2 = 0;
- FileHeader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (sizeof(RGBQUAD)*256);
+ FileHeader.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + (sizeof(RGBQuad)*256);
BitmapHeader.biSize = sizeof(BITMAPINFOHEADER);
BitmapHeader.biWidth = mImageDim;
BitmapHeader.biHeight = mImageDim;
@@ -407,8 +407,8 @@
memcpy(Ptr, &BitmapHeader, sizeof(BITMAPINFOHEADER));
Ptr += sizeof(BITMAPINFOHEADER);
- memcpy(Ptr, ColorTable, sizeof(RGBQUAD) * 256);
- Ptr += sizeof(RGBQUAD) * 256;
+ memcpy(Ptr, ColorTable, sizeof(RGBQuad) * 256);
+ Ptr += sizeof(RGBQuad) * 256;
RowWidth -= mImageDim;
for (Row = mImageDim - 1; Row >= 0; Row--)
@@ -434,19 +434,19 @@
//-------------------------------------------------------------------
int ManualFonFileLoader::LoadDarkFont()
{
- COLORREF *PaletteData = const_cast<COLORREF*>(ColorTable);
+ uint32_t *PaletteData = const_cast<uint32_t*>(ColorTable);
unsigned char **ImageRows;
int Color;
// Default palette
if (mPaletteType != ePT_Default) {
- PaletteData = (COLORREF*)ReadPalette();
+ PaletteData = (uint32_t*)ReadPalette();
if (!PaletteData) {
LogManager::getSingleton().logMessage("Could not load palette data, defaulting to default palette");
// return -2;
- PaletteData = const_cast<COLORREF*>(ColorTable);
+ PaletteData = const_cast<uint32_t*>(ColorTable);
}
}
@@ -463,13 +463,13 @@
if (PaletteData != ColorTable)
delete[] PaletteData; // Clean up!
- PaletteData = (COLORREF*)AntiAliasedColorTable;
+ PaletteData = (uint32_t*)AntiAliasedColorTable;
}
// Enable to see the resulting BMP
- // WriteImage((RGBQUAD*)PaletteData, ImageRows);
+ // WriteImage((RGBQuad*)PaletteData, ImageRows);
- createOgreTexture(ImageRows, (RGBQUAD*)PaletteData);
+ createOgreTexture(ImageRows, (RGBQuad*)PaletteData);
delete [] ImageRows;
@@ -479,7 +479,7 @@
}
//-------------------------------------------------------------------
- void ManualFonFileLoader::createOgreTexture(unsigned char** Img, RGBQUAD* Palette)
+ void ManualFonFileLoader::createOgreTexture(unsigned char** Img, RGBQuad* Palette)
{
// Create a texure, then fill it
TexturePtr Txt = TextureManager::getSingleton().createManual(mTxtName, mFontGroup, TEX_TYPE_2D, mImageDim, mImageDim, 1, PF_A8R8G8B8);
Modified: trunk/src/base/loaders/ManualFonFileLoader.h
===================================================================
--- trunk/src/base/loaders/ManualFonFileLoader.h 2009-09-11 07:07:29 UTC (rev 1267)
+++ trunk/src/base/loaders/ManualFonFileLoader.h 2009-09-14 07:03:00 UTC (rev 1268)
@@ -64,7 +64,7 @@
private:
CharInfoList mChars;
- DWORD mBmpFileSize;
+ uint32_t mBmpFileSize;
unsigned int mImageDim, mNumRows;
FilePtr mFontFile, mBookFile, mPaletteFile;
@@ -73,13 +73,13 @@
PaletteType mPaletteType;
String mPaletteFileName;
- RGBQUAD* ReadPalette();
+ RGBQuad* ReadPalette();
int CreateOgreFont(Font* DarkFont);
int LoadDarkFont();
- int WriteImage(RGBQUAD *ColorTable, unsigned char **RowPointers);
+ int WriteImage(RGBQuad *ColorTable, unsigned char **RowPointers);
unsigned char** ReadFont(int *ResultingColor);
- void createOgreTexture(unsigned char** img, RGBQUAD* palette);
+ void createOgreTexture(unsigned char** img, RGBQuad* palette);
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|