1 files changed, 37 insertions, 23 deletions

diff --git a/src/Tracer.cpp b/src/Tracer.cpp
index be42430a5..fd8a297c0 100644
--- a/src/Tracer.cpp
+++ b/src/Tracer.cpp
@@ -7,7 +7,7 @@
 #include "Entities/Entity.h"
 
 #ifndef _WIN32
-	#include <stdlib.h> // abs()
+	#include <stdlib.h>
 #endif
 
 
@@ -18,11 +18,11 @@ cTracer::cTracer(cWorld * a_World)
 	: m_World(a_World)
 {
 	m_NormalTable[0].Set(-1, 0, 0);
-	m_NormalTable[1].Set( 0, 0,-1);
+	m_NormalTable[1].Set( 0, 0, -1);
 	m_NormalTable[2].Set( 1, 0, 0);
 	m_NormalTable[3].Set( 0, 0, 1);
 	m_NormalTable[4].Set( 0, 1, 0);
-	m_NormalTable[5].Set( 0,-1, 0);
+	m_NormalTable[5].Set( 0, -1, 0);
 }
 
 
@@ -245,9 +245,9 @@ bool cTracer::Trace( const Vector3f & a_Start, const Vector3f & a_Direction, int
 
 
 // return 1 = hit, other is not hit
-int LinesCross(float x0,float y0,float x1,float y1,float x2,float y2,float x3,float y3)
+int LinesCross(float x0, float y0, float x1, float y1, float x2, float y2, float x3, float y3)
 {
-	//float linx, liny;
+	// float linx, liny;
 
 	float d=(x1-x0)*(y3-y2)-(y1-y0)*(x3-x2);
 	if (abs(d)<0.001) {return 0;}
@@ -257,8 +257,8 @@ int LinesCross(float x0,float y0,float x1,float y1,float x2,float y2,float x3,fl
 		float CD=((y0-y2)*(x1-x0)-(x0-x2)*(y1-y0))/d;
 		if (CD>=0.0 && CD<=1.0)
 		{
-			//linx=x0+AB*(x1-x0);
-			//liny=y0+AB*(y1-y0);
+			// linx=x0+AB*(x1-x0);
+			// liny=y0+AB*(y1-y0);
 			return 1;
 		}
 	}
@@ -273,36 +273,50 @@ int LinesCross(float x0,float y0,float x1,float y1,float x2,float y2,float x3,fl
 //            2 = the segment lies in the plane
 int cTracer::intersect3D_SegmentPlane( const Vector3f & a_Origin, const Vector3f & a_End, const Vector3f & a_PlanePos, const Vector3f & a_PlaneNormal )
 {
-	Vector3f    u = a_End - a_Origin;//a_Ray.P1 - S.P0;
-	Vector3f    w = a_Origin - a_PlanePos;//S.P0 - Pn.V0;
+	Vector3f    u = a_End - a_Origin;       // a_Ray.P1 - S.P0;
+	Vector3f    w = a_Origin - a_PlanePos;  // S.P0 - Pn.V0;
 
-	float     D = a_PlaneNormal.Dot( u );//dot(Pn.n, u);
-	float     N = -(a_PlaneNormal.Dot( w ) );//-dot(a_Plane.n, w);
+	float     D = a_PlaneNormal.Dot( u );      // dot(Pn.n, u);
+	float     N = -(a_PlaneNormal.Dot( w ) );  // -dot(a_Plane.n, w);
 
 	const float EPSILON = 0.0001f;
-	if (fabs(D) < EPSILON) {          // segment is parallel to plane
-		if (N == 0)                     // segment lies in plane
+	if (fabs(D) < EPSILON)
+	{
+		// segment is parallel to plane
+		if (N == 0)
+		{
+			// segment lies in plane
 			return 2;
-		return 0;                   // no intersection
+		}
+		return 0;  // no intersection
 	}
+	
 	// they are not parallel
 	// compute intersect param
 	float sI = N / D;
 	if (sI < 0 || sI > 1)
-		return 0;                       // no intersection
+	{
+		return 0;  // no intersection
+	}
 
-	//Vector3f I ( a_Ray->GetOrigin() + sI * u );//S.P0 + sI * u;                 // compute segment intersect point
+	// Vector3f I ( a_Ray->GetOrigin() + sI * u );// S.P0 + sI * u;  // compute segment intersect point
 	RealHit = a_Origin + u * sI;
 	return 1;
 }
 
+
+
+
+
 int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos)
 {
 	Vector3i SmallBlockPos = a_BlockPos;
 	char BlockID = m_World->GetBlock( a_BlockPos.x, a_BlockPos.y, a_BlockPos.z );
 
 	if( BlockID == E_BLOCK_AIR || IsBlockWater(BlockID))
+	{
 		return 0;
+	}
 
 	Vector3f BlockPos;
 	BlockPos = Vector3f(SmallBlockPos);
@@ -310,8 +324,8 @@ int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Ve
 	Vector3f Look = (end - start);
 	Look.Normalize();
 
-	float dot = Look.Dot( Vector3f(-1, 0, 0) ); // first face normal is x -1
-	if(dot < 0)
+	float dot = Look.Dot( Vector3f(-1, 0, 0) );  // first face normal is x -1
+	if (dot < 0)
 	{
 		int Lines = LinesCross( start.x, start.y, end.x, end.y, BlockPos.x, BlockPos.y, BlockPos.x, BlockPos.y + 1 );
 		if(Lines == 1)
@@ -324,7 +338,7 @@ int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Ve
 			}
 		}
 	}
-	dot = Look.Dot( Vector3f(0, 0, -1) ); // second face normal is z -1
+	dot = Look.Dot( Vector3f(0, 0, -1) );  // second face normal is z -1
 	if(dot < 0)
 	{
 		int Lines = LinesCross( start.z, start.y, end.z, end.y, BlockPos.z, BlockPos.y, BlockPos.z, BlockPos.y + 1 );
@@ -338,7 +352,7 @@ int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Ve
 			}
 		}
 	}
-	dot = Look.Dot( Vector3f(1, 0, 0) ); // third face normal is x 1
+	dot = Look.Dot( Vector3f(1, 0, 0) );  // third face normal is x 1
 	if(dot < 0)
 	{
 		int Lines = LinesCross( start.x, start.y, end.x, end.y, BlockPos.x + 1, BlockPos.y, BlockPos.x + 1, BlockPos.y + 1 );
@@ -352,7 +366,7 @@ int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Ve
 			}
 		}
 	}
-	dot = Look.Dot( Vector3f(0, 0, 1) ); // fourth face normal is z 1
+	dot = Look.Dot( Vector3f(0, 0, 1) );  // fourth face normal is z 1
 	if(dot < 0)
 	{
 		int Lines = LinesCross( start.z, start.y, end.z, end.y, BlockPos.z + 1, BlockPos.y, BlockPos.z + 1, BlockPos.y + 1 );
@@ -366,7 +380,7 @@ int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Ve
 			}
 		}
 	}
-	dot = Look.Dot( Vector3f(0, 1, 0) ); // fifth face normal is y 1
+	dot = Look.Dot( Vector3f(0, 1, 0) );  // fifth face normal is y 1
 	if(dot < 0)
 	{
 		int Lines = LinesCross( start.y, start.x, end.y, end.x, BlockPos.y + 1, BlockPos.x, BlockPos.y + 1, BlockPos.x + 1 );
@@ -380,7 +394,7 @@ int cTracer::GetHitNormal(const Vector3f & start, const Vector3f & end, const Ve
 			}
 		}
 	}
-	dot = Look.Dot( Vector3f(0, -1, 0) ); // sixth face normal is y -1
+	dot = Look.Dot( Vector3f(0, -1, 0) );  // sixth face normal is y -1
 	if(dot < 0)
 	{
 		int Lines = LinesCross( start.y, start.x, end.y, end.x, BlockPos.y, BlockPos.x, BlockPos.y, BlockPos.x + 1 );