From f6aa0e1796cca47e9e314850eca63d3a91dcf58a Mon Sep 17 00:00:00 2001 From: ariel- Date: Sun, 28 Aug 2016 02:31:52 -0300 Subject: [PATCH] Core/Entities: Added possibility to construct a Position using a G3D::Vector3 --- src/server/game/Entities/Object/Position.cpp | 6 ++++++ src/server/game/Entities/Object/Position.h | 7 +++++++ 2 files changed, 13 insertions(+) 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 +#include + +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) { }