server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #78 from grahamboree/RC_SPAN_HEIGHT_BITS_fix

Browse Source 
Use RC_SPAN_HEIGHT_BITS when setting the bitfield size of rcSpan::smin and rcSpan::smax
This commit is contained in:
Jakob Botsch Nielsen 2015-12-17 14:16:02 +01:00
commit 35fb7d5c16
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Recast/Include/Recast.h
View File

@ -245,7 +245,7 @@ struct rcConfig
/// Defines the number of bits allocated to rcSpan::smin and rcSpan::smax. /// Defines the number of bits allocated to rcSpan::smin and rcSpan::smax.
static const int RC_SPAN_HEIGHT_BITS = 13; static const int RC_SPAN_HEIGHT_BITS = 13;
/// Defines the maximum value for rcSpan::smin and rcSpan::smax. /// Defines the maximum value for rcSpan::smin and rcSpan::smax.
static const int RC_SPAN_MAX_HEIGHT = (1<<RC_SPAN_HEIGHT_BITS)-1; static const int RC_SPAN_MAX_HEIGHT = (1 << RC_SPAN_HEIGHT_BITS) - 1;
/// The number of spans allocated per span spool. /// The number of spans allocated per span spool.
/// @see rcSpanPool /// @see rcSpanPool
@ -255,10 +255,10 @@ static const int RC_SPANS_PER_POOL = 2048;
/// @see rcHeightfield /// @see rcHeightfield
struct rcSpan struct rcSpan
{ {
unsigned int smin : 13; ///< The lower limit of the span. [Limit: < #smax] unsigned int smin : RC_SPAN_HEIGHT_BITS; ///< The lower limit of the span. [Limit: < #smax]
unsigned int smax : 13; ///< The upper limit of the span. [Limit: <= #RC_SPAN_MAX_HEIGHT] unsigned int smax : RC_SPAN_HEIGHT_BITS; ///< The upper limit of the span. [Limit: <= #RC_SPAN_MAX_HEIGHT]
unsigned int area : 6; ///< The area id assigned to the span. unsigned int area : 6; ///< The area id assigned to the span.
rcSpan* next; ///< The next span higher up in column. rcSpan* next; ///< The next span higher up in column.
}; };
/// A memory pool used for quick allocation of spans within a heightfield. /// A memory pool used for quick allocation of spans within a heightfield.