AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed some variable shadowing warnings.

Browse Source
This commit is contained in:
David Williams 2012-11-01 13:05:43 +01:00
parent 8f4b422ece
commit 38f34faaac
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
View File

@ -70,7 +70,7 @@ namespace PolyVox
std::list<Vector3DInt32>* listResult, std::list<Vector3DInt32>* listResult,
float fHBias = 1.0, float fHBias = 1.0,
uint32_t uMaxNoOfNodes = 10000, uint32_t uMaxNoOfNodes = 10000,
Connectivity connectivity = TwentySixConnected, Connectivity requiredConnectivity = TwentySixConnected,
polyvox_function<bool (const VolumeType*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator, polyvox_function<bool (const VolumeType*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
polyvox_function<void (float)> funcProgressCallback = 0 polyvox_function<void (float)> funcProgressCallback = 0
) )
@ -78,7 +78,7 @@ namespace PolyVox
,start(v3dStart) ,start(v3dStart)
,end(v3dEnd) ,end(v3dEnd)
,result(listResult) ,result(listResult)
,connectivity(connectivity) ,connectivity(requiredConnectivity)
,hBias(fHBias) ,hBias(fHBias)
,maxNumberOfNodes(uMaxNoOfNodes) ,maxNumberOfNodes(uMaxNoOfNodes)
,isVoxelValidForPath(funcIsVoxelValidForPath) ,isVoxelValidForPath(funcIsVoxelValidForPath)

1
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
View File

@ -137,7 +137,6 @@ namespace PolyVox
const int32_t iMaxYVolSpace = m_regSliceCurrent.getUpperCorner().getY(); const int32_t iMaxYVolSpace = m_regSliceCurrent.getUpperCorner().getY();
int32_t iZVolSpace = m_regSliceCurrent.getLowerCorner().getZ(); int32_t iZVolSpace = m_regSliceCurrent.getLowerCorner().getZ();
uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerCorner().getZ();
//Process the lower left corner //Process the lower left corner
int32_t iYVolSpace = m_regSliceCurrent.getLowerCorner().getY(); int32_t iYVolSpace = m_regSliceCurrent.getLowerCorner().getY();

3
library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h
View File

@ -92,8 +92,7 @@ namespace PolyVox
float f(void) const float f(void) const
{ {
float f = gVal + hVal; return gVal + hVal;
return f;
} }
}; };