From 2df45d0c4a53ac3ceb7dd71a34be896a8b7dcf30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Tue, 4 Feb 2014 14:07:56 +0100
Subject: [PATCH] refactor header includes

---
 include/llmr/map/layer.hpp        | 35 -------------------------------
 include/llmr/map/map.hpp          | 25 +++++++++++-----------
 include/llmr/map/tile.hpp         | 22 +++++++------------
 include/llmr/map/transform.hpp    |  3 ---
 include/llmr/renderer/painter.hpp | 24 +++++++++++----------
 include/llmr/style/style.hpp      | 17 ++++++++-------
 include/llmr/util/vec.hpp         |  5 +++--
 src/map/layer.cpp                 |  3 ---
 src/map/map.cpp                   | 11 ++--------
 src/map/tile.cpp                  | 17 ++++++---------
 src/renderer/painter.cpp          | 28 ++++++++++++-------------
 11 files changed, 66 insertions(+), 124 deletions(-)
 delete mode 100644 include/llmr/map/layer.hpp
 delete mode 100644 src/map/layer.cpp

diff --git a/include/llmr/map/layer.hpp b/include/llmr/map/layer.hpp
deleted file mode 100644
index 2e4db2997..000000000
--- a/include/llmr/map/layer.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef LLMR_MAP_LAYER
-#define LLMR_MAP_LAYER
-
-#include <string>
-#include <forward_list>
-
-namespace llmr {
-
-// class Bucket;
-
-// class Layer {
-// public:
-//     Layer(const std::string& name, const std::shared_ptr<Bucket>& bucket)
-//         : name(name),
-//           bucket(bucket) {}
-
-//     Layer(const std::string& name)
-//         : name(name) {}
-
-// public:
-//     std::string name;
-//     std::shared_ptr<Bucket> bucket;
-//     std::forward_list<Layer> child_layers;
-
-// private:
-//     // Make noncopyable
-//     // Layer(const Layer&) = delete;
-//     // Layer(const Layer&&) = delete;
-//     // Layer& operator=(const Layer&) = delete;
-//     // Layer& operator=(const Layer && ) = delete;
-// };
-
-}
-
-#endif
diff --git a/include/llmr/map/map.hpp b/include/llmr/map/map.hpp
index 0cae68730..7950158e3 100644
--- a/include/llmr/map/map.hpp
+++ b/include/llmr/map/map.hpp
@@ -1,18 +1,17 @@
 #ifndef LLMR_MAP_MAP
 #define LLMR_MAP_MAP
 
-#include "../platform/platform.hpp"
-#include "../renderer/painter.hpp"
-#include "transform.hpp"
 #include <llmr/map/tile.hpp>
-#include "settings.hpp"
-#include "../style/style.hpp"
+#include <llmr/map/transform.hpp>
+#include <llmr/style/style.hpp>
+#include <llmr/renderer/painter.hpp>
 
-#include <forward_list>
+#include <cstdint>
+#include <string>
 
 namespace llmr {
 
-class Sprite;
+class Settings;
 
 class Map {
 public:
@@ -37,8 +36,8 @@ public:
     void moveBy(double dx, double dy);
     void scaleBy(double ds, double cx, double cy);
     void rotateBy(double cx, double cy, double sx, double sy, double ex, double ey);
-    void tileLoaded(Tile::Ptr tile);
-    void tileFailed(Tile::Ptr tile);
+    void tileLoaded(std::shared_ptr<Tile> tile);
+    void tileFailed(std::shared_ptr<Tile> tile);
 
     /* position */
     void resetNorth();
@@ -54,8 +53,8 @@ private:
     bool findLoadedChildren(const Tile::ID& id, int32_t maxCoveringZoom, std::forward_list<Tile::ID>& retain);
     bool findLoadedParent(const Tile::ID& id, int32_t minCoveringZoom, std::forward_list<Tile::ID>& retain);
     void updateTiles();
-    Tile::Ptr addTile(const Tile::ID& id);
-    Tile::Ptr hasTile(const Tile::ID& id);
+    std::shared_ptr<Tile> addTile(const Tile::ID& id);
+    std::shared_ptr<Tile> hasTile(const Tile::ID& id);
 
 
     void update();
@@ -69,8 +68,8 @@ private:
     int32_t min_zoom;
     int32_t max_zoom;
 
-    std::forward_list<Tile::Ptr> tiles;
-    std::forward_list<Tile::Ptr> historic_tiles;
+    std::forward_list<std::shared_ptr<Tile>> tiles;
+    std::forward_list<std::shared_ptr<Tile>> historic_tiles;
 };
 
 }
diff --git a/include/llmr/map/tile.hpp b/include/llmr/map/tile.hpp
index c95da8982..2184af9bd 100644
--- a/include/llmr/map/tile.hpp
+++ b/include/llmr/map/tile.hpp
@@ -1,31 +1,26 @@
 #ifndef LLMR_MAP_TILE
 #define LLMR_MAP_TILE
 
-#include "../geometry/debug_font_buffer.hpp"
-#include "../geometry/fill_buffer.hpp"
-#include "../geometry/line_buffer.hpp"
-
-#include "layer.hpp"
-
-#include <stdint.h>
-#include <forward_list>
-#include <mutex>
 #include <llmr/util/vec.hpp>
+
+#include <cstdint>
+#include <forward_list>
 #include <string>
+#include <vector>
 #include <map>
 #include <memory>
 
 namespace llmr {
 
-struct pbf;
 class Style;
 class Bucket;
 class LayerDescription;
 class BucketDescription;
 class VectorTile;
 class VectorTileLayer;
-
-
+class DebugFontBuffer;
+class FillBuffer;
+class LineBuffer;
 
 class Tile : public std::enable_shared_from_this<Tile> {
 public:
@@ -83,14 +78,11 @@ public:
     // Holds the buckets of this tile.
     // They contain the location offsets in the buffers stored above
     std::map<std::string, std::shared_ptr<Bucket>> buckets;
-    // std::forward_list<Layer> layers;
 
 private:
     // Source data
     std::string data;
 
-    // std::mutex mtx;
-
     const Style& style;
 };
 
diff --git a/include/llmr/map/transform.hpp b/include/llmr/map/transform.hpp
index 39b533c6b..9b39aa149 100644
--- a/include/llmr/map/transform.hpp
+++ b/include/llmr/map/transform.hpp
@@ -1,13 +1,10 @@
 #ifndef LLMR_MAP_TRANSFORM
 #define LLMR_MAP_TRANSFORM
 
-
 #include <llmr/util/vec.hpp>
 #include <llmr/util/mat4.hpp>
 #include <llmr/util/animation.hpp>
 
-#include <cmath>
-#include <cstdint>
 #include <forward_list>
 
 namespace llmr {
diff --git a/include/llmr/renderer/painter.hpp b/include/llmr/renderer/painter.hpp
index dafa61c11..108eb2f38 100644
--- a/include/llmr/renderer/painter.hpp
+++ b/include/llmr/renderer/painter.hpp
@@ -1,22 +1,24 @@
 #ifndef LLMR_RENDERER_PAINTER
 #define LLMR_RENDERER_PAINTER
 
-#include "shader-fill.hpp"
-#include "shader-plain.hpp"
-#include "shader-outline.hpp"
-#include "shader-line.hpp"
-#include "shader-pattern.hpp"
-
-#include "../map/tile.hpp"
-#include "../geometry/vertex_buffer.hpp"
-#include "../util/mat4.hpp"
+#include <llmr/map/tile.hpp>
+#include <llmr/geometry/vertex_buffer.hpp>
+#include <llmr/util/mat4.hpp>
 
 namespace llmr {
 
-class Settings;
 class Transform;
+class Settings;
 class Style;
-class LayerDescription;
+class Tile;
+// class LayerDescription;
+
+class Shader;
+class PlainShader;
+class OutlineShader;
+class FillShader;
+class LineShader;
+class PatternShader;
 
 class FillBucket;
 class LineBucket;
diff --git a/include/llmr/style/style.hpp b/include/llmr/style/style.hpp
index f2acbd1ee..8bc5ff439 100644
--- a/include/llmr/style/style.hpp
+++ b/include/llmr/style/style.hpp
@@ -1,20 +1,21 @@
 #ifndef LLMR_STYLE_STYLE
 #define LLMR_STYLE_STYLE
 
+#include <cstdint>
+
+#include <llmr/util/pbf.hpp>
+#include <llmr/style/bucket_description.hpp>
+#include <llmr/style/layer_description.hpp>
+#include <llmr/style/class_description.hpp>
+
 #include <map>
 #include <vector>
 #include <set>
-#include "../util/pbf.hpp"
-
-#include "value.hpp"
-#include "properties.hpp"
-#include "bucket_description.hpp"
-#include "layer_description.hpp"
-#include "class_description.hpp"
-#include "sprite.hpp"
 
 namespace llmr {
 
+class Sprite;
+
 class Style {
 public:
     Style();
diff --git a/include/llmr/util/vec.hpp b/include/llmr/util/vec.hpp
index f403cded5..70aa11134 100644
--- a/include/llmr/util/vec.hpp
+++ b/include/llmr/util/vec.hpp
@@ -1,8 +1,9 @@
-#ifndef llmr_util_vec2_
-#define llmr_util_vec2_
+#ifndef LLMR_UTIL_VEC
+#define LLMR_UTIL_VEC
 
 #include <limits>
 #include <type_traits>
+#include <cmath>
 
 namespace llmr {
 
diff --git a/src/map/layer.cpp b/src/map/layer.cpp
deleted file mode 100644
index 56e907c0a..000000000
--- a/src/map/layer.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <llmr/map/layer.hpp>
-
-using namespace llmr;
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 1e2326ff3..13a46dd12 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -1,16 +1,9 @@
 #include <llmr/map/map.hpp>
-#include <llmr/map/tile.hpp>
-//#include <llmr/util/vec2.hpp>
-
+#include <llmr/map/settings.hpp>
+#include <llmr/platform/platform.hpp>
 #include <llmr/style/resources.hpp>
 #include <llmr/style/sprite.hpp>
 
-#include <iostream>
-#include <thread>
-#include <algorithm>
-#include <cmath>
-#include <cassert>
-
 using namespace llmr;
 
 Map::Map(Settings& settings)
diff --git a/src/map/tile.cpp b/src/map/tile.cpp
index d787afb48..67bcc5a03 100644
--- a/src/map/tile.cpp
+++ b/src/map/tile.cpp
@@ -1,21 +1,16 @@
 #include <llmr/map/tile.hpp>
 
-#include <stdint.h>
-#include <cassert>
-// #include <iostream>
-#include <thread>
-
-#include <llmr/util/pbf.hpp>
-#include <llmr/util/string.hpp>
-#include <llmr/geometry/geometry.hpp>
+#include <llmr/style/style.hpp>
+#include <llmr/map/vector_tile.hpp>
+#include <llmr/geometry/debug_font_buffer.hpp>
+#include <llmr/geometry/fill_buffer.hpp>
+#include <llmr/geometry/line_buffer.hpp>
 #include <llmr/renderer/fill_bucket.hpp>
 #include <llmr/renderer/line_bucket.hpp>
-#include <llmr/style/style.hpp>
 #include <llmr/platform/platform.hpp>
+#include <llmr/util/pbf.hpp>
 #include <llmr/util/string.hpp>
-#include <llmr/map/vector_tile.hpp>
 
-#include <cmath>
 
 using namespace llmr;
 
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index 6114c5b21..1c5ecc04c 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -1,21 +1,21 @@
-#include <llmr/renderer/painter.hpp>
-#include <iostream>
-#include <assert.h>
-#include <llmr/util/mat4.hpp>
-#include <llmr/platform/platform.hpp>
-#include <llmr/map/transform.hpp>
-#include <llmr/map/tile.hpp>
-#include <llmr/platform/gl.hpp>
-#include <llmr/map/settings.hpp>
+#include <cassert>
+#include <algorithm>
 
+#include <llmr/renderer/painter.hpp>
+
+#include <llmr/renderer/shader-plain.hpp>
+#include <llmr/renderer/shader-fill.hpp>
+#include <llmr/renderer/shader-outline.hpp>
+#include <llmr/renderer/shader-pattern.hpp>
+#include <llmr/renderer/shader-line.hpp>
 #include <llmr/renderer/fill_bucket.hpp>
 #include <llmr/renderer/line_bucket.hpp>
+#include <llmr/map/transform.hpp>
+#include <llmr/map/settings.hpp>
+#include <llmr/geometry/debug_font_buffer.hpp>
+#include <llmr/platform/gl.hpp>
 #include <llmr/style/style.hpp>
-
-#include <cmath>
-#include <array>
-#include <numeric>
-#include <algorithm>
+#include <llmr/style/sprite.hpp>
 
 using namespace llmr;