Added multisampling. Moved obstacle avoidance to DetourCrowd.
This commit is contained in:
parent
4a81213b3b
commit
e70a4664c9
Binary file not shown.
@ -38,7 +38,6 @@
|
||||
6B98463311E6144400FA177B /* Sample_SoloMeshTiled.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B98463211E6144400FA177B /* Sample_SoloMeshTiled.cpp */; };
|
||||
6B9846EF11E718F800FA177B /* DetourAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9846EE11E718F800FA177B /* DetourAlloc.cpp */; };
|
||||
6B9847B811E7519A00FA177B /* RecastAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9847B711E7519A00FA177B /* RecastAlloc.cpp */; };
|
||||
6B9EFF0912281C3E00535FF1 /* DetourObstacleAvoidance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */; };
|
||||
6BA1E88B10C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */; };
|
||||
6BAF3C591211663A008CFCDF /* CrowdTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF3C581211663A008CFCDF /* CrowdTool.cpp */; };
|
||||
6BAF40DB12196A3D008CFCDF /* DetourNavMeshQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BAF40DA12196A3D008CFCDF /* DetourNavMeshQuery.cpp */; };
|
||||
@ -48,6 +47,7 @@
|
||||
6BB5013812F458CB001B1957 /* DetourPathCorridor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB5013312F458CB001B1957 /* DetourPathCorridor.cpp */; };
|
||||
6BB5013912F458CB001B1957 /* DetourPathQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB5013412F458CB001B1957 /* DetourPathQueue.cpp */; };
|
||||
6BB5013A12F458CB001B1957 /* DetourProximityGrid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB5013512F458CB001B1957 /* DetourProximityGrid.cpp */; };
|
||||
6BB501E312F46B6A001B1957 /* DetourObstacleAvoidance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB501E212F46B6A001B1957 /* DetourObstacleAvoidance.cpp */; };
|
||||
6BB788170FC0472B003C24DB /* ChunkyTriMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */; };
|
||||
6BB7FC0B10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB7FC0A10EBB6AA006DA0A6 /* NavMeshTesterTool.cpp */; };
|
||||
6BB7FDA510F36F0E006DA0A6 /* InputGeom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6BB7FDA410F36F0E006DA0A6 /* InputGeom.cpp */; };
|
||||
@ -124,8 +124,6 @@
|
||||
6B9846EE11E718F800FA177B /* DetourAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourAlloc.cpp; path = ../../../Detour/Source/DetourAlloc.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6B98470511E733B600FA177B /* RecastAlloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RecastAlloc.h; path = ../../../Recast/Include/RecastAlloc.h; sourceTree = SOURCE_ROOT; };
|
||||
6B9847B711E7519A00FA177B /* RecastAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RecastAlloc.cpp; path = ../../../Recast/Source/RecastAlloc.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6B9EFF02122819E200535FF1 /* DetourObstacleAvoidance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourObstacleAvoidance.h; path = ../../../Detour/Include/DetourObstacleAvoidance.h; sourceTree = SOURCE_ROOT; };
|
||||
6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourObstacleAvoidance.cpp; path = ../../../Detour/Source/DetourObstacleAvoidance.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BA1E88810C7BFC9008007F6 /* Sample_SoloMeshSimple.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Sample_SoloMeshSimple.cpp; path = ../../Source/Sample_SoloMeshSimple.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BA1E88E10C7BFD3008007F6 /* Sample_SoloMeshSimple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Sample_SoloMeshSimple.h; path = ../../Include/Sample_SoloMeshSimple.h; sourceTree = SOURCE_ROOT; };
|
||||
6BAF3C571211663A008CFCDF /* CrowdTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CrowdTool.h; path = ../../Include/CrowdTool.h; sourceTree = SOURCE_ROOT; };
|
||||
@ -146,6 +144,8 @@
|
||||
6BB5013312F458CB001B1957 /* DetourPathCorridor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourPathCorridor.cpp; path = ../../../DetourCrowd/Source/DetourPathCorridor.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BB5013412F458CB001B1957 /* DetourPathQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourPathQueue.cpp; path = ../../../DetourCrowd/Source/DetourPathQueue.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BB5013512F458CB001B1957 /* DetourProximityGrid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourProximityGrid.cpp; path = ../../../DetourCrowd/Source/DetourProximityGrid.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BB501E112F46B6A001B1957 /* DetourObstacleAvoidance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetourObstacleAvoidance.h; path = ../../../DetourCrowd/Include/DetourObstacleAvoidance.h; sourceTree = SOURCE_ROOT; };
|
||||
6BB501E212F46B6A001B1957 /* DetourObstacleAvoidance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DetourObstacleAvoidance.cpp; path = ../../../DetourCrowd/Source/DetourObstacleAvoidance.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BB788160FC0472B003C24DB /* ChunkyTriMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChunkyTriMesh.cpp; path = ../../Source/ChunkyTriMesh.cpp; sourceTree = SOURCE_ROOT; };
|
||||
6BB788180FC04753003C24DB /* ChunkyTriMesh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChunkyTriMesh.h; path = ../../Include/ChunkyTriMesh.h; sourceTree = SOURCE_ROOT; };
|
||||
6BB7FC0910EBB6AA006DA0A6 /* NavMeshTesterTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NavMeshTesterTool.h; path = ../../Include/NavMeshTesterTool.h; sourceTree = SOURCE_ROOT; };
|
||||
@ -351,6 +351,8 @@
|
||||
6BB5012B12F458AE001B1957 /* DetourCrowd */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
6BB501E112F46B6A001B1957 /* DetourObstacleAvoidance.h */,
|
||||
6BB501E212F46B6A001B1957 /* DetourObstacleAvoidance.cpp */,
|
||||
6BB5012C12F458CB001B1957 /* DetourCrowd.h */,
|
||||
6BB5013112F458CB001B1957 /* DetourCrowd.cpp */,
|
||||
6BB5012D12F458CB001B1957 /* DetourLocalBoundary.h */,
|
||||
@ -411,8 +413,6 @@
|
||||
6B1185F41006895B0018F96F /* DetourNode.cpp */,
|
||||
6B1185FC10068B040018F96F /* DetourCommon.h */,
|
||||
6B1185FD10068B150018F96F /* DetourCommon.cpp */,
|
||||
6B9EFF02122819E200535FF1 /* DetourObstacleAvoidance.h */,
|
||||
6B9EFF0812281C3E00535FF1 /* DetourObstacleAvoidance.cpp */,
|
||||
);
|
||||
name = Detour;
|
||||
sourceTree = "<group>";
|
||||
@ -513,7 +513,6 @@
|
||||
6BAF40DB12196A3D008CFCDF /* DetourNavMeshQuery.cpp in Sources */,
|
||||
6BAF4442121C3D26008CFCDF /* SampleInterfaces.cpp in Sources */,
|
||||
6BD402011224279400995864 /* PerfTimer.cpp in Sources */,
|
||||
6B9EFF0912281C3E00535FF1 /* DetourObstacleAvoidance.cpp in Sources */,
|
||||
6B847777122D221D00ADF63D /* ValueHistory.cpp in Sources */,
|
||||
6B5683B812D9E7D3000B9960 /* Sample_TempObstacles.cpp in Sources */,
|
||||
6B8BA92812DAE1DF00EE6EFF /* lzf_c.c in Sources */,
|
||||
@ -523,6 +522,7 @@
|
||||
6BB5013812F458CB001B1957 /* DetourPathCorridor.cpp in Sources */,
|
||||
6BB5013912F458CB001B1957 /* DetourPathQueue.cpp in Sources */,
|
||||
6BB5013A12F458CB001B1957 /* DetourProximityGrid.cpp in Sources */,
|
||||
6BB501E312F46B6A001B1957 /* DetourObstacleAvoidance.cpp in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
@ -79,6 +79,8 @@ int main(int /*argc*/, char** /*argv*/)
|
||||
SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
|
||||
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
|
||||
SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
|
||||
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1);
|
||||
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 8);
|
||||
|
||||
const SDL_VideoInfo* vi = SDL_GetVideoInfo();
|
||||
|
||||
@ -169,8 +171,8 @@ int main(int /*argc*/, char** /*argv*/)
|
||||
|
||||
glDepthFunc(GL_LEQUAL);
|
||||
|
||||
glEnable(GL_POINT_SMOOTH);
|
||||
glEnable(GL_LINE_SMOOTH);
|
||||
// glEnable(GL_POINT_SMOOTH);
|
||||
// glEnable(GL_LINE_SMOOTH);
|
||||
|
||||
bool done = false;
|
||||
while(!done)
|
||||
|
Loading…
x
Reference in New Issue
Block a user