Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smaller texture cleanup. Fix bug in debug log call parameters. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1133 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-02-17 21:33:10 +00:00
parent 9f16833e30
commit d68164d3af
7 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ivis_common/pietypes.h
View File

@ -51,7 +51,7 @@ typedef Uint32 uint32;
//
//*************************************************************************
typedef struct { Sint32 left, top, right, bottom; } iClip;
typedef Uint8 iBitmap;
typedef char iBitmap;
typedef struct { Uint8 r, g, b; } iColour;
typedef BOOL iBool;
typedef struct { Sint32 x, y; } iPoint;

2
lib/ivis_opengl/tex.c
View File

@ -61,7 +61,7 @@ int pie_AddBMPtoTexPages(iSprite* s, const char* filename, int type, iBool bReso
{
int i = 0;
debug(LOG_TEXTURE, "pie_AddBMPtoTexPages: %s type=%d col=%d res=%d", filename,
debug(LOG_TEXTURE, "pie_AddBMPtoTexPages: %s type=%d res=%d", filename,
type, bResource);
assert(s != NULL);

2
lib/widget/widget.h
View File

@ -158,7 +158,7 @@ typedef struct _w_forminit
WINIT_BASE;
/* Data for a tabbed form */
BOOL disableChildren; \
BOOL disableChildren;
UWORD majorPos, minorPos; // Position of the tabs on the form
UWORD majorSize, minorSize; // Size of the tabs (in pixels)
SWORD majorOffset, minorOffset; // Tab start offset.

17
src/data.c
View File

@ -787,17 +787,14 @@ BOOL dataHWTERTILESLoad(char *pBuffer, UDWORD size, void **ppData)
}
}
getTileRadarColours();
if (bTilesPCXLoaded)
{
getTileRadarColours();
// make several 256 * 256 pages
if (bTilesPCXLoaded)
{
remakeTileTexturePages(tilesPCX.width,tilesPCX.height,TILE_WIDTH, TILE_HEIGHT, tilesPCX.bmp);
}
else
{
makeTileTexturePages(tilesPCX.width,tilesPCX.height,TILE_WIDTH, TILE_HEIGHT, tilesPCX.bmp);
}
remakeTileTexturePages(tilesPCX.width,tilesPCX.height,TILE_WIDTH, TILE_HEIGHT, tilesPCX.bmp);
}
else
{
makeTileTexturePages(tilesPCX.width,tilesPCX.height,TILE_WIDTH, TILE_HEIGHT, tilesPCX.bmp);
}
if (bTilesPCXLoaded)

2
src/radar.c
View File

@ -1162,7 +1162,7 @@ BOOL CoordInRadar(int x,int y)
void calcRadarColour(UBYTE *tileBitmap, UDWORD tileNumber)
void calcRadarColour(iBitmap *tileBitmap, UDWORD tileNumber)
{
UDWORD i, j;
UBYTE penNumber;

28
src/texture.c
View File

@ -30,8 +30,6 @@
#include "texture.h"
#include "radar.h"
/* Can fit at most 32 texture pages into a 2meg texture memory */
#define MAX_TEXTURE_PAGES 32
#define MAX_TERRAIN_PAGES 20
#define PAGE_WIDTH 512
#define PAGE_HEIGHT 512
@ -39,8 +37,6 @@
#define PAGE_DEPTH 4
#define TEXTURE_PAGE_SIZE PAGE_WIDTH*PAGE_HEIGHT*PAGE_DEPTH
#define NUM_OTHER_PAGES 19
/* Stores the graphics data for the terrain tiles textures (in src/data.c) */
iSprite tilesPCX;
@ -54,8 +50,8 @@ TILE_TEX_INFO tileTexInfo[MAX_TILES];
static UDWORD getTileXIndex(UDWORD tileNumber);
static UDWORD getTileYIndex(UDWORD tileNumber);
static void getRectFromPage(UDWORD width, UDWORD height, unsigned char *src, UDWORD bufWidth, unsigned char *dest);
static void putRectIntoPage(UDWORD width, UDWORD height, unsigned char *dest, UDWORD bufWidth, unsigned char *src);
static void getRectFromPage(UDWORD width, UDWORD height, char *src, UDWORD bufWidth, char *dest);
static void putRectIntoPage(UDWORD width, UDWORD height, char *dest, UDWORD bufWidth, char *src);
static void buildTileIndexes(void);
/*
@ -76,15 +72,15 @@ static void buildTileIndexes(void);
We must then make sure that we source in that texture page and set the
texture coordinate for a complete tile to be its position.
*/
void makeTileTexturePages(UDWORD srcWidth, UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, unsigned char *src)
void makeTileTexturePages(UDWORD srcWidth, UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, char *src)
{
UDWORD i,j;
UDWORD pageNumber;
UDWORD tilesAcross,tilesDown;
UDWORD tilesAcrossPage,tilesDownPage,tilesPerPage,tilesPerSource;
UDWORD tilesProcessed;
unsigned char *tileStorage;
unsigned char *presentLoc;
char *tileStorage;
char *presentLoc;
iSprite sprite;
/* This is how many pages are already used on hardware */
@ -94,7 +90,7 @@ void makeTileTexturePages(UDWORD srcWidth, UDWORD srcHeight, UDWORD tileWidth, U
/* Get enough memory to store one tile */
pageNumber = 0;
tileStorage = (unsigned char*)MALLOC(tileWidth * tileHeight * PAGE_DEPTH);
tileStorage = (char*)MALLOC(tileWidth * tileHeight * PAGE_DEPTH);
sprite.bmp = (iBitmap*)MALLOC(TEXTURE_PAGE_SIZE);
sprite.width = PAGE_WIDTH;
sprite.height = PAGE_HEIGHT;
@ -153,15 +149,15 @@ exit:
return;
}
void remakeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, unsigned char *src)
void remakeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, char *src)
{
UDWORD i,j;
UDWORD pageNumber;
UDWORD tilesAcross,tilesDown;
UDWORD tilesAcrossPage,tilesDownPage,tilesPerPage,tilesPerSource;
UDWORD tilesProcessed;
unsigned char *tileStorage;
unsigned char *presentLoc;
char *tileStorage;
char *presentLoc;
iSprite sprite;
//check enough pages are allocated
@ -170,7 +166,7 @@ void remakeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth,
/* Get enough memory to store one tile */
pageNumber = 0;
tileStorage = (unsigned char*)MALLOC(tileWidth * tileHeight * PAGE_DEPTH);
tileStorage = (char*)MALLOC(tileWidth * tileHeight * PAGE_DEPTH);
sprite.width = PAGE_WIDTH;
sprite.height = PAGE_HEIGHT;
@ -307,7 +303,7 @@ static UDWORD getTileYIndex(UDWORD tileNumber)
/* Extracts a rectangular buffer from a source buffer, storing result in one contiguous
chunk */
static void getRectFromPage(UDWORD width, UDWORD height, unsigned char *src, UDWORD bufWidth, unsigned char *dest)
static void getRectFromPage(UDWORD width, UDWORD height, char *src, UDWORD bufWidth, char *dest)
{
UDWORD i,j;
@ -322,7 +318,7 @@ static void getRectFromPage(UDWORD width, UDWORD height, unsigned char *src, UDW
}
/* Inserts a rectangle into a dest rectangle */
static void putRectIntoPage(UDWORD width, UDWORD height, unsigned char *dest, UDWORD bufWidth, unsigned char *src)
static void putRectIntoPage(UDWORD width, UDWORD height, char *dest, UDWORD bufWidth, char *src)
{
UDWORD i,j;

4
src/texture.h
View File

@ -24,8 +24,8 @@ extern iSprite tilesPCX;
int makeTileTextures(void);
int remakeTileTextures(void);
void makeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, unsigned char *src);
void remakeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, unsigned char *src);
void makeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, char *src);
void remakeTileTexturePages(UDWORD srcWidth,UDWORD srcHeight, UDWORD tileWidth, UDWORD tileHeight, char *src);
BOOL getTileRadarColours(void);
void freeTileTextures( void );