Skip to content

Commit

Permalink
update recastnavigation to 1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jnnshschl committed Jan 9, 2024
1 parent a6d23ef commit 763a464
Show file tree
Hide file tree
Showing 17 changed files with 6,962 additions and 6,872 deletions.
2 changes: 1 addition & 1 deletion AmeisenNavigation.Server/src/Main.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <iostream>
#include <mutex>

constexpr auto AMEISENNAV_VERSION = "1.8.1.0";
constexpr auto AMEISENNAV_VERSION = "1.8.2.0";

constexpr auto VEC3_SIZE = sizeof(float) * 3;

Expand Down
6 changes: 3 additions & 3 deletions recastnavigation/Detour/Include/DetourAlloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
/// memory is expected to be used.
enum dtAllocHint
{
DT_ALLOC_PERM, ///< Memory persist after a function call.
DT_ALLOC_TEMP ///< Memory used temporarily within a function.
DT_ALLOC_PERM, ///< Memory persist after a function call.
DT_ALLOC_TEMP ///< Memory used temporarily within a function.
};

/// A memory allocation function.
Expand All @@ -44,7 +44,7 @@ typedef void (dtFreeFunc)(void* ptr);
/// Sets the base custom allocation functions to be used by Detour.
/// @param[in] allocFunc The memory allocation function to be used by #dtAlloc
/// @param[in] freeFunc The memory de-allocation function to be used by #dtFree
void dtAllocSetCustom(dtAllocFunc* allocFunc, dtFreeFunc* freeFunc);
void dtAllocSetCustom(dtAllocFunc *allocFunc, dtFreeFunc *freeFunc);

/// Allocates a memory block.
/// @param[in] size The size, in bytes of memory, to allocate.
Expand Down
8 changes: 4 additions & 4 deletions recastnavigation/Detour/Include/DetourAssert.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#ifdef NDEBUG

// From http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
# define dtAssert(x) do { (void)sizeof(x); } while((void)(__LINE__==-1),false)
// From https://web.archive.org/web/20210117002833/http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/
# define dtAssert(x) do { (void)sizeof(x); } while((void)(__LINE__==-1),false)

#else

Expand All @@ -38,12 +38,12 @@ typedef void (dtAssertFailFunc)(const char* expression, const char* file, int li

/// Sets the base custom assertion failure function to be used by Detour.
/// @param[in] assertFailFunc The function to be invoked in case of failure of #dtAssert
void dtAssertFailSetCustom(dtAssertFailFunc* assertFailFunc);
void dtAssertFailSetCustom(dtAssertFailFunc *assertFailFunc);

/// Gets the base custom assertion failure function to be used by Detour.
dtAssertFailFunc* dtAssertFailGetCustom();

# include <assert.h>
# include <assert.h>
# define dtAssert(expression) \
{ \
dtAssertFailFunc* failFunc = dtAssertFailGetCustom(); \
Expand Down
Loading

0 comments on commit 763a464

Please sign in to comment.