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

Added meaningful raycast return values and improved tests.

Browse Source
This commit is contained in:
David Williams
2012-10-02 16:52:43 +02:00
parent 23184e6924
commit 7af38d83a3
3 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/PolyVoxCore/include/PolyVoxCore/Raycast.h
View File

@ -121,8 +121,18 @@ namespace PolyVox
float m_fMaxDistance;
};
namespace MyRaycastResults
{
enum MyRaycastResult
{
Completed,
Interupted
};
}
typedef MyRaycastResults::MyRaycastResult MyRaycastResult;
template<typename VolumeType, typename Callback>
void raycast(VolumeType* volData, /*const*/ Vector3DFloat/*&*/ v3dStart, const Vector3DFloat& v3dDirectionAndLength, Callback& callback)
MyRaycastResult raycast(VolumeType* volData, /*const*/ Vector3DFloat/*&*/ v3dStart, const Vector3DFloat& v3dDirectionAndLength, Callback& callback)
{
VolumeType::Sampler sampler(volData);
@ -173,7 +183,7 @@ namespace PolyVox
{
//m_result.foundIntersection = true;
//m_result.intersectionVoxel = Vector3DInt32(i,j,k);
return;
return MyRaycastResults::Interupted;
}
//m_result.previousVoxel = Vector3DInt32(i,j,k);
@ -203,6 +213,8 @@ namespace PolyVox
if(dk == -1) sampler.moveNegativeZ();
}
}
return MyRaycastResults::Completed;
}
}