Renamed VolumeSampler to Sampler
This commit is contained in:
		| @@ -41,7 +41,7 @@ namespace PolyVox | ||||
| 			const Vector3DFloat& v3dPos = iterSurfaceVertex->getPosition() + static_cast<Vector3DFloat>(mesh.m_Region.getLowerCorner()); | ||||
| 			const Vector3DInt32 v3dFloor = static_cast<Vector3DInt32>(v3dPos); | ||||
|  | ||||
| 			Volume<uint8_t>::VolumeSampler volIter(volumeData); | ||||
| 			Volume<uint8_t>::Sampler volIter(volumeData); | ||||
|  | ||||
| 			//Check all corners are within the volume, allowing a boundary for gradient estimation | ||||
| 			bool lowerCornerInside = volumeData->getEnclosingRegion().containsPoint(v3dFloor,2); | ||||
| @@ -67,7 +67,7 @@ namespace PolyVox | ||||
| 	{ | ||||
| 		Vector3DFloat v3dGradient; //To store the result | ||||
|  | ||||
| 		Volume<uint8_t>::VolumeSampler volIter(volumeData); | ||||
| 		Volume<uint8_t>::Sampler volIter(volumeData); | ||||
|  | ||||
| 			const Vector3DInt32 v3dFloor = static_cast<Vector3DInt32>(v3dPos); | ||||
|  | ||||
|   | ||||
| @@ -25,7 +25,7 @@ freely, subject to the following restrictions: | ||||
|  | ||||
| namespace PolyVox | ||||
| { | ||||
| 	float computeSmoothedVoxel(Volume<uint8_t>::VolumeSampler& volIter) | ||||
| 	float computeSmoothedVoxel(Volume<uint8_t>::Sampler& volIter) | ||||
| 	{ | ||||
| 		assert(volIter.getPosX() >= 1); | ||||
| 		assert(volIter.getPosY() >= 1); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user