cache deltaZ for nav area height change

Author: mastercoms

src/game/server/nav_area.cpp

@@ -1327,6 +1327,21 @@ bool CNavArea::IsConnected( const CNavArea *area, NavDirType dir ) const
 	return false;
 }
 
+int CNavArea::GetConnected( const CNavArea *area, NavDirType dir ) const
+{
+	if ( area != this && dir != NUM_DIRECTIONS )
+	{
+		// check specific direction
+		FOR_EACH_VEC( m_connect[ dir ], it )
+		{
+			if (area == m_connect[ dir ][ it ].area)
+				return it;
+		}
+	}
+
+	return m_connect[0].InvalidIndex();
+}
+
 //--------------------------------------------------------------------------------------------------------------
 /**
  * Compute change in actual ground height from this area to given area
@@ -2605,25 +2620,37 @@ float CNavArea::ComputeAdjacentConnectionHeightChange( const CNavArea *destinati
 {
 	VPROF_BUDGET( "CNavArea::ComputeAdjacentConnectionHeightChange", "NextBot" );
 
+	if ( destinationArea == this )
+		return 0.0f;
+
 	// find which side it is connected on
 	int dir;
+	int it;
 	for( dir=0; dir<NUM_DIRECTIONS; ++dir )
 	{
-		if ( IsConnected( destinationArea, (NavDirType)dir ) )
+		it = GetConnected( destinationArea, ( NavDirType )dir );
+		if ( it != m_connect[0].InvalidIndex() )
 			break;
 	}
 
 	if ( dir == NUM_DIRECTIONS )
 		return FLT_MAX;
 
+	if ( m_connect[dir][it].deltaZ != FLT_MAX )
+		return m_connect[dir][it].deltaZ;
+
 	Vector myEdge;
 	float halfWidth;
 	ComputePortal( destinationArea, (NavDirType)dir, &myEdge, &halfWidth );
 
 	Vector otherEdge;
 	destinationArea->ComputePortal( this, OppositeDirection( (NavDirType)dir ), &otherEdge, &halfWidth );
 
-	return otherEdge.z - myEdge.z;
+	// cache it
+	const float deltaZ = otherEdge.z - myEdge.z;
+    m_connect[dir][it].deltaZ = deltaZ;
+
+	return deltaZ;
 }
 
 

src/game/server/nav_area.h

@@ -70,6 +70,7 @@ struct NavConnect
 	{
 		id = 0;
 		length = -1;
+		deltaZ = FLT_MAX;
 	}
 
 	union
@@ -79,6 +80,7 @@ struct NavConnect
 	};
 
 	mutable float length;
+	mutable float deltaZ;
 
 	bool operator==( const NavConnect &other ) const
 	{
@@ -368,6 +370,7 @@ class CNavArea : protected CNavAreaCriticalData
 
 	const NavConnectVector *GetAdjacentAreas( NavDirType dir ) const	{ return &m_connect[dir]; }
 	bool IsConnected( const CNavArea *area, NavDirType dir ) const;	// return true if given area is connected in given direction
+	int  GetConnected( const CNavArea* area, NavDirType dir ) const; // return it if given area is connected in given direction
 	bool IsConnected( const CNavLadder *ladder, CNavLadder::LadderDirectionType dir ) const;	// return true if given ladder is connected in given direction
 	float ComputeGroundHeightChange( const CNavArea *area );			// compute change in actual ground height from this area to given area