4 files changed, 125 insertions, 0 deletions
diff --git a/src/model/Direction.hpp b/src/model/Direction.hpp
new file mode 100644
index 0000000..c1cb269
--- /dev/null
+++ b/src/model/Direction.hpp
@@ -0,0 +1,35 @@
+/*
+  Copyright (c) 2014, 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,
+       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
+
+
+enum Direction {
+	NORTH,
+	EAST,
+	SOUTH,
+	WEST,
+};
diff --git a/src/model/Entity.hpp b/src/model/Entity.hpp
new file mode 100644
index 0000000..518ce5f
--- /dev/null
+++ b/src/model/Entity.hpp
@@ -0,0 +1,74 @@
+/*
+  Copyright (c) 2014, 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,
+       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
+
+
+#include "Direction.hpp"
+
+
+#include <string>
+#include <utility>
+
+
+namespace RPGEdit {
+
+namespace Model {
+
+class Entity {
+private:
+	const std::string name;
+
+	float x, y;
+
+	Direction dir;
+
+public:
+	Entity(const std::string &name0)
+		: name(name0), dir(NORTH) {
+	}
+
+	const std::string & getName() const {
+		return name;
+	}
+
+	std::pair<float, float> getPosition() const {
+		return std::pair<float, float>(x, y);
+	}
+
+	Direction getDirection() const {
+		return dir;
+	}
+
+	void move(float newX, float newY) {
+		x = newX;
+		y = newY;
+	}
+};
+
+}
+
+}
diff --git a/src/model/Map.cpp b/src/model/Map.cpp
index c31f55b..9cbe880 100644
--- a/src/model/Map.cpp
+++ b/src/model/Map.cpp
@@ -45,6 +45,11 @@ std::shared_ptr<Map> Map::load(__attribute__((unused)) const std::string &name)
 		}
 	}
 
+	std::shared_ptr<Entity> square(new Entity("square"));
+	square->move(6, 6);
+
+	map->entities.push_back(square);
+
 	return map;
 }
 
diff --git a/src/model/Map.hpp b/src/model/Map.hpp
index 6d3ef0e..e01d9c4 100644
--- a/src/model/Map.hpp
+++ b/src/model/Map.hpp
@@ -27,10 +27,14 @@
 #pragma once
 
 #include <cstdint>
+#include <deque>
 #include <memory>
 #include <stdexcept>
 #include <vector>
 
+#include "Entity.hpp"
+
+
 namespace RPGEdit {
 
 namespace Model {
@@ -42,6 +46,9 @@ private:
 	size_t width, height;
 	std::unique_ptr<uint32_t[]> tiles;
 
+	mutable std::deque<std::shared_ptr<Entity>> entities;
+
+
 	Map(size_t width0, size_t height0)
 		: width(width0), height(height0), tiles(new uint32_t[width*height]) {
 	}
@@ -55,6 +62,10 @@ public:
 		return tileset;
 	}
 
+	std::deque<std::shared_ptr<Entity>> & getEntities() const {
+		return entities;
+	}
+
 	size_t getWidth() const {
 		return width;
 	}