From 3ca0222b19bc5601e9a9f4657ed2b254762c3336 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sat, 4 Apr 2015 00:08:20 +0200 Subject: [PATCH] Applied simplified test when going in the negative direction as well. --- include/PolyVox/PagedVolumeSampler.inl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/PolyVox/PagedVolumeSampler.inl b/include/PolyVox/PagedVolumeSampler.inl index fa9cdb10..5cff176a 100644 --- a/include/PolyVox/PagedVolumeSampler.inl +++ b/include/PolyVox/PagedVolumeSampler.inl @@ -23,14 +23,11 @@ freely, subject to the following restrictions: #include -#define CAN_GO_NEG_X(val) ((val % this->mVolume->m_uChunkSideLength != 0)) -//#define CAN_GO_POS_X(val) (((val + 1) % this->mVolume->m_uChunkSideLength != 0)) +#define CAN_GO_NEG_X(val) (this->m_uXPosInChunk > 0) #define CAN_GO_POS_X(val) (this->m_uXPosInChunk < this->mVolume->m_uChunkSideLength-1) -#define CAN_GO_NEG_Y(val) ((val % this->mVolume->m_uChunkSideLength != 0)) -//#define CAN_GO_POS_Y(val) (((val + 1) % this->mVolume->m_uChunkSideLength != 0)) +#define CAN_GO_NEG_Y(val) (this->m_uYPosInChunk > 0) #define CAN_GO_POS_Y(val) (this->m_uYPosInChunk < this->mVolume->m_uChunkSideLength-1) -#define CAN_GO_NEG_Z(val) ((val % this->mVolume->m_uChunkSideLength != 0)) -//#define CAN_GO_POS_Z(val) (((val + 1) % this->mVolume->m_uChunkSideLength != 0)) +#define CAN_GO_NEG_Z(val) (this->m_uZPosInChunk > 0) #define CAN_GO_POS_Z(val) (this->m_uZPosInChunk < this->mVolume->m_uChunkSideLength-1) #define NEG_X_DELTA (-(deltaX[this->m_uXPosInChunk-1]))