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

Moved VolumeSampler into Volume class.

Browse Source
This commit is contained in:
David Williams
2011-04-28 20:30:16 +01:00
parent 7d76a1bb69
commit 6f1ddb7d5f
23 changed files with 164 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/PolyVoxCore/include/SurfaceExtractor.h
View File

@ -25,7 +25,7 @@ freely, subject to the following restrictions:
#define __PolyVox_SurfaceExtractor_H__
#include "PolyVoxForwardDeclarations.h"
#include "VolumeSampler.h"
#include "Volume.h"
#include "PolyVoxImpl/TypeDef.h"
@ -54,8 +54,8 @@ namespace PolyVox
Array2DInt32& m_pCurrentVertexIndicesY,
Array2DInt32& m_pCurrentVertexIndicesZ);
Vector3DFloat computeCentralDifferenceGradient(const VolumeSampler<VoxelType>& volIter);
Vector3DFloat computeSobelGradient(const VolumeSampler<VoxelType>& volIter);
Vector3DFloat computeCentralDifferenceGradient(const typename Volume<VoxelType>::VolumeSampler& volIter);
Vector3DFloat computeSobelGradient(const typename Volume<VoxelType>::VolumeSampler& volIter);
//Use the cell bitmasks to generate all the indices needed for that slice
void generateIndicesForSlice(const Array2DUint8& pPreviousBitmask,
@ -68,7 +68,7 @@ namespace PolyVox
//The volume data and a sampler to access it.
Volume<VoxelType>* m_volData;
VolumeSampler<VoxelType> m_sampVolume;
typename Volume<VoxelType>::VolumeSampler m_sampVolume;
//Holds a position in volume space.
int32_t iXVolSpace;