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

Replaced function pointers with boost::function.

Browse Source
This commit is contained in:
David Williams
2009-06-18 23:04:10 +00:00
parent 5e2b8156c9
commit bf26f9c89a
1434 changed files with 215930 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/PolyVoxUtil/include/Serialization.h
View File

@ -30,11 +30,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace PolyVox
{
POLYVOXUTIL_API Volume<uint8_t>* loadVolumeRaw(std::istream& stream);
POLYVOXUTIL_API void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume);
POLYVOXUTIL_API Volume<uint8_t>* loadVolumeRaw(std::istream& stream, POLYVOX_FUNCTION<void (float)> pCallback = 0);
POLYVOXUTIL_API void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume, POLYVOX_FUNCTION<void (float)> pCallback = 0);
POLYVOXUTIL_API Volume<uint8_t>* loadVolumeRle(std::istream& stream, void (*pCallback)(float) = 0);
POLYVOXUTIL_API void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume);
POLYVOXUTIL_API Volume<uint8_t>* loadVolumeRle(std::istream& stream, POLYVOX_FUNCTION<void (float)> pCallback = 0);
POLYVOXUTIL_API void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume, POLYVOX_FUNCTION<void (float)> pCallback = 0);
}
#endif

8
library/PolyVoxUtil/source/Serialization.cpp
View File

@ -10,7 +10,7 @@ namespace PolyVox
{
//Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller.
//FIXME - think about pointer ownership issues. Or could return volume by value if the copy constructor is shallow
Volume<uint8_t>* loadVolumeRaw(istream& stream)
Volume<uint8_t>* loadVolumeRaw(istream& stream, POLYVOX_FUNCTION<void (float)> pCallback)
{
//Read volume dimensions
uint8_t volumeWidthPower = 0;
@ -45,7 +45,7 @@ namespace PolyVox
return volume;
}
void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume)
void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume, POLYVOX_FUNCTION<void (float)> pCallback)
{
//Write volume dimensions
uint16_t volumeWidth = volume.getWidth();
@ -78,7 +78,7 @@ namespace PolyVox
//Note: we don't do much error handling in here - exceptions will simply be propergated up to the caller.
//FIXME - think about pointer ownership issues. Or could return volume by value if the copy constructor is shallow
Volume<uint8_t>* loadVolumeRle(istream& stream, void (*pCallback)(float))
Volume<uint8_t>* loadVolumeRle(istream& stream, POLYVOX_FUNCTION<void (float)> pCallback)
{
//Read volume dimensions
uint8_t volumeWidthPower = 0;
@ -139,7 +139,7 @@ namespace PolyVox
return volume;
}
void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume)
void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume, POLYVOX_FUNCTION<void (float)> pCallback)
{
//Write volume dimensions
uint16_t volumeWidth = volume.getWidth();