refact(Direction): make DirectionsToVect returns vec3i

EdgeFortress · Oct 30, 2019 · ad0d11f · ad0d11f
1 parent 9b1f3ff
commit ad0d11f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/OSS13 Client/Sources/Graphics/TileGrid/Object.cpp b/OSS13 Client/Sources/Graphics/TileGrid/Object.cpp
@@ -125,7 +125,7 @@ void Object::ResetShiftingState() {
 }
 
 void Object::ReverseShifting(uf::Direction direction) {
-	uf::vec2i directionVect = uf::DirectionToVect(direction);
+	uf::vec2i directionVect = uf::DirectionToVect(direction).xy();
 	if (directionVect.x) moveIntent.x = 0, moveIntentApproved.x = 0;
 	if (directionVect.y) moveIntent.y = 0, moveIntentApproved.y = 0;
 	shift -= directionVect;

diff --git a/OSS13 Client/Sources/Graphics/TileGrid/TileGrid.cpp b/OSS13 Client/Sources/Graphics/TileGrid/TileGrid.cpp
@@ -434,7 +434,7 @@ void TileGrid::SetMoveIntentObject(uint id, uf::Direction direction) {
     auto iter = objects.find(id);
     if (objects.find(id) != objects.end()) {
         Object *obj = iter->second.get();
-        uf::vec2i dir = uf::DirectionToVect(direction);
+        uf::vec2i dir = uf::DirectionToVect(direction).xy();
         obj->SetMoveIntent(dir, true);
         return;
     }
@@ -445,7 +445,7 @@ void TileGrid::MoveObject(uint id, uf::Direction direction, float speed) {
     auto iter = objects.find(id);
     if (objects.find(id) != objects.end()) {
         Object *obj = iter->second.get();
-        uf::vec2i dir = uf::DirectionToVect(direction);
+        uf::vec2i dir = uf::DirectionToVect(direction).xy();
 
         Tile *lastTile = obj->GetTile();
         if (!lastTile) {

diff --git a/OSS13 Server/Sources/Player/PlayerCommandsProcessor.cpp b/OSS13 Server/Sources/Player/PlayerCommandsProcessor.cpp
@@ -39,7 +39,7 @@ void PlayerCommandsProcessor::ProcessCommand(network::protocol::Command &general
 void PlayerCommandsProcessor::commandProcessor_MoveCommand(network::protocol::client::MoveCommand &command) {
 	auto control = player->GetControl();
 	if (control) {
-		control->MoveCommand(uf::DirectionToVect(command.direction));
+		control->MoveCommand(uf::DirectionToVect(command.direction).xy());
 	}
 }
 

diff --git a/OSS13 Server/Sources/World/Camera/Camera.cpp b/OSS13 Server/Sources/World/Camera/Camera.cpp
@@ -157,7 +157,7 @@ void Camera::UpdateView(std::chrono::microseconds timeElapsed) {
 			visibleObjects.insert(diff->objId);
 		} else if (auto *diff = dynamic_cast<network::protocol::MoveDiff *>(generalDiff.get())) {
 			if (visibleObjects.find(diff->objId) == visibleObjects.end()) {
-				apos to = apos(object->GetPosition() + DirectionToVect(diff->direction), 0);
+				apos to = apos(object->GetPosition() + DirectionToVect(diff->direction).xy(), 0);
 				auto addDiff = std::make_shared<network::protocol::AddDiff>();
 				addDiff->objId = diff->objId;
 				addDiff->objectInfo = object->GetObjectInfo();

diff --git a/SharedLibrary/Sources/Shared/Geometry/Direction.cpp b/SharedLibrary/Sources/Shared/Geometry/Direction.cpp
@@ -41,32 +41,36 @@ Direction VectToDirectionDetail(vec2<T> vector) {
 Direction VectToDirection(vec2f vector) { return VectToDirectionDetail(vector); }
 Direction VectToDirection(vec3f vector) { return VectToDirectionDetail(vector.xy()); }
 
-vec2i DirectionToVect(Direction direction) {
+vec3i DirectionToVect(Direction direction) {
 	switch (direction) {
 		case Direction::SOUTH:
-			return {0, 1};
+			return {0, 1, 0};
 		case Direction::WEST:
-			return {-1, 0};
+			return {-1, 0, 0};
 		case Direction::NORTH:
-			return {0, -1};
+			return {0, -1, 0};
 		case Direction::EAST:
-			return {1, 0};
+			return {1, 0, 0};
 		case Direction::SOUTH_WEST:
-			return {-1, 1};
+			return {-1, 1, 0};
 		case Direction::NORTH_WEST:
-			return {-1, -1};
+			return {-1, -1, 0};
 		case Direction::NORTH_EAST:
-			return {1, -1};
+			return {1, -1, 0};
 		case Direction::SOUTH_EAST:
-			return {1, 1};
+			return {1, 1, 0};
+		case Direction::BOTTOM:
+			return {0, 0, -1};
+		case Direction::TOP:
+			return {0, 0, 1};
 		default:
-			return {0, 0};
+			return {0, 0, 0};
 	}
 }
 
 Angle DirectionToAngle(Direction direction) {
 	EXPECT(direction != Direction::NONE);
-	return (DirectionToVect(direction) * -1).angle();
+	return (DirectionToVect(direction).xy() * -1).angle();
 }
 
 Direction InvertDirection(Direction direction) {

diff --git a/SharedLibrary/Sources/Shared/Geometry/Direction.hpp b/SharedLibrary/Sources/Shared/Geometry/Direction.hpp
@@ -32,7 +32,7 @@ bool IsPureDirection(Direction direction);
 
 Direction VectToDirection(vec2f);
 Direction VectToDirection(vec3f);
-vec2i DirectionToVect(Direction);
+vec3i DirectionToVect(Direction);
 Angle DirectionToAngle(Direction);
 
 Direction InvertDirection(Direction);