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

Removed the boost::function stuff. It was too heavy, and not that useful without boost::bind (which added more weight). Switched to listener classes - to be reviewed with C++0x.

Browse Source
This commit is contained in:
David Williams
2009-06-21 10:12:56 +00:00
parent a91ff9a10f
commit 1994155d07
1434 changed files with 30 additions and 215946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,11 +30,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
namespace PolyVox
{
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);
class VolumeSerializationProgressListener
{
public:
virtual void onProgressUpdated(float fProgress) = 0;
};
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);
POLYVOXUTIL_API Volume<uint8_t>* loadVolumeRaw(std::istream& stream, VolumeSerializationProgressListener* progressListener = 0);
POLYVOXUTIL_API void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume, VolumeSerializationProgressListener* progressListener = 0);
POLYVOXUTIL_API Volume<uint8_t>* loadVolumeRle(std::istream& stream, VolumeSerializationProgressListener* progressListener = 0);
POLYVOXUTIL_API void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume, VolumeSerializationProgressListener* progressListener = 0);
}
#endif

40
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, POLYVOX_FUNCTION<void (float)> pCallback)
Volume<uint8_t>* loadVolumeRaw(istream& stream, VolumeSerializationProgressListener* progressListener)
{
//Read volume dimensions
uint8_t volumeWidthPower = 0;
@ -31,10 +31,10 @@ namespace PolyVox
for(uint16_t z = 0; z < volumeDepth; ++z)
{
//Update progress once per slice.
if(pCallback)
if(progressListener)
{
float fProgress = static_cast<float>(z) / static_cast<float>(volumeDepth);
pCallback(fProgress);
progressListener->onProgressUpdated(fProgress);
}
for(uint16_t y = 0; y < volumeHeight; ++y)
@ -50,15 +50,15 @@ namespace PolyVox
}
//Finished
if(pCallback)
if(progressListener)
{
pCallback(1.0f);
progressListener->onProgressUpdated(1.0f);
}
return volume;
}
void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume, POLYVOX_FUNCTION<void (float)> pCallback)
void saveVolumeRaw(std::ostream& stream, Volume<uint8_t>& volume, VolumeSerializationProgressListener* progressListener)
{
//Write volume dimensions
uint16_t volumeWidth = volume.getWidth();
@ -78,10 +78,10 @@ namespace PolyVox
for(uint16_t z = 0; z < volumeDepth; ++z)
{
//Update progress once per slice.
if(pCallback)
if(progressListener)
{
float fProgress = static_cast<float>(z) / static_cast<float>(volumeDepth);
pCallback(fProgress);
progressListener->onProgressUpdated(fProgress);
}
for(uint16_t y = 0; y < volumeHeight; ++y)
@ -96,15 +96,15 @@ namespace PolyVox
}
//Finished
if(pCallback)
if(progressListener)
{
pCallback(1.0f);
progressListener->onProgressUpdated(1.0f);
}
}
//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, POLYVOX_FUNCTION<void (float)> pCallback)
Volume<uint8_t>* loadVolumeRle(istream& stream, VolumeSerializationProgressListener* progressListener)
{
//Read volume dimensions
uint8_t volumeWidthPower = 0;
@ -130,10 +130,10 @@ namespace PolyVox
for(uint16_t z = 0; z < volumeDepth; ++z)
{
//Update progress once per slice.
if(pCallback)
if(progressListener)
{
float fProgress = static_cast<float>(z) / static_cast<float>(volumeDepth);
pCallback(fProgress);
progressListener->onProgressUpdated(fProgress);
}
for(uint16_t y = 0; y < volumeHeight; ++y)
@ -158,15 +158,15 @@ namespace PolyVox
}
//Finished
if(pCallback)
if(progressListener)
{
pCallback(1.0f);
progressListener->onProgressUpdated(1.0f);
}
return volume;
}
void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume, POLYVOX_FUNCTION<void (float)> pCallback)
void saveVolumeRle(std::ostream& stream, Volume<uint8_t>& volume, VolumeSerializationProgressListener* progressListener)
{
//Write volume dimensions
uint16_t volumeWidth = volume.getWidth();
@ -189,10 +189,10 @@ namespace PolyVox
for(uint16_t z = 0; z < volumeDepth; ++z)
{
//Update progress once per slice.
if(pCallback)
if(progressListener)
{
float fProgress = static_cast<float>(z) / static_cast<float>(volumeDepth);
pCallback(fProgress);
progressListener->onProgressUpdated(fProgress);
}
for(uint16_t y = 0; y < volumeHeight; ++y)
@ -228,9 +228,9 @@ namespace PolyVox
stream.write(reinterpret_cast<char*>(&runLength), sizeof(runLength));
//Finished
if(pCallback)
if(progressListener)
{
pCallback(1.0f);
progressListener->onProgressUpdated(1.0f);
}
}
}