Detour/Recast/Demo: Removed GCC reorder warnings (enabled -Wreorder under xcode).
Recast: RecastTimer should compile with null implementation under Linux now.
This commit is contained in:
Mikko Mononen
parent
cc1126daaa
commit
6fc3d5c58e
@ -174,8 +174,9 @@ public:
|
||||
|
||||
int getMemUsed() const;
|
||||
|
||||
inline unsigned char* getData() const { return m_data; }
|
||||
inline int getDataSize() const { return m_dataSize; }
|
||||
inline const dtStatNavMeshHeader* getHeader() const { return m_header; }
|
||||
|
||||
inline const dtStatBVNode* getBvTreeNodes() const { return m_header ? m_header->bvtree : 0; }
|
||||
inline int getBvTreeNodeCount() const { return m_header ? m_header->nnodes : 0; }
|
||||
|
||||
|
||||
@ -21,11 +21,13 @@
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
dtNodePool::dtNodePool(int maxNodes, int hashSize) :
|
||||
m_maxNodes(maxNodes),
|
||||
m_hashSize(hashSize),
|
||||
|
||||
m_nodes(0),
|
||||
m_first(0),
|
||||
m_next(0)
|
||||
m_next(0),
|
||||
m_maxNodes(maxNodes),
|
||||
m_hashSize(hashSize),
|
||||
m_nodeCount(0)
|
||||
{
|
||||
m_nodes = new dtNode[m_maxNodes];
|
||||
m_next = new unsigned short[m_maxNodes];
|
||||
@ -95,9 +97,9 @@ dtNode* dtNodePool::getNode(unsigned int id)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
dtNodeQueue::dtNodeQueue(int n) :
|
||||
m_heap(0),
|
||||
m_capacity(n),
|
||||
m_size(0),
|
||||
m_heap(0)
|
||||
m_size(0)
|
||||
{
|
||||
m_heap = new dtNode*[m_capacity+1];
|
||||
}
|
||||
|
||||
@ -27,11 +27,11 @@
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////
|
||||
dtStatNavMesh::dtStatNavMesh() :
|
||||
m_data(0),
|
||||
m_dataSize(0),
|
||||
m_header(0),
|
||||
m_nodePool(0),
|
||||
m_openList(0),
|
||||
m_data(0),
|
||||
m_dataSize(0)
|
||||
m_openList(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@ struct rcCompactSpan
|
||||
|
||||
struct rcCompactHeightfield
|
||||
{
|
||||
inline rcCompactHeightfield() : cells(0), spans(0), maxDistance(0), maxRegions(0) {}
|
||||
inline rcCompactHeightfield() : maxDistance(0), maxRegions(0), cells(0), spans(0) {}
|
||||
inline ~rcCompactHeightfield() { delete [] cells; delete [] spans; }
|
||||
int width, height;
|
||||
int spanCount;
|
||||
|
||||
@ -18,21 +18,14 @@
|
||||
#ifndef RECAST_TIMER_H
|
||||
#define RECAST_TIMER_H
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
//#include <stdint.h>
|
||||
typedef __int64 rcTimeVal;
|
||||
rcTimeVal rcGetPerformanceTimer();
|
||||
int rcGetDeltaTimeUsec(rcTimeVal start, rcTimeVal end);
|
||||
|
||||
#else
|
||||
|
||||
// OSX
|
||||
#ifdef __GNUC__
|
||||
#include <stdint.h>
|
||||
typedef uint64_t rcTimeVal;
|
||||
rcTimeVal rcGetPerformanceTimer();
|
||||
int rcGetDeltaTimeUsec(rcTimeVal start, rcTimeVal end);
|
||||
|
||||
typedef int64_t rcTimeVal;
|
||||
#else
|
||||
typedef __int64 rcTimeVal;
|
||||
#endif
|
||||
|
||||
rcTimeVal rcGetPerformanceTimer();
|
||||
int rcGetDeltaTimeUsec(rcTimeVal start, rcTimeVal end);
|
||||
|
||||
#endif // RECAST_TIMER_H
|
||||
|
||||
@ -1,30 +1,31 @@
|
||||
#include "RecastTimer.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32)
|
||||
|
||||
// Win32
|
||||
#include <windows.h>
|
||||
|
||||
rcTimeVal rcGetPerformanceTimer()
|
||||
{
|
||||
__int64 count;
|
||||
QueryPerformanceCounter((LARGE_INTEGER*)&count);
|
||||
return count;
|
||||
__int64 count;
|
||||
QueryPerformanceCounter((LARGE_INTEGER*)&count);
|
||||
return count;
|
||||
}
|
||||
|
||||
int rcGetDeltaTimeUsec(rcTimeVal start, rcTimeVal end)
|
||||
{
|
||||
static __int64 freq = 0;
|
||||
if (freq == 0)
|
||||
QueryPerformanceFrequency((LARGE_INTEGER*)&freq);
|
||||
static __int64 freq = 0;
|
||||
if (freq == 0)
|
||||
QueryPerformanceFrequency((LARGE_INTEGER*)&freq);
|
||||
__int64 elapsed = end - start;
|
||||
return (int)(elapsed*1000000 / freq);
|
||||
}
|
||||
|
||||
#else
|
||||
#elif defined(__MACH__)
|
||||
|
||||
// OSX
|
||||
#include <mach/mach_time.h>
|
||||
|
||||
|
||||
rcTimeVal rcGetPerformanceTimer()
|
||||
{
|
||||
return mach_absolute_time();
|
||||
@ -40,4 +41,18 @@ int rcGetDeltaTimeUsec(rcTimeVal start, rcTimeVal end)
|
||||
return (int)(nanosec / 1000);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
// TODO: Linux, etc
|
||||
|
||||
rcTimeVal rcGetPerformanceTimer()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rcGetDeltaTimeUsec(rcTimeVal start, rcTimeVal end)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
@ -279,14 +279,14 @@
|
||||
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
|
||||
<array>
|
||||
<array>
|
||||
<integer>36</integer>
|
||||
<integer>32</integer>
|
||||
<integer>27</integer>
|
||||
<integer>18</integer>
|
||||
<integer>1</integer>
|
||||
<integer>0</integer>
|
||||
</array>
|
||||
</array>
|
||||
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
|
||||
<string>{{0, 104}, {282, 628}}</string>
|
||||
<string>{{0, 266}, {282, 628}}</string>
|
||||
</dict>
|
||||
<key>PBXTopSmartGroupGIDs</key>
|
||||
<array/>
|
||||
@ -321,7 +321,7 @@
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>6B8632A30F78115100E2684A</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>Sample_TileMesh.cpp</string>
|
||||
<string>RecastTimer.cpp</string>
|
||||
<key>PBXSplitModuleInNavigatorKey</key>
|
||||
<dict>
|
||||
<key>Split0</key>
|
||||
@ -329,25 +329,20 @@
|
||||
<key>PBXProjectModuleGUID</key>
|
||||
<string>6B8632A40F78115100E2684A</string>
|
||||
<key>PBXProjectModuleLabel</key>
|
||||
<string>Sample_TileMesh.cpp</string>
|
||||
<string>RecastTimer.cpp</string>
|
||||
<key>_historyCapacity</key>
|
||||
<integer>0</integer>
|
||||
<key>bookmark</key>
|
||||
<string>6B555FC0100B5A3300247EA3</string>
|
||||
<string>6B92CE9D100E0763003DA304</string>
|
||||
<key>history</key>
|
||||
<array>
|
||||
<string>6BB87E0B0F9DE8A300E33F12</string>
|
||||
<string>6B7707F00FBD90F100D21BAE</string>
|
||||
<string>6BB7876B0FC03EAD003C24DB</string>
|
||||
<string>6B8A71F40FDAB52200A0A6FB</string>
|
||||
<string>6B995BDF0FE0D9B300D5C493</string>
|
||||
<string>6BC745A70FF527E50083A694</string>
|
||||
<string>6BC745A80FF527E50083A694</string>
|
||||
<string>6B9B7D9D0FF91AC600A9090F</string>
|
||||
<string>6B25B43E0FFA1786004F1BC4</string>
|
||||
<string>6B25B44B0FFA1968004F1BC4</string>
|
||||
<string>6B2AEC5C0FFB8AB0005BE9CC</string>
|
||||
<string>6B2AEC610FFB8AB0005BE9CC</string>
|
||||
<string>6B2AEC620FFB8AB0005BE9CC</string>
|
||||
<string>6B2AEC670FFB8AB0005BE9CC</string>
|
||||
<string>6B2AECED0FFB8B41005BE9CC</string>
|
||||
@ -368,34 +363,36 @@
|
||||
<string>6B555D24100B136A00247EA3</string>
|
||||
<string>6B555D30100B143200247EA3</string>
|
||||
<string>6B555E01100B285300247EA3</string>
|
||||
<string>6B555E04100B285300247EA3</string>
|
||||
<string>6B555E5F100B334900247EA3</string>
|
||||
<string>6B555E60100B334900247EA3</string>
|
||||
<string>6B555E79100B350E00247EA3</string>
|
||||
<string>6B555E7B100B350E00247EA3</string>
|
||||
<string>6B555E7C100B350E00247EA3</string>
|
||||
<string>6B555E9D100B37AB00247EA3</string>
|
||||
<string>6B555EA1100B37AB00247EA3</string>
|
||||
<string>6B555EA2100B37AB00247EA3</string>
|
||||
<string>6B555EDE100B39A600247EA3</string>
|
||||
<string>6B555F0C100B473F00247EA3</string>
|
||||
<string>6B555F0D100B473F00247EA3</string>
|
||||
<string>6B555F0E100B473F00247EA3</string>
|
||||
<string>6B555F0F100B473F00247EA3</string>
|
||||
<string>6B555F10100B473F00247EA3</string>
|
||||
<string>6B555F11100B473F00247EA3</string>
|
||||
<string>6B555F12100B473F00247EA3</string>
|
||||
<string>6B555F13100B473F00247EA3</string>
|
||||
<string>6B555F42100B4C5800247EA3</string>
|
||||
<string>6B555F5E100B53F500247EA3</string>
|
||||
<string>6B555F88100B577A00247EA3</string>
|
||||
<string>6B555F89100B577A00247EA3</string>
|
||||
<string>6B555F8B100B577A00247EA3</string>
|
||||
<string>6B555FA8100B589200247EA3</string>
|
||||
<string>6B555FB0100B595C00247EA3</string>
|
||||
<string>6B555FB1100B595C00247EA3</string>
|
||||
<string>6B555FB2100B595C00247EA3</string>
|
||||
<string>6B555FB3100B595C00247EA3</string>
|
||||
<string>6B92CE68100E0577003DA304</string>
|
||||
<string>6B92CE69100E0577003DA304</string>
|
||||
<string>6B92CE6A100E0577003DA304</string>
|
||||
<string>6B92CE6B100E0577003DA304</string>
|
||||
<string>6B92CE6C100E0577003DA304</string>
|
||||
<string>6B92CE6D100E0577003DA304</string>
|
||||
<string>6B92CE6E100E0577003DA304</string>
|
||||
<string>6B92CE6F100E0577003DA304</string>
|
||||
<string>6B92CE70100E0577003DA304</string>
|
||||
<string>6B92CE71100E0577003DA304</string>
|
||||
<string>6B92CE72100E0577003DA304</string>
|
||||
<string>6B92CE73100E0577003DA304</string>
|
||||
<string>6B92CE74100E0577003DA304</string>
|
||||
<string>6B92CE89100E0739003DA304</string>
|
||||
<string>6B92CE8A100E0739003DA304</string>
|
||||
<string>6B92CE8C100E0739003DA304</string>
|
||||
<string>6B92CE9A100E0763003DA304</string>
|
||||
<string>6B92CE9B100E0763003DA304</string>
|
||||
</array>
|
||||
<key>prevStack</key>
|
||||
<array>
|
||||
@ -404,7 +401,6 @@
|
||||
<string>6B1E02FC0F92563500CC0038</string>
|
||||
<string>6B1E032E0F925D9100CC0038</string>
|
||||
<string>6B8DB3900F9798DE007FA9E1</string>
|
||||
<string>6BB87E0E0F9DE8A300E33F12</string>
|
||||
<string>6B458EA80FB4540500044EA9</string>
|
||||
<string>6B7707B90FBD66CF00D21BAE</string>
|
||||
<string>6B7707F90FBD90F100D21BAE</string>
|
||||
@ -423,7 +419,6 @@
|
||||
<string>6B25B4120FFA1545004F1BC4</string>
|
||||
<string>6B86333B0F7813A600E2684A</string>
|
||||
<string>6B25B4080FFA13E9004F1BC4</string>
|
||||
<string>6B25B56D0FFA5899004F1BC4</string>
|
||||
<string>6B25B6250FFA63C8004F1BC4</string>
|
||||
<string>6B2AEC740FFB8AB0005BE9CC</string>
|
||||
<string>6B2AEC750FFB8AB0005BE9CC</string>
|
||||
@ -446,192 +441,41 @@
|
||||
<string>6B1186411006945C0018F96F</string>
|
||||
<string>6B1186581006945C0018F96F</string>
|
||||
<string>6B118672100694C40018F96F</string>
|
||||
<string>6B555D15100B125300247EA3</string>
|
||||
<string>6B555D26100B136A00247EA3</string>
|
||||
<string>6B555D27100B136A00247EA3</string>
|
||||
<string>6B555D28100B136A00247EA3</string>
|
||||
<string>6B555D29100B136A00247EA3</string>
|
||||
<string>6B555D32100B143200247EA3</string>
|
||||
<string>6B555D47100B175F00247EA3</string>
|
||||
<string>6B555D48100B175F00247EA3</string>
|
||||
<string>6B555D49100B175F00247EA3</string>
|
||||
<string>6B555D4A100B175F00247EA3</string>
|
||||
<string>6B555D4B100B175F00247EA3</string>
|
||||
<string>6B555D4C100B175F00247EA3</string>
|
||||
<string>6B555D4D100B175F00247EA3</string>
|
||||
<string>6B555D4E100B175F00247EA3</string>
|
||||
<string>6B555D4F100B175F00247EA3</string>
|
||||
<string>6B555D50100B175F00247EA3</string>
|
||||
<string>6B555D53100B175F00247EA3</string>
|
||||
<string>6B555D54100B175F00247EA3</string>
|
||||
<string>6B555D5D100B17DB00247EA3</string>
|
||||
<string>6B555D5E100B17DB00247EA3</string>
|
||||
<string>6B555D5F100B17DB00247EA3</string>
|
||||
<string>6B555D60100B17DB00247EA3</string>
|
||||
<string>6B555D66100B185A00247EA3</string>
|
||||
<string>6B555D71100B18EA00247EA3</string>
|
||||
<string>6B555D73100B18EA00247EA3</string>
|
||||
<string>6B555D74100B18EA00247EA3</string>
|
||||
<string>6B555D83100B1A5200247EA3</string>
|
||||
<string>6B555D85100B1A5200247EA3</string>
|
||||
<string>6B555D86100B1A5200247EA3</string>
|
||||
<string>6B555D94100B1B6900247EA3</string>
|
||||
<string>6B555D96100B1B6900247EA3</string>
|
||||
<string>6B555D97100B1B6900247EA3</string>
|
||||
<string>6B555D9E100B1C2400247EA3</string>
|
||||
<string>6B555DA0100B1C2400247EA3</string>
|
||||
<string>6B555DC3100B236A00247EA3</string>
|
||||
<string>6B555DC4100B236A00247EA3</string>
|
||||
<string>6B555DC5100B236A00247EA3</string>
|
||||
<string>6B555DC6100B236A00247EA3</string>
|
||||
<string>6B555DC7100B236A00247EA3</string>
|
||||
<string>6B555DC8100B236A00247EA3</string>
|
||||
<string>6B555DC9100B236A00247EA3</string>
|
||||
<string>6B555DCB100B236A00247EA3</string>
|
||||
<string>6B555DCC100B236A00247EA3</string>
|
||||
<string>6B555DCD100B236A00247EA3</string>
|
||||
<string>6B555DCF100B236A00247EA3</string>
|
||||
<string>6B555DD1100B236A00247EA3</string>
|
||||
<string>6B555DD3100B236A00247EA3</string>
|
||||
<string>6B555DD4100B236A00247EA3</string>
|
||||
<string>6B555DD5100B236A00247EA3</string>
|
||||
<string>6B555DD6100B236A00247EA3</string>
|
||||
<string>6B555DD7100B236A00247EA3</string>
|
||||
<string>6B555DD8100B236A00247EA3</string>
|
||||
<string>6B555DD9100B236A00247EA3</string>
|
||||
<string>6B555DDA100B236A00247EA3</string>
|
||||
<string>6B555DDB100B236A00247EA3</string>
|
||||
<string>6B555DDD100B236A00247EA3</string>
|
||||
<string>6B555DDF100B236A00247EA3</string>
|
||||
<string>6B555DE0100B236A00247EA3</string>
|
||||
<string>6B555DE2100B236A00247EA3</string>
|
||||
<string>6B555DE4100B236A00247EA3</string>
|
||||
<string>6B555DE6100B236A00247EA3</string>
|
||||
<string>6B555DE8100B236A00247EA3</string>
|
||||
<string>6B555DEA100B236A00247EA3</string>
|
||||
<string>6B555DEC100B236A00247EA3</string>
|
||||
<string>6B555DED100B236A00247EA3</string>
|
||||
<string>6B555DF2100B25B900247EA3</string>
|
||||
<string>6B555E08100B285300247EA3</string>
|
||||
<string>6B555E09100B285300247EA3</string>
|
||||
<string>6B555E0A100B285300247EA3</string>
|
||||
<string>6B555E0B100B285300247EA3</string>
|
||||
<string>6B555E0D100B285300247EA3</string>
|
||||
<string>6B555E0E100B285300247EA3</string>
|
||||
<string>6B555E0F100B285300247EA3</string>
|
||||
<string>6B555E10100B285300247EA3</string>
|
||||
<string>6B555E11100B285300247EA3</string>
|
||||
<string>6B555E12100B285300247EA3</string>
|
||||
<string>6B555E13100B285300247EA3</string>
|
||||
<string>6B555E15100B285300247EA3</string>
|
||||
<string>6B555E18100B285300247EA3</string>
|
||||
<string>6B555E1B100B285300247EA3</string>
|
||||
<string>6B555E20100B2D9800247EA3</string>
|
||||
<string>6B555E22100B2D9800247EA3</string>
|
||||
<string>6B555E45100B311B00247EA3</string>
|
||||
<string>6B555E46100B311B00247EA3</string>
|
||||
<string>6B555E47100B311B00247EA3</string>
|
||||
<string>6B555E48100B311B00247EA3</string>
|
||||
<string>6B555E49100B311B00247EA3</string>
|
||||
<string>6B555E4B100B311B00247EA3</string>
|
||||
<string>6B555E4C100B311B00247EA3</string>
|
||||
<string>6B555E4D100B311B00247EA3</string>
|
||||
<string>6B555E4E100B311B00247EA3</string>
|
||||
<string>6B555E4F100B311B00247EA3</string>
|
||||
<string>6B555E50100B311B00247EA3</string>
|
||||
<string>6B555E51100B311B00247EA3</string>
|
||||
<string>6B555E52100B311B00247EA3</string>
|
||||
<string>6B555E53100B311B00247EA3</string>
|
||||
<string>6B555E54100B311B00247EA3</string>
|
||||
<string>6B555E55100B311B00247EA3</string>
|
||||
<string>6B555E56100B311B00247EA3</string>
|
||||
<string>6B555E57100B311B00247EA3</string>
|
||||
<string>6B555E67100B334900247EA3</string>
|
||||
<string>6B555E68100B334900247EA3</string>
|
||||
<string>6B555E69100B334900247EA3</string>
|
||||
<string>6B555E6B100B334900247EA3</string>
|
||||
<string>6B555E6C100B334900247EA3</string>
|
||||
<string>6B555E6D100B334900247EA3</string>
|
||||
<string>6B555E6E100B334900247EA3</string>
|
||||
<string>6B555E6F100B334900247EA3</string>
|
||||
<string>6B555E70100B334900247EA3</string>
|
||||
<string>6B555E71100B334900247EA3</string>
|
||||
<string>6B555E72100B334900247EA3</string>
|
||||
<string>6B555E73100B334900247EA3</string>
|
||||
<string>6B555E74100B334900247EA3</string>
|
||||
<string>6B555E75100B334900247EA3</string>
|
||||
<string>6B555E76100B334900247EA3</string>
|
||||
<string>6B555E7F100B350E00247EA3</string>
|
||||
<string>6B555E80100B350E00247EA3</string>
|
||||
<string>6B555E81100B350E00247EA3</string>
|
||||
<string>6B555E82100B350E00247EA3</string>
|
||||
<string>6B555E83100B350E00247EA3</string>
|
||||
<string>6B555E84100B350E00247EA3</string>
|
||||
<string>6B555E85100B350E00247EA3</string>
|
||||
<string>6B555E8C100B35E000247EA3</string>
|
||||
<string>6B555EA6100B37AB00247EA3</string>
|
||||
<string>6B555EA7100B37AB00247EA3</string>
|
||||
<string>6B555EA8100B37AB00247EA3</string>
|
||||
<string>6B555EA9100B37AB00247EA3</string>
|
||||
<string>6B555EAA100B37AB00247EA3</string>
|
||||
<string>6B555EAB100B37AB00247EA3</string>
|
||||
<string>6B555EAF100B37AB00247EA3</string>
|
||||
<string>6B555EB1100B37AB00247EA3</string>
|
||||
<string>6B555EB2100B37AB00247EA3</string>
|
||||
<string>6B555EB3100B37AB00247EA3</string>
|
||||
<string>6B555EB4100B37AB00247EA3</string>
|
||||
<string>6B555EE0100B39A600247EA3</string>
|
||||
<string>6B555EF9100B42E600247EA3</string>
|
||||
<string>6B555EFA100B42E600247EA3</string>
|
||||
<string>6B555EFB100B42E600247EA3</string>
|
||||
<string>6B555F17100B473F00247EA3</string>
|
||||
<string>6B555F18100B473F00247EA3</string>
|
||||
<string>6B555F19100B473F00247EA3</string>
|
||||
<string>6B555F1A100B473F00247EA3</string>
|
||||
<string>6B555F1B100B473F00247EA3</string>
|
||||
<string>6B555F1C100B473F00247EA3</string>
|
||||
<string>6B555F1D100B473F00247EA3</string>
|
||||
<string>6B555F1E100B473F00247EA3</string>
|
||||
<string>6B555F1F100B473F00247EA3</string>
|
||||
<string>6B555F21100B473F00247EA3</string>
|
||||
<string>6B555F22100B473F00247EA3</string>
|
||||
<string>6B555F23100B473F00247EA3</string>
|
||||
<string>6B555F30100B499000247EA3</string>
|
||||
<string>6B555F31100B499000247EA3</string>
|
||||
<string>6B555F33100B499000247EA3</string>
|
||||
<string>6B555F35100B499000247EA3</string>
|
||||
<string>6B555F37100B499000247EA3</string>
|
||||
<string>6B555F45100B4C5800247EA3</string>
|
||||
<string>6B555F4A100B4C5800247EA3</string>
|
||||
<string>6B555F4C100B4C5800247EA3</string>
|
||||
<string>6B555F63100B53F500247EA3</string>
|
||||
<string>6B555F65100B53F500247EA3</string>
|
||||
<string>6B555F67100B53F500247EA3</string>
|
||||
<string>6B555F69100B53F500247EA3</string>
|
||||
<string>6B555F6B100B53F500247EA3</string>
|
||||
<string>6B555F6D100B53F500247EA3</string>
|
||||
<string>6B555F6F100B53F500247EA3</string>
|
||||
<string>6B555F71100B53F500247EA3</string>
|
||||
<string>6B555F79100B54CE00247EA3</string>
|
||||
<string>6B555F7B100B54CE00247EA3</string>
|
||||
<string>6B555F8D100B577A00247EA3</string>
|
||||
<string>6B555F8E100B577A00247EA3</string>
|
||||
<string>6B555F8F100B577A00247EA3</string>
|
||||
<string>6B555F90100B577A00247EA3</string>
|
||||
<string>6B555F91100B577A00247EA3</string>
|
||||
<string>6B555F92100B577A00247EA3</string>
|
||||
<string>6B555F93100B577A00247EA3</string>
|
||||
<string>6B555F94100B577A00247EA3</string>
|
||||
<string>6B555F95100B577A00247EA3</string>
|
||||
<string>6B555F96100B577A00247EA3</string>
|
||||
<string>6B555F97100B577A00247EA3</string>
|
||||
<string>6B555F98100B577A00247EA3</string>
|
||||
<string>6B555F9A100B577A00247EA3</string>
|
||||
<string>6B555FA0100B57B500247EA3</string>
|
||||
<string>6B555FAB100B589200247EA3</string>
|
||||
<string>6B555FB4100B595C00247EA3</string>
|
||||
<string>6B555FB5100B595C00247EA3</string>
|
||||
<string>6B555FB6100B595C00247EA3</string>
|
||||
<string>6B92CE50100E02D3003DA304</string>
|
||||
<string>6B92CE75100E0577003DA304</string>
|
||||
<string>6B92CE76100E0577003DA304</string>
|
||||
<string>6B92CE77100E0577003DA304</string>
|
||||
<string>6B92CE78100E0577003DA304</string>
|
||||
<string>6B92CE79100E0577003DA304</string>
|
||||
<string>6B92CE7A100E0577003DA304</string>
|
||||
<string>6B92CE7B100E0577003DA304</string>
|
||||
<string>6B92CE7C100E0577003DA304</string>
|
||||
<string>6B92CE7D100E0577003DA304</string>
|
||||
<string>6B92CE7E100E0577003DA304</string>
|
||||
<string>6B92CE7F100E0577003DA304</string>
|
||||
<string>6B92CE80100E0577003DA304</string>
|
||||
<string>6B92CE81100E0577003DA304</string>
|
||||
<string>6B92CE82100E0577003DA304</string>
|
||||
<string>6B92CE83100E0577003DA304</string>
|
||||
<string>6B92CE84100E0577003DA304</string>
|
||||
<string>6B92CE8E100E0739003DA304</string>
|
||||
<string>6B92CE8F100E0739003DA304</string>
|
||||
<string>6B92CE90100E0739003DA304</string>
|
||||
<string>6B92CE91100E0739003DA304</string>
|
||||
<string>6B92CE92100E0739003DA304</string>
|
||||
<string>6B92CE93100E0739003DA304</string>
|
||||
<string>6B92CE94100E0739003DA304</string>
|
||||
<string>6B92CE95100E0739003DA304</string>
|
||||
<string>6B92CE9C100E0763003DA304</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>SplitCount</key>
|
||||
@ -645,18 +489,18 @@
|
||||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{0, 0}, {976, 462}}</string>
|
||||
<string>{{0, 0}, {976, 449}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>0 91 1280 687 0 0 1280 778 </string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>PBXNavigatorGroup</string>
|
||||
<key>Proportion</key>
|
||||
<string>462pt</string>
|
||||
<string>449pt</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>Proportion</key>
|
||||
<string>179pt</string>
|
||||
<string>192pt</string>
|
||||
<key>Tabs</key>
|
||||
<array>
|
||||
<dict>
|
||||
@ -670,7 +514,7 @@
|
||||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{10, 27}, {976, 85}}</string>
|
||||
<string>{{10, 27}, {976, 64}}</string>
|
||||
</dict>
|
||||
<key>Module</key>
|
||||
<string>XCDetailModule</string>
|
||||
@ -724,7 +568,7 @@
|
||||
<key>GeometryConfiguration</key>
|
||||
<dict>
|
||||
<key>Frame</key>
|
||||
<string>{{10, 27}, {976, 152}}</string>
|
||||
<string>{{10, 27}, {976, 165}}</string>
|
||||
<key>RubberWindowFrame</key>
|
||||
<string>0 91 1280 687 0 0 1280 778 </string>
|
||||
</dict>
|
||||
@ -754,11 +598,11 @@
|
||||
</array>
|
||||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>6B555D17100B125300247EA3</string>
|
||||
<string>6B92CE3F100E01F0003DA304</string>
|
||||
<string>1CA23ED40692098700951B8B</string>
|
||||
<string>6B555D18100B125300247EA3</string>
|
||||
<string>6B92CE40100E01F0003DA304</string>
|
||||
<string>6B8632A30F78115100E2684A</string>
|
||||
<string>6B555D19100B125300247EA3</string>
|
||||
<string>6B92CE41100E01F0003DA304</string>
|
||||
<string>1CA23EDF0692099D00951B8B</string>
|
||||
<string>1CA23EE00692099D00951B8B</string>
|
||||
<string>1CA23EE10692099D00951B8B</string>
|
||||
@ -905,14 +749,14 @@
|
||||
</array>
|
||||
<key>TableOfContents</key>
|
||||
<array>
|
||||
<string>6B555D1A100B125300247EA3</string>
|
||||
<string>6B92CE52100E02D3003DA304</string>
|
||||
<string>1CCC7628064C1048000F2A68</string>
|
||||
<string>1CCC7629064C1048000F2A68</string>
|
||||
<string>6B555D1B100B125300247EA3</string>
|
||||
<string>6B555D1C100B125300247EA3</string>
|
||||
<string>6B555D1D100B125300247EA3</string>
|
||||
<string>6B555D1E100B125300247EA3</string>
|
||||
<string>6B555D1F100B125300247EA3</string>
|
||||
<string>6B92CE53100E02D3003DA304</string>
|
||||
<string>6B92CE54100E02D3003DA304</string>
|
||||
<string>6B92CE55100E02D3003DA304</string>
|
||||
<string>6B92CE56100E02D3003DA304</string>
|
||||
<string>6B92CE57100E02D3003DA304</string>
|
||||
</array>
|
||||
<key>ToolbarConfiguration</key>
|
||||
<string>xcode.toolbar.config.debugV3</string>
|
||||
|
||||
@ -407,6 +407,11 @@
|
||||
HEADER_SEARCH_PATHS = "/Library/Frameworks/SDL.framework/Headers/**";
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
OTHER_CFLAGS = "";
|
||||
OTHER_CPLUSPLUSFLAGS = (
|
||||
"$(OTHER_CFLAGS)",
|
||||
"-Wreorder",
|
||||
);
|
||||
PRODUCT_NAME = Recast;
|
||||
};
|
||||
name = Release;
|
||||
|
||||
@ -13,7 +13,7 @@ protected:
|
||||
|
||||
struct Tile
|
||||
{
|
||||
inline Tile() : chf(0), cset(0), solid(0), buildTime(0) {}
|
||||
inline Tile() : chf(0), solid(0), cset(0), buildTime(0) {}
|
||||
inline ~Tile() { delete chf; delete cset; delete solid; }
|
||||
rcCompactHeightfield* chf;
|
||||
rcHeightfield* solid;
|
||||
|
||||
@ -25,8 +25,8 @@
|
||||
|
||||
rcMeshLoaderObj::rcMeshLoaderObj() :
|
||||
m_verts(0),
|
||||
m_normals(0),
|
||||
m_tris(0),
|
||||
m_normals(0),
|
||||
m_vertCount(0),
|
||||
m_triCount(0)
|
||||
{
|
||||
|
||||
@ -21,6 +21,11 @@
|
||||
Sample_StatMesh::Sample_StatMesh() :
|
||||
m_navMesh(0),
|
||||
m_toolMode(TOOLMODE_PATHFIND),
|
||||
m_startRef(0),
|
||||
m_endRef(0),
|
||||
m_npolys(0),
|
||||
m_nstraightPath(0),
|
||||
m_distanceToWall(0),
|
||||
m_sposSet(false),
|
||||
m_eposSet(false)
|
||||
{
|
||||
|
||||
@ -19,15 +19,15 @@
|
||||
#endif
|
||||
|
||||
Sample_StatMeshTiled::Sample_StatMeshTiled() :
|
||||
m_keepInterResults(false),
|
||||
m_measurePerTileTimings(false),
|
||||
m_keepInterResults(false),
|
||||
m_tileSize(64),
|
||||
m_chunkyMesh(0),
|
||||
m_tileSet(0),
|
||||
m_polyMesh(0),
|
||||
m_drawMode(DRAWMODE_NAVMESH),
|
||||
m_tileSet(0),
|
||||
m_statPolysPerTileSamples(0),
|
||||
m_statTimePerTileSamples(0),
|
||||
m_statPolysPerTileSamples(0)
|
||||
m_drawMode(DRAWMODE_NAVMESH)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@ -36,26 +36,28 @@
|
||||
# define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
|
||||
Sample_TileMesh::Sample_TileMesh() :
|
||||
m_tileSize(32),
|
||||
m_keepInterResults(false),
|
||||
m_navMesh(0),
|
||||
m_chunkyMesh(0),
|
||||
m_keepInterResults(true),
|
||||
m_tileBuildTime(0),
|
||||
m_tileMemUsage(0),
|
||||
m_triflags(0),
|
||||
m_solid(0),
|
||||
m_chf(0),
|
||||
m_cset(0),
|
||||
m_polyMesh(0),
|
||||
m_tileSize(32),
|
||||
m_sposSet(false),
|
||||
m_eposSet(false),
|
||||
m_tileBuildTime(0),
|
||||
m_tileMemUsage(0),
|
||||
m_tileTriCount(0),
|
||||
m_toolMode(TOOLMODE_CREATE_TILES),
|
||||
m_startRef(0),
|
||||
m_endRef(0),
|
||||
m_npolys(0),
|
||||
m_nstraightPath(0),
|
||||
m_sposSet(false),
|
||||
m_eposSet(false)
|
||||
m_distanceToWall(0),
|
||||
m_toolMode(TOOLMODE_CREATE_TILES)
|
||||
{
|
||||
resetCommonSettings();
|
||||
memset(m_tileBmin, 0, sizeof(m_tileBmin));
|
||||
|
||||
@ -128,11 +128,10 @@ static void addGfxCmdText(int x, int y, int align, const char* text, unsigned in
|
||||
struct GuiState
|
||||
{
|
||||
GuiState() :
|
||||
leftPressed(false), leftReleased(false), left(false), mx(-1), my(-1), scroll(0),
|
||||
isHot(false), isActive(false), wentActive(false),
|
||||
dragX(0), dragY(0), dragOrig(0),
|
||||
widgetX(0), widgetY(0), widgetW(100),
|
||||
active(0), hot(0), hotToBe(0),
|
||||
left(false), leftPressed(false), leftReleased(false),
|
||||
mx(-1), my(-1), scroll(0),
|
||||
active(0), hot(0), hotToBe(0), isHot(false), isActive(false), wentActive(false),
|
||||
dragX(0), dragY(0), dragOrig(0), widgetX(0), widgetY(0), widgetW(100),
|
||||
areaId(0), widgetId(0)
|
||||
{
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user