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

Fix for Issue 109.

Browse Source
This commit is contained in:
Mikko Mononen 2010-08-23 17:44:27 +00:00
parent 47ba806fef
commit a16f0e3e5e
7 changed files with 504 additions and 2634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DebugUtils/Source/RecastDump.cpp
View File

@ -399,7 +399,7 @@ bool duReadCompactHeightfield(struct rcCompactHeightfield& chf, duFileIO* io)
}
static void logLine(rcBuildContext* ctx, rcBuilTimeLabel label, const char* name, const float pc)
static void logLine(rcBuildContext* ctx, rcBuildTimeLabel label, const char* name, const float pc)
{
const int t = ctx->getBuildTime(label);
if (t < 0) return;

6
Recast/Include/Recast.h
View File

@ -33,7 +33,7 @@ enum rcLogCategory
RC_LOG_ERROR,
};
enum rcBuilTimeLabel
enum rcBuildTimeLabel
{
RC_TIME_RASTERIZE_TRIANGLES,
RC_TIME_BUILD_COMPACTHEIGHFIELD,
@ -79,9 +79,9 @@ struct rcBuildContext
// Resets build time collecting.
virtual void resetBuildTimes() {}
// Reports build time of specified label for accumulation.
virtual void reportBuildTime(const rcBuilTimeLabel /*label*/, const int /*time*/) {}
virtual void reportBuildTime(const rcBuildTimeLabel /*label*/, const int /*time*/) {}
// Returns accumulated build time for specified label, or -1 if no time was reported.
virtual int getBuildTime(const rcBuilTimeLabel /*label*/) { return -1; }
virtual int getBuildTime(const rcBuildTimeLabel /*label*/) { return -1; }
};

BIN
RecastDemo/Bin/Recast.app/Contents/MacOS/Recast
View File

Binary file not shown.

3016
RecastDemo/Build/Xcode/Recast.xcodeproj/memon.pbxuser
View File

File diff suppressed because it is too large Load Diff

106
RecastDemo/Build/Xcode/Recast.xcodeproj/memon.perspectivev3
View File

@ -283,13 +283,14 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>59</integer>
<integer>46</integer>
<integer>38</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 646}, {264, 660}}</string>
<string>{{0, 562}, {264, 660}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@ -324,7 +325,7 @@
<key>PBXProjectModuleGUID</key>
<string>6B8632A30F78115100E2684A</string>
<key>PBXProjectModuleLabel</key>
<string>CrowdTool.cpp</string>
<string>Sample_TileMesh.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@ -332,11 +333,11 @@
<key>PBXProjectModuleGUID</key>
<string>6B8632A40F78115100E2684A</string>
<key>PBXProjectModuleLabel</key>
<string>CrowdTool.cpp</string>
<string>Sample_TileMesh.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>6B1C8E6F1221BC910048697F</string>
<string>6BA687631222EAE200730711</string>
<key>history</key>
<array>
<string>6BBB4AA5115B4F3400CF791D</string>
@ -359,7 +360,6 @@
<string>6BAF404F12140B4E008CFCDF</string>
<string>6BAF405112140B4E008CFCDF</string>
<string>6BAF40F412197F3D008CFCDF</string>
<string>6BAF4269121AD99B008CFCDF</string>
<string>6BAF427E121ADD46008CFCDF</string>
<string>6BAF4280121ADD46008CFCDF</string>
<string>6BAF4321121AF998008CFCDF</string>
@ -386,7 +386,6 @@
<string>6BAF4604121D7388008CFCDF</string>
<string>6BAF4605121D7388008CFCDF</string>
<string>6BAF4637121D74D3008CFCDF</string>
<string>6BAF46A1121D8B41008CFCDF</string>
<string>6BAF46A2121D8B41008CFCDF</string>
<string>6BAF46D3121D8FF1008CFCDF</string>
<string>6BAF4739121D9FBE008CFCDF</string>
@ -395,25 +394,27 @@
<string>6BAF475A121DA31D008CFCDF</string>
<string>6BAF475B121DA31D008CFCDF</string>
<string>6BAF475C121DA31D008CFCDF</string>
<string>6BAF4778121DCAF9008CFCDF</string>
<string>6B1C8D82121E80950048697F</string>
<string>6B1C8DA2121E813D0048697F</string>
<string>6B1C8DA3121E813D0048697F</string>
<string>6B1C8DB3121E8D970048697F</string>
<string>6B1C8DBF121E8F610048697F</string>
<string>6B1C8DC0121E8F610048697F</string>
<string>6B1C8DC5121E902F0048697F</string>
<string>6B1C8DD8121EA3470048697F</string>
<string>6B1C8E08121EB4FF0048697F</string>
<string>6B1C8E09121EB4FF0048697F</string>
<string>6B1C8E0A121EB4FF0048697F</string>
<string>6B1C8E0C121EB4FF0048697F</string>
<string>6B1C8E24121EB6D30048697F</string>
<string>6B1C8E27121EB6D30048697F</string>
<string>6B1C8E30121EB9310048697F</string>
<string>6B1C8E691221BC910048697F</string>
<string>6B1C8E6A1221BC910048697F</string>
<string>6B1C8E6B1221BC910048697F</string>
<string>6BA687441222EADA00730711</string>
<string>6BA687451222EADA00730711</string>
<string>6BA687461222EADA00730711</string>
<string>6BA687471222EADA00730711</string>
<string>6BA687481222EADA00730711</string>
<string>6BA687491222EADA00730711</string>
<string>6BA6874A1222EADA00730711</string>
<string>6BA6874B1222EADA00730711</string>
<string>6BA6874C1222EADA00730711</string>
<string>6BA6874D1222EADA00730711</string>
<string>6BA687611222EADB00730711</string>
</array>
<key>prevStack</key>
<array>
@ -463,7 +464,6 @@
<string>6BAF41801219811E008CFCDF</string>
<string>6BAF41DA121A5D13008CFCDF</string>
<string>6BAF4243121AD679008CFCDF</string>
<string>6BAF4255121AD7D7008CFCDF</string>
<string>6BAF4289121ADD46008CFCDF</string>
<string>6BAF4396121C1F3D008CFCDF</string>
<string>6BAF43A1121C1F3D008CFCDF</string>
@ -483,37 +483,29 @@
<string>6BAF4762121DA31D008CFCDF</string>
<string>6BAF4767121DA31D008CFCDF</string>
<string>6BAF4768121DA31D008CFCDF</string>
<string>6B1C8D85121E80950048697F</string>
<string>6B1C8D87121E80950048697F</string>
<string>6B1C8D89121E80950048697F</string>
<string>6B1C8D8B121E80950048697F</string>
<string>6B1C8D8D121E80950048697F</string>
<string>6B1C8D8F121E80950048697F</string>
<string>6B1C8D91121E80950048697F</string>
<string>6B1C8D93121E80950048697F</string>
<string>6B1C8D95121E80950048697F</string>
<string>6B1C8D96121E80950048697F</string>
<string>6B1C8DA5121E813D0048697F</string>
<string>6B1C8DA6121E813D0048697F</string>
<string>6B1C8DAE121E821F0048697F</string>
<string>6B1C8DB6121E8D970048697F</string>
<string>6B1C8DB7121E8D970048697F</string>
<string>6B1C8DDB121EA3470048697F</string>
<string>6B1C8E11121EB4FF0048697F</string>
<string>6B1C8E12121EB4FF0048697F</string>
<string>6B1C8E13121EB4FF0048697F</string>
<string>6B1C8E14121EB4FF0048697F</string>
<string>6B1C8E1B121EB4FF0048697F</string>
<string>6B1C8E2A121EB6D30048697F</string>
<string>6B1C8E2B121EB6D30048697F</string>
<string>6B1C8E2D121EB6D30048697F</string>
<string>6B1C8E2E121EB6D30048697F</string>
<string>6B1C8E58121EBEBF0048697F</string>
<string>6B1C8E59121EBEBF0048697F</string>
<string>6B1C8E661221BC080048697F</string>
<string>6B1C8E6C1221BC910048697F</string>
<string>6B1C8E6D1221BC910048697F</string>
<string>6B1C8E6E1221BC910048697F</string>
<string>6BA6874E1222EADA00730711</string>
<string>6BA6874F1222EADA00730711</string>
<string>6BA687501222EADA00730711</string>
<string>6BA687511222EADA00730711</string>
<string>6BA687521222EADA00730711</string>
<string>6BA687531222EADA00730711</string>
<string>6BA687541222EADA00730711</string>
<string>6BA687551222EADA00730711</string>
<string>6BA687561222EADA00730711</string>
<string>6BA687571222EADA00730711</string>
<string>6BA687581222EADA00730711</string>
<string>6BA687591222EADA00730711</string>
<string>6BA6875A1222EADA00730711</string>
<string>6BA6875B1222EADA00730711</string>
<string>6BA6875C1222EADA00730711</string>
<string>6BA6875D1222EADA00730711</string>
<string>6BA6875E1222EADA00730711</string>
<string>6BA6875F1222EADA00730711</string>
</array>
</dict>
<key>SplitCount</key>
@ -527,18 +519,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {994, 505}}</string>
<string>{{0, 0}, {994, 342}}</string>
<key>RubberWindowFrame</key>
<string>0 59 1280 719 0 0 1280 778 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>505pt</string>
<string>342pt</string>
</dict>
<dict>
<key>Proportion</key>
<string>168pt</string>
<string>331pt</string>
<key>Tabs</key>
<array>
<dict>
@ -552,7 +544,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {994, 66}}</string>
<string>{{10, 27}, {994, 304}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@ -568,7 +560,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {994, 123}}</string>
<string>{{10, 27}, {994, 304}}</string>
</dict>
<key>Module</key>
<string>PBXProjectFindModule</string>
@ -606,7 +598,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {994, 141}}</string>
<string>{{10, 27}, {994, 304}}</string>
<key>RubberWindowFrame</key>
<string>0 59 1280 719 0 0 1280 778 </string>
</dict>
@ -636,11 +628,11 @@
</array>
<key>TableOfContents</key>
<array>
<string>6B1C8D9A121E809F0048697F</string>
<string>6BA687641222EAE200730711</string>
<string>1CA23ED40692098700951B8B</string>
<string>6B1C8D9B121E809F0048697F</string>
<string>6BA687651222EAE200730711</string>
<string>6B8632A30F78115100E2684A</string>
<string>6B1C8D9C121E809F0048697F</string>
<string>6BA687661222EAE200730711</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@ -789,13 +781,13 @@
</array>
<key>TableOfContents</key>
<array>
<string>6B1C8D9D121E809F0048697F</string>
<string>6BA687671222EAE200730711</string>
<string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string>
<string>6B1C8D9E121E809F0048697F</string>
<string>6B1C8D9F121E809F0048697F</string>
<string>6B1C8DA0121E809F0048697F</string>
<string>6B1C8DA1121E809F0048697F</string>
<string>6BA687681222EAE200730711</string>
<string>6BA687691222EAE200730711</string>
<string>6BA6876A1222EAE200730711</string>
<string>6BA6876B1222EAE200730711</string>
<string>6B8632A30F78115100E2684A</string>
</array>
<key>ToolbarConfigUserDefaultsMinorVersion</key>

4
RecastDemo/Include/SampleInterfaces.h
View File

@ -60,9 +60,9 @@ public:
// Resets build time collecting.
virtual void resetBuildTimes();
// Reports build time of specified label for accumulation.
virtual void reportBuildTime(const rcBuilTimeLabel label, const int time);
virtual void reportBuildTime(const rcBuildTimeLabel label, const int time);
// Returns accumulated build time for specified label, or -1 if no time was reported.
virtual int getBuildTime(const rcBuilTimeLabel label);
virtual int getBuildTime(const rcBuildTimeLabel label);
};

4
RecastDemo/Source/SampleInterfaces.cpp
View File

@ -157,7 +157,7 @@ void BuildContext::resetBuildTimes()
m_buildTime[i] = -1;
}
void BuildContext::reportBuildTime(const rcBuilTimeLabel label, const int time)
void BuildContext::reportBuildTime(const rcBuildTimeLabel label, const int time)
{
const int idx = (int)label;
// The build times are initialized to negative to indicate no samples collected.
@ -167,7 +167,7 @@ void BuildContext::reportBuildTime(const rcBuilTimeLabel label, const int time)
m_buildTime[idx] += time;
}
int BuildContext::getBuildTime(const rcBuilTimeLabel label)
int BuildContext::getBuildTime(const rcBuildTimeLabel label)
{
return m_buildTime[label];
}