aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-08-28 02:31:52 -0300
committerariel- <ariel-@users.noreply.github.com>2016-08-28 02:31:52 -0300
commit17917171f3bb7d8c5727a1611ed017ebeccf5ae7 (patch)
treedb3a1852a84eecd8dfe391b2754aaffa224df6a9
parent27590fbb9856c77af49bcf396e86db8f8f3aec9d (diff)
Core/Entities: Added possibility to construct a Position using a G3D::Vector3
-rw-r--r--src/server/game/Entities/Object/Position.cpp6
-rw-r--r--src/server/game/Entities/Object/Position.h7
2 files changed, 13 insertions, 0 deletions
diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index 2412e67cf14..c5b4cda29e4 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -20,6 +20,12 @@
#include "GridDefines.h"
#include <G3D/g3dmath.h>
+#include <G3D/Vector3.h>
+
+Position::Position(G3D::Vector3 const& vect)
+{
+ Relocate(vect.x, vect.y, vect.z, 0.f);
+}
bool Position::operator==(Position const &a)
{
diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h
index 6325cc51fe2..e01afe4cc71 100644
--- a/src/server/game/Entities/Object/Position.h
+++ b/src/server/game/Entities/Object/Position.h
@@ -20,6 +20,11 @@
#include "Common.h"
+namespace G3D
+{
+ class Vector3;
+}
+
class ByteBuffer;
struct TC_GAME_API Position
@@ -29,6 +34,8 @@ struct TC_GAME_API Position
Position(Position const& loc) { Relocate(loc); }
+ Position(G3D::Vector3 const& vect);
+
struct PositionXYStreamer
{
explicit PositionXYStreamer(Position& pos) : Pos(&pos) { }