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

Removed dependency on OgreSharedPtr from the library.

Browse Source
This commit is contained in:
David Williams
2008-02-07 20:51:44 +00:00
parent 91c2c7241c
commit 8fbcd99ef8
6 changed files with 806 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Block.h
View File

@ -41,12 +41,12 @@ namespace Ogre
Block& operator=(const Block& rhs);
bool isHomogeneous(void);
//bool isHomogeneous(void);
uchar getVoxelAt(const uint xPosition, const uint yPosition, const uint zPosition) const;
void setVoxelAt(const uint xPosition, const uint yPosition, const uint zPosition, const uchar value);
void fillWithValue(const uchar value);
//void fillWithValue(const uchar value);
private:
uchar mData[OGRE_NO_OF_VOXELS_IN_BLOCK];

6
include/Volume.h
View File

@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __Volume_H__
#include "OgrePrerequisites.h"
#include "OgreSharedPtr.h"
#include "Block.h"
#include "Constants.h"
@ -42,7 +41,7 @@ namespace Ogre
Volume& operator=(const Volume& rhs);
SharedPtr<Block> getBlock(uint index);
Block* getBlock(uint index);
bool containsPoint(Vector3 pos, float boundary);
bool containsPoint(IntVector3 pos, uint boundary);
@ -54,8 +53,7 @@ namespace Ogre
void tidy(void);
private:
static SharedPtr<Block> mHomogeneousBlocks[256];
SharedPtr<Block> mBlocks[OGRE_NO_OF_BLOCKS_IN_VOLUME];
Block* mBlocks[OGRE_NO_OF_BLOCKS_IN_VOLUME];
};
}

2
include/VolumeIterator.h
View File

@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __VolumeIterator_H__
#include "OgrePrerequisites.h"
#include "OgreSharedPtr.h"
#include "TypeDef.h"
@ -108,7 +107,6 @@ namespace Ogre
//Other current position information
uchar* mCurrentVoxel;
//SharedPtr<Block> mCurrentBlock;
ulong mBlockIndexInVolume;
ulong mVoxelIndexInBlock;