Add transitions for entity movement

6 files changed, 144 insertions, 50 deletions

diff --git a/src/control/MapContext.cpp b/src/control/MapContext.cpp
index 5fda337..f4dd31e 100644
--- a/src/control/MapContext.cpp
+++ b/src/control/MapContext.cpp
@@ -45,6 +45,36 @@ MapContext::MapContext(ImageLoader *imageLoader0, const std::shared_ptr<const Mo
 		entities[entity->getName()] = imageLoader->get("entity/" + entity->getName());
 }
 
+void MapContext::advance(InputHandler *inputHandler, uint32_t ticks) {
+	uint64_t totalTicksOld = totalTicks;
+	totalTicks += ticks;
+
+	unsigned advance = totalTicks - totalTicksOld;
+
+	while (advance) {
+		advance = map->getPlayerEntity().advance(advance);
+
+		if (map->getPlayerEntity().hasTransition())
+			break;
+
+		if (inputHandler->isKeyPressed(SDL_SCANCODE_UP)) {
+			map->getPlayerEntity().move(Model::NORTH, 250);
+		}
+		else if (inputHandler->isKeyPressed(SDL_SCANCODE_RIGHT)) {
+			map->getPlayerEntity().move(Model::EAST, 250);
+		}
+		else if (inputHandler->isKeyPressed(SDL_SCANCODE_DOWN)) {
+			map->getPlayerEntity().move(Model::SOUTH, 250);
+		}
+		else if (inputHandler->isKeyPressed(SDL_SCANCODE_LEFT)) {
+			map->getPlayerEntity().move(Model::WEST, 250);
+		}
+		else {
+			break;
+		}
+	}
+}
+
 }
 
 }
diff --git a/src/control/MapContext.hpp b/src/control/MapContext.hpp
index 4cbf38a..504afc2 100644
--- a/src/control/MapContext.hpp
+++ b/src/control/MapContext.hpp
@@ -53,25 +53,7 @@ private:
 public:
 	MapContext(ImageLoader *imageLoader0, const std::shared_ptr<const Model::Map> &map0);
 
-	void advance(InputHandler *inputHandler, uint32_t ticks) {
-		uint64_t totalTicksOld = totalTicks;
-		totalTicks += ticks;
-
-		uint64_t advanced = totalTicks/100 - totalTicksOld/100;
-
-		if (inputHandler->isKeyPressed(SDL_SCANCODE_UP)) {
-			map->getPlayerEntity().move(Model::NORTH, advanced);
-		}
-		else if (inputHandler->isKeyPressed(SDL_SCANCODE_RIGHT)) {
-			map->getPlayerEntity().move(Model::EAST, advanced);
-		}
-		else if (inputHandler->isKeyPressed(SDL_SCANCODE_DOWN)) {
-			map->getPlayerEntity().move(Model::SOUTH, advanced);
-		}
-		else if (inputHandler->isKeyPressed(SDL_SCANCODE_LEFT)) {
-			map->getPlayerEntity().move(Model::WEST, advanced);
-		}
-	}
+	void advance(InputHandler *inputHandler, unsigned ticks);
 
 	std::shared_ptr<View::MapView> initView(const std::shared_ptr<View::Window> &window) {
 		return std::make_shared<View::MapView>(window, map, tiles, entities);
diff --git a/src/model/Entity.hpp b/src/model/Entity.hpp
index a61ae21..3514434 100644
--- a/src/model/Entity.hpp
+++ b/src/model/Entity.hpp
@@ -1,11 +1,11 @@
 /*
-  Copyright (c) 2014, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 20amount4, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 
-    1. Redistributions of source code must retain the above copyright notice,
+    amount. Redistributions of source code must retain the above copyright notice,
        this list of conditions and the following disclaimer.
     2. Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the documentation
@@ -28,6 +28,7 @@
 
 
 #include "Direction.hpp"
+#include "Position.hpp"
 
 
 #include <string>
@@ -42,50 +43,91 @@ class Entity {
 private:
 	const std::string name;
 
-	float x, y;
+	Position pos;
+	Direction direction;
 
-	Direction dir;
+	unsigned transition = 0;
+	unsigned step = 0;
+
+	Position translate(Direction dir, float amount) const {
+		Position p = pos;
+
+		switch (dir) {
+		case NORTH:
+			p.y -= amount;
+			break;
+
+		case EAST:
+			p.x += amount;
+			break;
+
+		case SOUTH:
+			p.y += amount;
+			break;
+
+		case WEST:
+			p.x -= amount;
+		}
+
+		return p;
+	}
 
 public:
 	Entity(const std::string &name0)
-		: name(name0), dir(NORTH) {
+		: name(name0), direction(NORTH) {
 	}
 
 	const std::string & getName() const {
 		return name;
 	}
 
-	std::pair<float, float> getPosition() const {
-		return std::pair<float, float>(x, y);
+	Position getPosition() const {
+		if (transition)
+			return translate(direction, (float)step / transition);
+		else
+			return pos;
 	}
 
 	Direction getDirection() const {
-		return dir;
+		return direction;
 	}
 
 	void moveTo(float newX, float newY) {
-		x = newX;
-		y = newY;
+		pos.x = newX;
+		pos.y = newY;
 	}
 
-	void move(Direction direction, float amount = 1) {
-		dir = direction;
+	void move(Direction dir, unsigned steps = 0) {
+		if (transition)
+			return;
 
-		switch (direction) {
-		case NORTH:
-			y -= amount;
-			break;
+		direction = dir;
 
-		case EAST:
-			x += amount;
-			break;
+		if (steps)
+			transition = steps;
+		else
+			pos = translate(direction, 1);
+	}
 
-		case SOUTH:
-			y += amount;
-			break;
+	bool hasTransition() const {
+		return transition;
+	}
 
-		case WEST:
-			x -= amount;
+	unsigned advance(unsigned ticks) {
+		if (!transition)
+			return ticks;
+
+		step += ticks;
+
+		if (step >= transition) {
+			ticks = step - transition;
+			transition = step = 0;
+			pos = translate(direction, 1);
+
+			return ticks;
+		}
+		else {
+			return 0;
 		}
 	}
 };
diff --git a/src/model/Position.hpp b/src/model/Position.hpp
new file mode 100644
index 0000000..9ae0dfd
--- /dev/null
+++ b/src/model/Position.hpp
@@ -0,0 +1,40 @@
+/*
+  Copyright (c) 20amount4, Matthias Schiffer <mschiffer@universe-factory.net>
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    amount. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the documentation
+       and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#pragma once
+
+
+namespace RPGEdit {
+
+namespace Model {
+
+struct Position {
+	float x, y;
+};
+
+}
+
+}
diff --git a/src/rpgedit.cpp b/src/rpgedit.cpp
index c507880..b4fc89e 100644
--- a/src/rpgedit.cpp
+++ b/src/rpgedit.cpp
@@ -91,8 +91,8 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char *argv[])
 			if (!SDL_TICKS_PASSED(SDL_GetTicks(), lastFrameTicks + MIN_FRAME_DELAY))
 				continue;
 
-			std::pair<float, float> pos = map->getPlayerEntity().getPosition();
-			mapView->render(pos.first, pos.second);
+			Model::Position pos = map->getPlayerEntity().getPosition();
+			mapView->render(pos.x, pos.y);
 
 			lastFrameTicks = ticks;
 		}
diff --git a/src/view/MapView.cpp b/src/view/MapView.cpp
index 33414ce..8a0bdbf 100644
--- a/src/view/MapView.cpp
+++ b/src/view/MapView.cpp
@@ -93,7 +93,7 @@ void MapView::render(float centerX, float centerY) {
 	int minX = std::floor(centerX - tilesW/2 - 0.5f), maxX = std::ceil(centerX + tilesW/2 + 0.5f);
 	int minY = std::floor(centerY - tilesH/2 - 0.5f), maxY = std::ceil(centerY + tilesH/2 + 0.5f);
 
-	int baseX = viewport.first/2 - (centerX + 0.5f)*tilePixels, baseY = viewport.second/2 - (centerY + 0.5f)*tilePixels;
+	int baseX = viewport.first/2 - int(centerX * tilePixels) - tilePixels/2, baseY = viewport.second/2 - int(centerY * tilePixels) - tilePixels/2;
 
 	for (int x = minX; x <= maxX; x++) {
 		for (int y = minY; y <= maxY; y++) {
@@ -120,7 +120,7 @@ void MapView::render(float centerX, float centerY) {
 	}
 
 	for (const std::shared_ptr<Model::Entity> &entity : map->getEntities()) {
-		std::pair<float, float> pos = entity->getPosition();
+		Model::Position pos = entity->getPosition();
 		Model::Direction dir = entity->getDirection();
 
 		SDL_Rect src = {
@@ -131,14 +131,14 @@ void MapView::render(float centerX, float centerY) {
 		};
 
 		SDL_Rect dst = {
-			.x = baseX + int(pos.first*tilePixels),
-			.y = baseY + int(pos.second*tilePixels),
+			.x = baseX + int(pos.x * tilePixels),
+			.y = baseY + int(pos.y * tilePixels),
 			.w = tilePixels,
 			.h = tilePixels,
 		};
 
 		SDL_RenderCopy(window->getRenderer(), entityTextures[entity->getName()], &src, &dst);
-		}
+	}
 
 	SDL_RenderPresent(window->getRenderer());
 }