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

Fix bug #11828: Raycast visibility now too far 

Was using squared distances and pseudo-3d vectors in some inappropriate places


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5271 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-06-18 22:23:06 +00:00
parent 496d6592b5
commit bd65c4255f
3 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/raycast.c
View File

@ -80,13 +80,13 @@ void rayCast(Vector3i src, Vector3i direction, int length,
* Gets the maximum terrain height along a certain direction to the edge of the grid
* from wherever you specify, as well as the distance away
*/
static bool getTileHighestCallback(Vector3i pos, int dist, void* data)
static bool getTileHighestCallback(Vector3i pos, int distSq, void* data)
{
HighestCallbackHelp_t * help = data;
if (clipXY(pos.x, pos.y))
{
unsigned int height = map_Height(pos.x, pos.y);
unsigned int height = map_Height(pos.x, pos.y), dist = sqrtf(distSq);
if (height > help->highestHeight && dist >= help->minDist)
{
int heightDif = height - help->origHeight;
@ -102,7 +102,7 @@ static bool getTileHighestCallback(Vector3i pos, int dist, void* data)
//-----------------------------------------------------------------------------------
/* Will return false when we've hit the edge of the grid */
static bool getTileHeightCallback(Vector3i pos, int dist, void* data)
static bool getTileHeightCallback(Vector3i pos, int distSq, void* data)
{
HeightCallbackHelp_t * help = data;
#ifdef TEST_RAY
@ -112,6 +112,7 @@ static bool getTileHeightCallback(Vector3i pos, int dist, void* data)
/* Are we still on the grid? */
if (clipXY(pos.x, pos.y))
{
int dist = sqrtf(distSq);
bool HasTallStructure = TileHasTallStructure(mapTile(map_coord(pos.x), map_coord(pos.y)));
if (dist > TILE_UNITS || HasTallStructure)

4
src/raycast.h
View File

@ -35,11 +35,11 @@
/*!
* The raycast intersection callback.
* \param pos Current position
* \param dist Current distance from start
* \param distSq Current distance from start, squared
* \param data Payload (store intermediate results here)
* \return true if ore points are required, false otherwise
*/
typedef bool (*RAY_CALLBACK)(Vector3i pos, int dist, void* data);
typedef bool (*RAY_CALLBACK)(Vector3i pos, int distSq, void* data);
/*!

40
src/visibility.c
View File

@ -121,8 +121,9 @@ static int visObjHeight(const BASE_OBJECT * psObject)
}
/* The terrain revealing ray callback */
bool rayTerrainCallback(Vector3i pos, int dist, void * data)
bool rayTerrainCallback(Vector3i pos, int distSq, void * data)
{
int dist = sqrtf(distSq);
int newH, newG; // The new gradient
MAPTILE *psTile;
@ -172,8 +173,9 @@ bool rayTerrainCallback(Vector3i pos, int dist, void * data)
}
/* The los ray callback */
static bool rayLOSCallback(Vector3i pos, int dist, void *data)
static bool rayLOSCallback(Vector3i pos, int distSq, void *data)
{
int dist = sqrtf(distSq);
int newG; // The new gradient
ASSERT(pos.x >= 0 && pos.x < world_coord(mapWidth)
@ -268,7 +270,7 @@ void visTilesUpdate(BASE_OBJECT *psObj, RAY_CALLBACK callback)
BOOL visibleObject(const BASE_OBJECT* psViewer, const BASE_OBJECT* psTarget)
{
Vector3i pos, dest, diff;
int ray, range, rangeSquared;
int range, rangeSquared;
int tarG, top;
ASSERT(psViewer != NULL, "Invalid viewer pointer!");
@ -279,9 +281,9 @@ BOOL visibleObject(const BASE_OBJECT* psViewer, const BASE_OBJECT* psTarget)
return false;
}
pos = Vector3i_New(psViewer->pos.x, psViewer->pos.y, 0);
dest = Vector3i_New(psTarget->pos.x, psTarget->pos.y, 0);
diff = Vector3i_Sub(pos, dest);
pos = Vector3uw_To3i(psViewer->pos);
dest = Vector3uw_To3i(psTarget->pos);
diff = Vector3i_Sub(dest, pos);
range = objSensorRange(psViewer);
/* Get the sensor Range and power */
@ -347,26 +349,6 @@ BOOL visibleObject(const BASE_OBJECT* psViewer, const BASE_OBJECT* psTarget)
}
/* First see if the target is in sensor range */
if (diff.x < 0)
{
diff.x = -diff.x;
}
if (diff.x > range)
{
// too far away, reject
return false;
}
if (diff.y < 0)
{
diff.y = -diff.y;
}
if (diff.y > range)
{
// too far away, reject
return false;
}
rangeSquared = Vector3i_ScalarP(diff, diff);
if (rangeSquared == 0)
{
@ -387,12 +369,11 @@ BOOL visibleObject(const BASE_OBJECT* psViewer, const BASE_OBJECT* psTarget)
tarDist = rangeSquared;
rayStart = true;
currObj = 0;
ray = NUM_RAYS-1 - calcDirection(pos.x, pos.y, dest.x, dest.y);
finalX = map_coord(dest.x);
finalY = map_coord(dest.y);
// Cast a ray from the viewer to the target
rayCast(pos, rayAngleToVector3i(ray), range, rayLOSCallback, NULL);
rayCast(pos, diff, range, rayLOSCallback, NULL);
// See if the target can be seen
top = (dest.z + visObjHeight(psTarget) - startH);
@ -715,8 +696,9 @@ void updateSensorDisplay()
}
}
bool scrRayTerrainCallback(Vector3i pos, int dist, void *data)
bool scrRayTerrainCallback(Vector3i pos, int distSq, void *data)
{
int dist = sqrtf(distSq);
int newH, newG; // The new gradient
MAPTILE *psTile;