From d15d40ad6969cc2d0945853fa13622cbef9f5b98 Mon Sep 17 00:00:00 2001 From: faketruth Date: Wed, 15 Feb 2012 22:50:00 +0000 Subject: No longer using pointers for Vector3(f/d/i) in cEntity's and cTracer git-svn-id: http://mc-server.googlecode.com/svn/trunk@268 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cTracer.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'source/cTracer.h') diff --git a/source/cTracer.h b/source/cTracer.h index 3b7cd32c1..08ebc72e5 100644 --- a/source/cTracer.h +++ b/source/cTracer.h @@ -1,32 +1,34 @@ #pragma once +#include "Vector3i.h" +#include "Vector3f.h" + + class cWorld; -class Vector3i; -class Vector3f; class cTracer //tolua_export { //tolua_export public: //tolua_export - Vector3f* DotPos; - Vector3f* BoxOffset; + Vector3f DotPos; + Vector3f BoxOffset; cTracer( cWorld* a_World); //tolua_export ~cTracer(); //tolua_export int Trace( const Vector3f & a_Start, const Vector3f & a_Direction, int a_Distance ); //tolua_export void SetValues( const Vector3f & a_Start, const Vector3f & a_Direction ); //tolua_export - Vector3f* BlockHitPosition; //tolua_export - Vector3f* HitNormal; //tolua_export - Vector3f* RealHit; //tolua_export + Vector3f BlockHitPosition; //tolua_export + Vector3f HitNormal; //tolua_export + Vector3f RealHit; //tolua_export private: int intersect3D_SegmentPlane( const Vector3f & a_Origin, const Vector3f & a_End, const Vector3f & a_PlanePos, const Vector3f & a_PlaneNormal ); int GetHitNormal( const Vector3f & start, const Vector3f & end, const Vector3i & a_BlockPos); float SigNum( float a_Num ); cWorld* m_World; - Vector3f* m_NormalTable[6]; + Vector3f m_NormalTable[6]; - Vector3f* dir; - Vector3f* tDelta; - Vector3i* pos; - Vector3i* end1; - Vector3i* step; - Vector3f* tMax; + Vector3f dir; + Vector3f tDelta; + Vector3i pos; + Vector3i end1; + Vector3i step; + Vector3f tMax; }; //tolua_export \ No newline at end of file -- cgit v1.2.3