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

Patch #875. Prevent the player from clipping through the terrain so often. 

Restores the sane defaults for max zoom and angle from the original game,
and fixes the way the camera increase in height when passing over terrain.
Thanks to buginator for testing.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2998 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-12-07 21:49:28 +00:00
parent 864e182607
commit 59db49c55e
3 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/display.h
View File

@ -191,7 +191,7 @@ extern BOOL getRotActive( void );
extern SDWORD getDesiredPitch( void );
extern void setDesiredPitch(SDWORD pitch);
#define MAX_PLAYER_X_ANGLE (-7)
#define MAX_PLAYER_X_ANGLE (-14)
#define MIN_PLAYER_X_ANGLE (-50)
#define HIDDEN_FRONTEND_WIDTH (640)

69
src/display3d.c
View File

@ -144,6 +144,7 @@ static void doConstructionLines(void);
static void drawDroidCmndNo(DROID *psDroid);
static void drawDroidRank(DROID *psDroid);
static void drawDroidSensorLock(DROID *psDroid);
static void calcAverageTerrainHeight(iView *player);
BOOL doWeDrawRadarBlips(void);
BOOL doWeDrawProximitys(void);
@ -395,6 +396,7 @@ void draw3DScene( void )
if(!getWarCamStatus())
{
/* Move the autonomous camera if necessary */
calcAverageTerrainHeight(&player);
trackHeight(2 * averageCentreTerrainHeight);
}
else
@ -492,16 +494,53 @@ void setProximityDraw(BOOL val)
}
/***************************************************************************/
static void calcAverageTerrainHeight(iView *player)
{
int numTilesAveraged = 0, i, j;
/* We track the height here - so make sure we get the average heights
of the tiles directly underneath us
*/
averageCentreTerrainHeight = 0;
for (i = VISIBLE_YTILES / 2 - 4; i < VISIBLE_YTILES / 2 + 4; i++)
{
for (j = VISIBLE_XTILES / 2 - 4; j < VISIBLE_XTILES / 2 + 4; j++)
{
if (tileOnMap(playerXTile + j, playerZTile + i))
{
/* Get a pointer to the tile at this location */
MAPTILE *psTile = mapTile(playerXTile + j, playerZTile + i);
averageCentreTerrainHeight += psTile->height * ELEVATION_SCALE;
numTilesAveraged++;
}
}
}
/* Work out the average height. We use this information to keep the player camera
* above the terrain. */
if (numTilesAveraged) // might not be if off map
{
MAPTILE *psTile = mapTile(playerXTile + VISIBLE_XTILES / 2, playerZTile + VISIBLE_YTILES / 2);
averageCentreTerrainHeight /= numTilesAveraged;
if (averageCentreTerrainHeight < psTile->height * ELEVATION_SCALE)
{
averageCentreTerrainHeight = psTile->height * ELEVATION_SCALE;
}
}
else
{
averageCentreTerrainHeight = ELEVATION_SCALE * TILE_UNITS;
}
}
static void drawTiles(iView *camera, iView *player)
{
UDWORD i, j;
MAPTILE *psTile;
BOOL bWaterTile = FALSE;
BOOL PushedDown = FALSE;
UBYTE TileIllum;
int shiftVal = 0;
int numTilesAveraged = 0;
static float angle = 0.0f;
// Animate the water texture, just cycles the V coordinate through half the tiles height.
@ -561,10 +600,6 @@ static void drawTiles(iView *camera, iView *player)
/* ---------------------------------------------------------------- */
/* Rotate and project all the tiles within the grid */
/* ---------------------------------------------------------------- */
/* We track the height here - so make sure we get the average heights
of the tiles in the grid
*/
averageCentreTerrainHeight = 0;
for (i = 0; i < visibleTiles.y+1; i++)
{
/* Go through the x's */
@ -593,7 +628,7 @@ static void drawTiles(iView *camera, iView *player)
BOOL bEdgeTile;
/* Get a pointer to the tile at this location */
psTile = mapTile(playerXTile + j, playerZTile + i);
MAPTILE *psTile = mapTile(playerXTile + j, playerZTile + i);
if (terrainType(psTile) == TER_WATER)
{
tileScreenInfo[i][j].bWater = TRUE;
@ -607,16 +642,6 @@ static void drawTiles(iView *camera, iView *player)
tileScreenInfo[i][j].pos.y = map_TileHeight(playerXTile + j, playerZTile + i);
/* Is it in the centre and therefore worth averaging height over? */
if ( i > MIN_TILE_Y &&
i < MAX_TILE_Y &&
j > MIN_TILE_X &&
j < MAX_TILE_X )
{
averageCentreTerrainHeight += tileScreenInfo[i][j].pos.y;
numTilesAveraged++;
}
if(getRevealStatus())
{
if(godMode)
@ -711,16 +736,6 @@ static void drawTiles(iView *camera, iView *player)
}
}
/* Work out the average height */
if(numTilesAveraged) // might not be if off map
{
averageCentreTerrainHeight /= numTilesAveraged;
}
else
{
averageCentreTerrainHeight = ELEVATION_SCALE * TILE_UNITS;
}
/* This is done here as effects can light the terrain - pause mode problems though */
processEffects();
atmosUpdateSystem();

9
src/display3ddef.h
View File

@ -34,17 +34,10 @@
#define VISIBLE_XTILES 64
#define VISIBLE_YTILES 64
#define MIN_TILE_X (VISIBLE_XTILES/4)
#define MAX_TILE_X ((3*VISIBLE_XTILES)/4)
#define MIN_TILE_Y (VISIBLE_YTILES/4)
#define MAX_TILE_Y ((3*VISIBLE_YTILES)/4)
#define LAND_XGRD (VISIBLE_XTILES + 1)
#define LAND_YGRD (VISIBLE_YTILES + 1)
#define MAXDISTANCE (4500)
#define MINDISTANCE (200)
#define MINDISTANCE (1500)
#define START_DISTANCE (2500)
#endif