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

Commit API only from patch #907: Make texture coordinates into static array. 

This fixes a bug with maps smaller than max visible tiles area which would
either crash or create seams, re-reported by Buginator.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5134 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-05-17 21:48:23 +00:00
parent 0803dc1ca9
commit d6d6a9919e
3 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ivis_common/piedef.h
View File

@ -107,8 +107,8 @@ extern void pie_DrawImage(PIEIMAGE *image, PIERECT *dest);
void pie_TerrainInit(int sizex, int sizey);
void pie_TerrainCleanup(void);
void pie_DrawTerrain(int mapx, int mapy);
void pie_DrawTerrainTriangle(int index, const TERRAIN_VERTEX *aVrts);
void pie_DrawTerrain(int x1, int y1, int x2, int y2);
void pie_DrawTerrainTriangle(int x, int y, int triangle, const TERRAIN_VERTEX *aVrts);
void pie_DrawWaterTriangle(const TERRAIN_VERTEX *aVrts);
extern void pie_GetResetCounts(unsigned int* pPieCount, unsigned int* pTileCount, unsigned int* pPolyCount, unsigned int* pStateCount);

42
lib/ivis_opengl/piedraw.c
View File

@ -49,7 +49,8 @@
static GLubyte *aColour = NULL;
static GLfloat *aTexCoord = NULL;
static GLfloat *aVertex = NULL;
static GLuint rowLength; ///< Length of one array table row in tiles
static GLuint allocX = 0, allocY = 0;
static size_t sizeColour = 0, sizeTexCoord = 0, sizeVertex = 0;
extern BOOL drawing_interface;
@ -767,15 +768,27 @@ void pie_DrawImage(PIEIMAGE *image, PIERECT *dest)
glEnd();
}
static inline void pie_ClearArrays(void)
{
memset(aColour, 0, sizeColour);
memset(aVertex, 0, sizeVertex);
}
void pie_TerrainInit(int sizex, int sizey)
{
int size = sizex * sizey;
assert(sizex > 0 && sizey > 0);
aColour = realloc(aColour, size * sizeof(GLubyte) * COLOUR_COMPONENTS * VERTICES_PER_TILE);
aTexCoord = realloc(aTexCoord, size * sizeof(GLfloat) * TEXCOORD_COMPONENTS * VERTICES_PER_TILE);
aVertex = realloc(aVertex, size * sizeof(GLfloat) * VERTEX_COMPONENTS * VERTICES_PER_TILE);
rowLength = sizex;
pie_TerrainCleanup();
sizeColour = size * sizeof(GLubyte) * COLOUR_COMPONENTS * VERTICES_PER_TILE;
sizeTexCoord = size * sizeof(GLfloat) * TEXCOORD_COMPONENTS * VERTICES_PER_TILE;
sizeVertex = size * sizeof(GLfloat) * VERTEX_COMPONENTS * VERTICES_PER_TILE;
aColour = malloc(sizeColour);
aTexCoord = malloc(sizeTexCoord);
aVertex = malloc(sizeVertex);
allocX = sizex;
allocY = sizey;
pie_ClearArrays(); // hack, removes seams
}
void pie_TerrainCleanup()
@ -797,8 +810,11 @@ void pie_TerrainCleanup()
aVertex = NULL;
}
void pie_DrawTerrain(int mapx, int mapy)
void pie_DrawTerrain(int x1, int y1, int x2, int y2)
{
int y;
assert(x1 >= 0 && y1 >= 0 && x2 < allocX && y2 < allocY);
glEnableClientState(GL_COLOR_ARRAY);
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@ -807,16 +823,24 @@ void pie_DrawTerrain(int mapx, int mapy)
glVertexPointer(VERTEX_COMPONENTS, GL_FLOAT, 0, aVertex);
glMatrixMode(GL_TEXTURE);
glLoadIdentity();
glDrawArrays(GL_TRIANGLES, 0, VERTICES_PER_TRIANGLE * mapx * mapy * 2);
for (y = y1; y < y2; y++)
{
glDrawArrays(GL_TRIANGLES, (y * allocX + x1) * VERTICES_PER_TILE, (x2 - x1) * VERTICES_PER_TILE);
}
pie_ClearArrays();
glDisableClientState(GL_COLOR_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
}
// index gives us the triangle
void pie_DrawTerrainTriangle(int index, const TERRAIN_VERTEX *aVrts)
void pie_DrawTerrainTriangle(int x, int y, int triangle, const TERRAIN_VERTEX *aVrts)
{
unsigned int i = 0, j = index * VERTICES_PER_TRIANGLE;
int i, j;
assert(x >= 0 && y >= 0 && triangle >= 0 && triangle < 3 && aVrts);
j = (y * allocX + x) * VERTICES_PER_TILE + triangle * VERTICES_PER_TRIANGLE;
tileCount++;

16
src/display3d.c
View File

@ -763,7 +763,8 @@ static void drawTiles(iView *player)
drawTerrainTile(i, j, false);
}
}
pie_DrawTerrain(visibleTiles.x, visibleTiles.y);
pie_DrawTerrain(MAX(0, playerXTile), MAX(0, playerZTile),
MIN(playerXTile + visibleTiles.x, mapWidth - 1), MIN(playerZTile + visibleTiles.y, mapHeight - 1));
// Update height for water
for (i = 0; i < visibleTiles.y + 1; i++)
@ -3750,10 +3751,7 @@ static void drawTerrainTile(UDWORD i, UDWORD j, BOOL onWaterEdge)
colour[1][1] = WZCOL_BLACK;
/* Let's just get out now if we're not supposed to draw it */
if( (actualX < 0) ||
(actualY < 0) ||
(actualX > mapWidth-1) ||
(actualY > mapHeight-1) )
if (actualX < 0 || actualY < 0 || actualX > mapWidth - 1 || actualY > mapHeight - 1)
{
tileNumber = 0;
}
@ -3844,9 +3842,9 @@ static void drawTerrainTile(UDWORD i, UDWORD j, BOOL onWaterEdge)
{
pie_DrawWaterTriangle(vertices);
}
else
else if (tileOnMap(actualX, actualY))
{
pie_DrawTerrainTriangle(i * 2 + j * visibleTiles.x * 2, vertices);
pie_DrawTerrainTriangle(actualX, actualY, 0, vertices);
}
/* The second triangle */
@ -3870,9 +3868,9 @@ static void drawTerrainTile(UDWORD i, UDWORD j, BOOL onWaterEdge)
{
pie_DrawWaterTriangle(vertices);
}
else
else if (tileOnMap(actualX, actualY))
{
pie_DrawTerrainTriangle(i * 2 + j * visibleTiles.x * 2 + 1, vertices);
pie_DrawTerrainTriangle(actualX, actualY, 1, vertices);
}
}