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

Add back linear magnification filtering (enough testing now, we know the issues). 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2554 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-10-16 20:56:29 +00:00
parent ceb1a432bc
commit 750646efe0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/display3d.c
View File

@ -995,14 +995,14 @@ static void flipsAndRots(int texture)
Vector2i sPTemp; Vector2i sPTemp;
/* Store the source rect as four points */ /* Store the source rect as four points */
sP1.x = 0; sP1.x = 1;
sP1.y = 0; sP1.y = 1;
sP2.x = xMult; sP2.x = (xMult - 1);
sP2.y = 0; sP2.y = 1;
sP3.x = xMult; sP3.x = (xMult - 1);
sP3.y = yMult; sP3.y = (yMult - 1);
sP4.x = 0; sP4.x = 1;
sP4.y = yMult; sP4.y = (yMult - 1);
if (texture & TILE_XFLIP) if (texture & TILE_XFLIP)
{ {

2
src/texture.c
View File

@ -77,7 +77,7 @@ static int newPage(const char *name, int level, int width, int height, int count
GL_RGBA, GL_UNSIGNED_BYTE, NULL); GL_RGBA, GL_UNSIGNED_BYTE, NULL);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);