diff options
author | Spp <spp@jorge.gr> | 2013-01-30 09:06:19 +0100 |
---|---|---|
committer | Spp <spp@jorge.gr> | 2013-01-30 09:06:19 +0100 |
commit | c4e4cb1b5c4b407c44da30fb254a6c248503451b (patch) | |
tree | b79d3c19cfcaf7baa97e513b8e994b0a7a353824 /src/server/collision/BoundingIntervalHierarchyWrapper.h | |
parent | 2c32393a394a38e0ba6b4b054b6b446320093b17 (diff) |
Core/Misc: Remove using directive from header files (It will eventually lead to name collisions)
Diffstat (limited to 'src/server/collision/BoundingIntervalHierarchyWrapper.h')
-rw-r--r-- | src/server/collision/BoundingIntervalHierarchyWrapper.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchyWrapper.h b/src/server/collision/BoundingIntervalHierarchyWrapper.h index 315f3004306..305d57b0075 100644 --- a/src/server/collision/BoundingIntervalHierarchyWrapper.h +++ b/src/server/collision/BoundingIntervalHierarchyWrapper.h @@ -37,7 +37,7 @@ class BIHWrap MDLCallback(RayCallback& callback, const T* const* objects_array, uint32 objects_size ) : objects(objects_array), _callback(callback), objects_size(objects_size) {} - bool operator() (const Ray& ray, uint32 Idx, float& MaxDist, bool /*stopAtFirst*/) + bool operator() (const G3D::Ray& ray, uint32 Idx, float& MaxDist, bool /*stopAtFirst*/) { if (Idx >= objects_size) return false; @@ -46,7 +46,7 @@ class BIHWrap return false; } - void operator() (const Vector3& p, uint32 Idx) + void operator() (const G3D::Vector3& p, uint32 Idx) { if (Idx >= objects_size) return false; @@ -98,7 +98,7 @@ public: } template<typename RayCallback> - void intersectRay(const Ray& ray, RayCallback& intersectCallback, float& maxDist) + void intersectRay(const G3D::Ray& ray, RayCallback& intersectCallback, float& maxDist) { balance(); MDLCallback<RayCallback> temp_cb(intersectCallback, m_objects.getCArray(), m_objects.size()); @@ -106,7 +106,7 @@ public: } template<typename IsectCallback> - void intersectPoint(const Vector3& point, IsectCallback& intersectCallback) + void intersectPoint(const G3D::Vector3& point, IsectCallback& intersectCallback) { balance(); MDLCallback<IsectCallback> callback(intersectCallback, m_objects.getCArray(), m_objects.size()); |