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

More work making volumes use a base class.

Browse Source
This commit is contained in:
David Williams
2011-07-26 21:36:17 +01:00
parent 80832f49c0
commit 8dc1951a06
9 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
View File

@@ -40,8 +40,6 @@ namespace PolyVox
#ifndef SWIG
class Block
{
//Make Sampler a friend
friend class SimpleVolume<VoxelType>::Sampler;
public:
Block(uint16_t uSideLength = 0);
@@ -62,7 +60,7 @@ namespace PolyVox
uint8_t m_uSideLengthPower;
};
class Sampler : public Volume<VoxelType>::Sampler
class Sampler : public Volume<VoxelType>::Sampler< SimpleVolume<VoxelType> >
{
public:
Sampler(SimpleVolume<VoxelType>* volume);
@@ -74,7 +72,6 @@ namespace PolyVox
int32_t getPosY(void) const;
int32_t getPosZ(void) const;
VoxelType getSubSampledVoxel(uint8_t uLevel) const;
const SimpleVolume<VoxelType>* getVolume(void) const;
inline VoxelType getVoxel(void) const;
void setPosition(const Vector3DInt32& v3dNewPos);