Tidying up...
This commit is contained in:
		| @@ -43,10 +43,10 @@ namespace PolyVox | ||||
| 		bool operator<=(const BlockVolumeIterator& rhs); | ||||
| 		bool operator>=(const BlockVolumeIterator& rhs); | ||||
|  | ||||
| 		VoxelType getMaxedVoxel(boost::uint8_t uLevel) const; | ||||
| 		boost::uint16_t getPosX(void) const; | ||||
| 		boost::uint16_t getPosY(void) const; | ||||
| 		boost::uint16_t getPosZ(void) const; | ||||
| 		VoxelType getSubSampledVoxel(boost::uint8_t uLevel) const; | ||||
| 		const BlockVolume<VoxelType>& getVolume(void) const; | ||||
| 		VoxelType getVoxel(void) const;			 | ||||
|  | ||||
|   | ||||
| @@ -105,7 +105,25 @@ namespace PolyVox | ||||
|  | ||||
| 	#pragma region Getters | ||||
| 	template <typename VoxelType> | ||||
| 	VoxelType BlockVolumeIterator<VoxelType>::getMaxedVoxel(boost::uint8_t uLevel) const | ||||
| 	boost::uint16_t BlockVolumeIterator<VoxelType>::getPosX(void) const | ||||
| 	{ | ||||
| 		return mXPosInVolume; | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	boost::uint16_t BlockVolumeIterator<VoxelType>::getPosY(void) const | ||||
| 	{ | ||||
| 		return mYPosInVolume; | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	boost::uint16_t BlockVolumeIterator<VoxelType>::getPosZ(void) const | ||||
| 	{ | ||||
| 		return mZPosInVolume; | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	VoxelType BlockVolumeIterator<VoxelType>::getSubSampledVoxel(boost::uint8_t uLevel) const | ||||
| 	{		 | ||||
| 		if(uLevel == 0) | ||||
| 		{ | ||||
| @@ -142,24 +160,6 @@ namespace PolyVox | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	boost::uint16_t BlockVolumeIterator<VoxelType>::getPosX(void) const | ||||
| 	{ | ||||
| 		return mXPosInVolume; | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	boost::uint16_t BlockVolumeIterator<VoxelType>::getPosY(void) const | ||||
| 	{ | ||||
| 		return mYPosInVolume; | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	boost::uint16_t BlockVolumeIterator<VoxelType>::getPosZ(void) const | ||||
| 	{ | ||||
| 		return mZPosInVolume; | ||||
| 	} | ||||
|  | ||||
| 	template <typename VoxelType> | ||||
| 	const BlockVolume<VoxelType>& BlockVolumeIterator<VoxelType>::getVolume(void) const | ||||
| 	{ | ||||
|   | ||||
| @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. | ||||
| ******************************************************************************/ | ||||
| #pragma endregion | ||||
|  | ||||
| #include "SurfaceAdjusters.h" | ||||
| #include "VoxelFilters.h" | ||||
|  | ||||
| namespace PolyVox | ||||
| { | ||||
|   | ||||
| @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. | ||||
| namespace PolyVox | ||||
| { | ||||
| 	POLYVOX_API void smoothRegionGeometry(BlockVolume<boost::uint8_t>* volumeData, RegionGeometry& regGeom); | ||||
| 	float computeSmoothedVoxel(BlockVolumeIterator<boost::uint8_t>& volIter); | ||||
| } | ||||
|  | ||||
| #endif | ||||
							
								
								
									
										36
									
								
								PolyVoxCore/include/VoxelFilters.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								PolyVoxCore/include/VoxelFilters.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | ||||
| #pragma region License | ||||
| /****************************************************************************** | ||||
| This file is part of the PolyVox library | ||||
| Copyright (C) 2006  David Williams | ||||
|  | ||||
| This program is free software; you can redistribute it and/or | ||||
| modify it under the terms of the GNU General Public License | ||||
| as published by the Free Software Foundation; either version 2 | ||||
| of the License, or (at your option) any later version. | ||||
|  | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| GNU General Public License for more details. | ||||
|  | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program; if not, write to the Free Software | ||||
| Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. | ||||
| ******************************************************************************/ | ||||
| #pragma endregion | ||||
|  | ||||
| #ifndef __PolyVox_VoxelFilters_H__ | ||||
| #define __PolyVox_VoxelFilters_H__ | ||||
|  | ||||
| #pragma region Headers | ||||
| #include "Constants.h" | ||||
| #include "PolyVoxForwardDeclarations.h" | ||||
| #include "TypeDef.h" | ||||
| #pragma endregion | ||||
|  | ||||
| namespace PolyVox | ||||
| { | ||||
| 	float computeSmoothedVoxel(BlockVolumeIterator<boost::uint8_t>& volIter); | ||||
| } | ||||
|  | ||||
| #endif | ||||
		Reference in New Issue
	
	Block a user