Applied default Visual Studio formatting to most files. This is a quick fix for the tabs vs spaces issue that messes up the formatting in any editor (esp. Linux) which handles tabs/spaces differently to Visual Studio. Some parts of the formatting look a bit worse but overall it should be better (or at least more consistent).
I didn't apply the changes to a few macro-heavy files as Visual Studio removes all indentation from macros, whereas the indentation can be handy to see nesting.
This commit is contained in:
@ -97,7 +97,7 @@ namespace PolyVox
|
||||
{
|
||||
public:
|
||||
AStarPathfinderParams
|
||||
(
|
||||
(
|
||||
VolumeType* volData,
|
||||
const Vector3DInt32& v3dStart,
|
||||
const Vector3DInt32& v3dEnd,
|
||||
@ -105,18 +105,18 @@ namespace PolyVox
|
||||
float fHBias = 1.0,
|
||||
uint32_t uMaxNoOfNodes = 10000,
|
||||
Connectivity requiredConnectivity = TwentySixConnected,
|
||||
std::function<bool (const VolumeType*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
|
||||
std::function<void (float)> funcProgressCallback = nullptr
|
||||
)
|
||||
std::function<bool(const VolumeType*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
|
||||
std::function<void(float)> funcProgressCallback = nullptr
|
||||
)
|
||||
:volume(volData)
|
||||
,start(v3dStart)
|
||||
,end(v3dEnd)
|
||||
,result(listResult)
|
||||
,connectivity(requiredConnectivity)
|
||||
,hBias(fHBias)
|
||||
,maxNumberOfNodes(uMaxNoOfNodes)
|
||||
,isVoxelValidForPath(funcIsVoxelValidForPath)
|
||||
,progressCallback(funcProgressCallback)
|
||||
, start(v3dStart)
|
||||
, end(v3dEnd)
|
||||
, result(listResult)
|
||||
, connectivity(requiredConnectivity)
|
||||
, hBias(fHBias)
|
||||
, maxNumberOfNodes(uMaxNoOfNodes)
|
||||
, isVoxelValidForPath(funcIsVoxelValidForPath)
|
||||
, progressCallback(funcProgressCallback)
|
||||
{
|
||||
}
|
||||
|
||||
@ -125,7 +125,7 @@ namespace PolyVox
|
||||
|
||||
/// The start point for the pathfinding algorithm.
|
||||
Vector3DInt32 start;
|
||||
|
||||
|
||||
/// The end point for the pathfinding algorithm.
|
||||
Vector3DInt32 end;
|
||||
|
||||
@ -160,14 +160,14 @@ namespace PolyVox
|
||||
/// you could check to ensure that the voxel above is empty and the voxel below is solid.
|
||||
///
|
||||
/// \sa aStarDefaultVoxelValidator
|
||||
std::function<bool (const VolumeType*, const Vector3DInt32&)> isVoxelValidForPath;
|
||||
std::function<bool(const VolumeType*, const Vector3DInt32&)> isVoxelValidForPath;
|
||||
|
||||
/// This function is called by the AStarPathfinder to report on its progress in getting to
|
||||
/// the goal. The progress is reported by computing the distance from the closest node found
|
||||
/// so far to the end node, and comparing this with the distance from the start node to the
|
||||
/// end node. This progress value is guarenteed to never decrease, but it may stop increasing
|
||||
///for short periods of time. It may even stop increasing altogether if a path cannot be found.
|
||||
std::function<void (float)> progressCallback;
|
||||
std::function<void(float)> progressCallback;
|
||||
};
|
||||
|
||||
/// The AStarPathfinder compute a path from one point in the volume to another.
|
||||
@ -218,7 +218,7 @@ namespace PolyVox
|
||||
|
||||
//The current node
|
||||
AllNodesContainer::iterator current;
|
||||
|
||||
|
||||
float m_fProgress;
|
||||
|
||||
AStarPathfinderParams<VolumeType> m_params;
|
||||
|
Reference in New Issue
Block a user