From 43e684071933adef93040e8d4b830d5c6b71cf9a Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 12 Jan 2013 04:46:01 +0000 Subject: Merged branch "branches/hooks" into "trunk". git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Cuboid.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'source/Cuboid.h') diff --git a/source/Cuboid.h b/source/Cuboid.h index a07d665fc..1002ff6b4 100644 --- a/source/Cuboid.h +++ b/source/Cuboid.h @@ -3,20 +3,20 @@ #include "Vector3i.h" #include "Vector3d.h" -class cCuboid //tolua_export -{ //tolua_export -public: //tolua_export - cCuboid() {} //tolua_export - cCuboid( const cCuboid & a_Cuboid ) : p1( a_Cuboid.p1 ), p2( a_Cuboid.p2 ) {} //tolua_export - cCuboid( const Vector3i & a_p1, const Vector3i & a_p2 ) : p1( a_p1 ), p2( a_p2 ) {} //tolua_export +class cCuboid // tolua_export +{ // tolua_export +public: // tolua_export + cCuboid() {} // tolua_export + cCuboid( const cCuboid & a_Cuboid ) : p1( a_Cuboid.p1 ), p2( a_Cuboid.p2 ) {} // tolua_export + cCuboid( const Vector3i & a_p1, const Vector3i & a_p2 ) : p1( a_p1 ), p2( a_p2 ) {} // tolua_export - Vector3i p1, p2; //tolua_export + Vector3i p1, p2; // tolua_export - void Sort(); //tolua_export + void Sort(); // tolua_export - bool IsInside( const Vector3i & v ) const //tolua_export - { //tolua_export + bool IsInside( const Vector3i & v ) const // tolua_export + { // tolua_export if( v.x >= p1.x && v.x <= p2.x && v.y >= p1.y && v.y <= p2.y && v.z >= p1.z && v.z <= p2.z ) @@ -24,10 +24,10 @@ public: //tolua_export return true; } return false; - } //tolua_export + } // tolua_export - bool IsInside( const Vector3d & v ) const //tolua_export - { //tolua_export + bool IsInside( const Vector3d & v ) const // tolua_export + { // tolua_export if( v.x >= p1.x && v.x <= p2.x && v.y >= p1.y && v.y <= p2.y && v.z >= p1.z && v.z <= p2.z ) @@ -35,6 +35,6 @@ public: //tolua_export return true; } return false; - } //tolua_export + } // tolua_export -}; //tolua_export \ No newline at end of file +}; // tolua_export -- cgit v1.2.3