Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixed (probably) degenerate case stalling the heightfield tracer.

Browse Source 
This was SVN commit r807.
This commit is contained in:
MarkT 2004-07-22 17:00:43 +00:00
parent be524141be
commit 5470eff53c
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/graphics/HFTracer.cpp
View File

@ -150,6 +150,19 @@ bool CHFTracer::RayIntersect(CVector3D& origin,CVector3D& dir,int& x,int& z,CVec
return true;
}
}
else
{
// Degenerate case: y close to zero
// catch travelling off the map
if( ( cx < 0 ) && ( sx < 0 ) )
return( false );
if( ( cx >= m_MapSize ) && ( sx > 0 ) )
return( false );
if( ( cz < 0 ) && ( sz < 0 ) )
return( false );
if( ( cz >= m_MapSize ) && ( sz > 0 ) )
return( false );
}
// get coords of current cell
fcx=traversalPt.X*invCellSize;

34
source/ps/Interact.cpp
View File

@ -707,7 +707,20 @@ int interactInputHandler( const SDL_Event* ev )
{
if( hotkeys[HOTKEY_CAMERA_BOOKMARK_SAVE] )
{
cameraBookmarks[id] = g_Camera.m_Orientation.GetTranslation() + g_Camera.m_Orientation.GetIn() * 160.0f;
// Attempt to track the ground we're looking at
CHFTracer tracer( g_Terrain.GetHeightMap(), g_Terrain.GetVerticesPerSide(), CELL_SIZE, HEIGHT_SCALE ); int x, z;
CVector3D origin, dir, delta, currentTarget;
origin = g_Camera.m_Orientation.GetTranslation();
dir = g_Camera.m_Orientation.GetIn();
if( tracer.RayIntersect( origin, dir, x, z, currentTarget ) )
{
cameraBookmarks[id] = currentTarget;
}
else
{
// Placing a bookmark off the map? If you say so, guv'nor.
cameraBookmarks[id] = g_Camera.m_Orientation.GetTranslation() + g_Camera.m_Orientation.GetIn() * 160.0f;
}
bookmarkInUse[id] = true;
}
else if( hotkeys[HOTKEY_CAMERA_BOOKMARK_SNAP] )
@ -853,14 +866,29 @@ bool isMouseoverType( CEntity* ev )
void pushCameraTarget( const CVector3D& target )
{
// Save the current position
cameraTargets.push_back( g_Camera.m_Orientation.GetTranslation() );
// And set the camera
setCameraTarget( target );
}
void setCameraTarget( const CVector3D& target )
{
CVector3D cameraForward = g_Camera.m_Orientation.GetIn();
cameraDelta = ( target - ( cameraForward * 160.0f ) ) - g_Camera.m_Orientation.GetTranslation();
// Maintain the same orientation and level of zoom, if we can
// (do this by working out the point the camera is looking at, saving
// the difference beteen that position and the camera point, and restoring
// that difference to our new target)
CHFTracer tracer( g_Terrain.GetHeightMap(), g_Terrain.GetVerticesPerSide(), CELL_SIZE, HEIGHT_SCALE ); int x, z;
CVector3D origin, dir, currentTarget;
origin = g_Camera.m_Orientation.GetTranslation();
dir = g_Camera.m_Orientation.GetIn();
if( tracer.RayIntersect( origin, dir, x, z, currentTarget ) )
{
cameraDelta = target - currentTarget;
}
else
cameraDelta = ( target - dir * 160.0f ) - origin;
}
void popCameraTarget()