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

Moved various files from PolyVoxCore to PolyVoxImpl.

Browse Source
This commit is contained in:
David Williams 2009-04-02 20:37:43 +00:00
parent bd1d2b2244
commit 92cf2402e2
7 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/CMakeLists.txt
View File

@ -15,7 +15,6 @@ SET(CORE_SRC_FILES
#Projects headers files #Projects headers files
SET(CORE_INC_FILES SET(CORE_INC_FILES
include/PolyVoxCore/Enums.h
include/PolyVoxCore/GradientEstimators.h include/PolyVoxCore/GradientEstimators.h
include/PolyVoxCore/GradientEstimators.inl include/PolyVoxCore/GradientEstimators.inl
include/PolyVoxCore/IndexedSurfacePatch.h include/PolyVoxCore/IndexedSurfacePatch.h
@ -42,6 +41,8 @@ SET(IMPL_SRC_FILES
) )
SET(IMPL_INC_FILES SET(IMPL_INC_FILES
include/PolyVoxCore/PolyVoxImpl/Block.h
include/PolyVoxCore/PolyVoxImpl/Block.inl
include/PolyVoxCore/PolyVoxImpl/BlockData.h include/PolyVoxCore/PolyVoxImpl/BlockData.h
include/PolyVoxCore/PolyVoxImpl/BlockData.inl include/PolyVoxCore/PolyVoxImpl/BlockData.inl
include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h

9
library/include/PolyVoxCore/GradientEstimators.h
View File

@ -28,6 +28,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace PolyVox namespace PolyVox
{ {
enum NormalGenerationMethod
{
SIMPLE, ///<Fastest
CENTRAL_DIFFERENCE,
SOBEL,
CENTRAL_DIFFERENCE_SMOOTHED,
SOBEL_SMOOTHED ///<Smoothest
};
template <typename VoxelType> template <typename VoxelType>
Vector3DFloat computeCentralDifferenceGradient(const VolumeIterator<VoxelType>& volIter); Vector3DFloat computeCentralDifferenceGradient(const VolumeIterator<VoxelType>& volIter);

1
library/include/PolyVoxCore/PolyVoxForwardDeclarations.h
View File

@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef __PolyVox_ForwardDeclarations_H__ #ifndef __PolyVox_ForwardDeclarations_H__
#define __PolyVox_ForwardDeclarations_H__ #define __PolyVox_ForwardDeclarations_H__
#include "Enums.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h" #include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
namespace PolyVox namespace PolyVox

25
library/include/PolyVoxCore/Enums.h → library/include/PolyVoxCore/PolyVoxImpl/Block.h
View File

@ -19,19 +19,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
******************************************************************************/ ******************************************************************************/
#pragma endregion #pragma endregion
#ifndef __PolyVox_Enums_H__ #ifndef __PolyVox_Block_H__
#define __PolyVox_Enums_H__ #define __PolyVox_Block_H__
#pragma region Headers
#include "PolyVoxForwardDeclarations.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#pragma endregion
namespace PolyVox namespace PolyVox
{ {
enum NormalGenerationMethod template <typename VoxelType>
class Block
{ {
SIMPLE, ///<Fastest public:
CENTRAL_DIFFERENCE, POLYVOX_SHARED_PTR< BlockData<VoxelType> > m_pBlockData;
SOBEL, VoxelType m_pHomogenousValue;
CENTRAL_DIFFERENCE_SMOOTHED, bool m_bIsShared;
SOBEL_SMOOTHED ///<Smoothest bool m_bIsPotentiallySharable;
}; };
} }
#include "Block.inl"
#endif #endif

0
library/include/PolyVoxCore/PolyVoxImpl/Block.inl Normal file
View File

13
library/include/PolyVoxCore/Volume.h
View File

@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVox_Volume_H__ #define __PolyVox_Volume_H__
#pragma region Headers #pragma region Headers
#include "PolyVoxCore/PolyVoxImpl/Block.h"
#include "PolyVoxForwardDeclarations.h" #include "PolyVoxForwardDeclarations.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h" #include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
@ -32,16 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace PolyVox namespace PolyVox
{ {
template <typename VoxelType>
class Block
{
public:
POLYVOX_SHARED_PTR< BlockData<VoxelType> > m_pBlockData;
VoxelType m_pHomogenousValue;
bool m_bIsShared;
bool m_bIsPotentiallySharable;
};
template <typename VoxelType> template <typename VoxelType>
class Volume class Volume
{ {
@ -63,10 +54,8 @@ namespace PolyVox
void setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue); void setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue);
void setVoxelAt(const Vector3DUint16& v3dPos, VoxelType tValue); void setVoxelAt(const Vector3DUint16& v3dPos, VoxelType tValue);
VolumeIterator<VoxelType> firstVoxel(void);
void idle(uint32_t uAmount); void idle(uint32_t uAmount);
bool isRegionHomogenous(const Region& region); bool isRegionHomogenous(const Region& region);
VolumeIterator<VoxelType> lastVoxel(void);
private: private:
POLYVOX_SHARED_PTR< BlockData<VoxelType> > getHomogenousBlockData(VoxelType tHomogenousValue) const; POLYVOX_SHARED_PTR< BlockData<VoxelType> > getHomogenousBlockData(VoxelType tHomogenousValue) const;

16
library/include/PolyVoxCore/Volume.inl
View File

@ -221,14 +221,6 @@ namespace PolyVox
#pragma endregion #pragma endregion
#pragma region Other #pragma region Other
template <typename VoxelType>
VolumeIterator<VoxelType> Volume<VoxelType>::firstVoxel(void)
{
VolumeIterator<VoxelType> iter(*this);
iter.setPosition(0,0,0);
return iter;
}
template <typename VoxelType> template <typename VoxelType>
void Volume<VoxelType>::idle(uint32_t uAmount) void Volume<VoxelType>::idle(uint32_t uAmount)
{ {
@ -283,14 +275,6 @@ namespace PolyVox
return true; return true;
} }
template <typename VoxelType>
VolumeIterator<VoxelType> Volume<VoxelType>::lastVoxel(void)
{
VolumeIterator<VoxelType> iter(*this);
iter.setPosition(m_uSideLength-1,m_uSideLength-1,m_uSideLength-1);
return iter;
}
#pragma endregion #pragma endregion
#pragma region Private Implementation #pragma region Private Implementation