summaryrefslogtreecommitdiffstats
path: root/src/Tracer.h
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2018-05-06 19:07:34 +0200
committerpeterbell10 <peterbell10@live.co.uk>2018-05-06 19:07:34 +0200
commitb9fdaf8a942ea2f79e48e3f735ba8916f3364e70 (patch)
tree41c6f10550a4e606d33ac84fe3968b69875aa1d4 /src/Tracer.h
parentGenerate cacti and sugarcane with different heights (#4137) (diff)
downloadcuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.gz
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.bz2
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.lz
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.xz
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.tar.zst
cuberite-b9fdaf8a942ea2f79e48e3f735ba8916f3364e70.zip
Diffstat (limited to 'src/Tracer.h')
-rw-r--r--src/Tracer.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Tracer.h b/src/Tracer.h
index 151869e3a..19901ee67 100644
--- a/src/Tracer.h
+++ b/src/Tracer.h
@@ -63,7 +63,7 @@ private:
/** Determines which face on the block a collision occured, if it does occur
Returns 0 if the block is air, water or no collision occured
Return 1 through 6 for the following block faces, repectively: -x, -z, x, z, y, -y */
- int GetHitNormal(const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos);
+ int GetHitNormal(const Vector3f &a_Start, const Vector3f & a_End, const Vector3i & a_BlockPos);
/** Signum function */
int SigNum(float a_Num);
@@ -72,12 +72,12 @@ private:
static const std::array<const Vector3f, 6> & m_NormalTable(void);
- Vector3f dir;
- Vector3f tDelta;
- Vector3i pos;
- Vector3i end1;
- Vector3i step;
- Vector3f tMax;
+ Vector3f m_Dir;
+ Vector3f m_tDelta;
+ Vector3i m_Pos;
+ Vector3i m_End1;
+ Vector3i m_Step;
+ Vector3f m_tMax;
};
// tolua_end