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

We no longer need .wlight to separately store water colour. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3054 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-12-14 16:21:12 +00:00
parent 8fcd2410be
commit 0484f5e383
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ivis_common/piedef.h
View File

@ -112,7 +112,6 @@ typedef struct
Vector3i screen; //! Screenspace tile coordinates
Vector3i water; //! Screenspace water coordinates
int water_height; //! Worldspace water height
PIELIGHT wlight; //! Special water lighting
UBYTE bWater; //! Is it a watertile?
} TERRAIN_VERTEX;
typedef struct {float x, y, z, u, v; PIELIGHT light, specular;} TERRAIN_VERTEXF;

8
src/display3d.c
View File

@ -697,11 +697,7 @@ static void drawTiles(iView *camera, iView *player)
tileScreenInfo[i][j].water.z = pie_RotateProject(&tileScreenInfo[i][j].pos, &water);
tileScreenInfo[i][j].water.x = water.x;
tileScreenInfo[i][j].water.y = water.y;
tileScreenInfo[i][j].water_height = tileScreenInfo[i][j].pos.y;
// Calc the light for modified y coord and ignore the specular component
tileScreenInfo[i][j].wlight = TileIllum;
tileScreenInfo[i][j].pos.y = tmp_y;
}
else
@ -3980,17 +3976,14 @@ static void drawTerrainWaterTile(UDWORD i, UDWORD j)
vertices[0] = tileScreenInfo[i + 0][j + 0];
vertices[0].pos.y = tileScreenInfo[i + 0][j + 0].water_height;
vertices[0].light = tileScreenInfo[i+0][j+0].wlight;
vertices[0].light.byte.a = WATER_ALPHA_LEVEL;
vertices[1] = tileScreenInfo[i + 0][j + 1];
vertices[1].pos.y = tileScreenInfo[i + 0][j + 1].water_height;
vertices[1].light = tileScreenInfo[i+0][j+1].wlight;
vertices[1].light.byte.a = WATER_ALPHA_LEVEL;
vertices[2] = tileScreenInfo[i + 1][j + 1];
vertices[2].pos.y = tileScreenInfo[i + 1][j + 1].water_height;
vertices[2].light = tileScreenInfo[i+1][j+1].wlight;
vertices[2].light.byte.a = WATER_ALPHA_LEVEL;
pie_DrawWaterTriangle(vertices);
@ -3998,7 +3991,6 @@ static void drawTerrainWaterTile(UDWORD i, UDWORD j)
vertices[1] = vertices[2];
vertices[2] = tileScreenInfo[i + 1][j + 0];
vertices[2].pos.y = tileScreenInfo[i + 1][j + 0].water_height;
vertices[2].light = tileScreenInfo[i+1][j+0].wlight;
vertices[2].light.byte.a = WATER_ALPHA_LEVEL;
pie_DrawWaterTriangle(vertices);