Rename from "awesome_game" to "travels"

lefticus · lefticus · commit 37674aa77f48 · 2022-06-06T14:56:09.000-07:00
diff --git a/resources/travels/attributions.md b/resources/travels/attributions.md
diff --git a/resources/travels/tiled/maps.tiled-project b/resources/travels/tiled/maps.tiled-project
diff --git a/resources/travels/tiled/maps.tiled-session b/resources/travels/tiled/maps.tiled-session
diff --git a/resources/travels/tiled/tiles/8x8 fantasytiles.png b/resources/travels/tiled/tiles/8x8 fantasytiles.png
diff --git a/resources/travels/tiled/tiles/8x8 fantasytiles.tsj b/resources/travels/tiled/tiles/8x8 fantasytiles.tsj
diff --git a/resources/travels/tiled/tiles/Map.tmj b/resources/travels/tiled/tiles/Map.tmj
diff --git a/resources/travels/tiled/tiles/Store.tmj b/resources/travels/tiled/tiles/Store.tmj
diff --git a/src/bitmap.cpp b/src/bitmap.cpp
@@ -2,7 +2,7 @@
 
 #include "bitmap.hpp"
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 Vector2D<Color> load_png(const std::filesystem::path &filename)
 {
   std::vector<unsigned char> image;// the raw pixels
@@ -35,4 +35,4 @@ Vector2D<Color> load_png(const std::filesystem::path &filename)
 
   return results;
 }
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
diff --git a/src/bitmap.hpp b/src/bitmap.hpp
@@ -9,7 +9,7 @@
 #include "vector2d.hpp"
 #include <fmt/format.h>
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 // A simple way of representing a bitmap on screen using only characters
 struct Bitmap : ftxui::Node
@@ -42,6 +42,6 @@ struct Bitmap : ftxui::Node
 
 Vector2D<Color> load_png(const std::filesystem::path &filename);
 
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// AWESOME_GAME_BITMAP_HPP
diff --git a/src/color.hpp b/src/color.hpp
@@ -8,7 +8,7 @@
 
 
 // Todo: move this into `tools` project?
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 template<typename Type> struct Basic_Color;
 
 template<typename OutType, typename InType>
@@ -84,6 +84,6 @@ template<typename Type> struct Basic_Color
 };
 
 using Color = Basic_Color<std::uint8_t>;
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// AWESOME_GAME_COLOR_HPP
diff --git a/src/game.cpp b/src/game.cpp
@@ -3,11 +3,11 @@
 #include "game_components.hpp"
 #include <set>
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 Game_Map make_map(const std::vector<std::filesystem::path> &search_directories)
 {
-  auto map = load_tiled_map("awesome_game/tiled/tiles/Map.tmj", search_directories);
+  auto map = load_tiled_map("travels/tiled/tiles/Map.tmj", search_directories);
 
   map.locations.at(Point{ 4, 5 }).can_enter// NOLINT magic numbers
     = [](const Game &, Point, Direction) { return true; };
@@ -28,7 +28,7 @@ Game_Map make_map(const std::vector<std::filesystem::path> &search_directories)
 
 Game_Map make_store(const std::vector<std::filesystem::path> &search_directories)
 {
-  auto map = load_tiled_map("awesome_game/tiled/tiles/Store.tmj", search_directories);
+  auto map = load_tiled_map("travels/tiled/tiles/Store.tmj", search_directories);
 
   map.locations.at(Point{ 7, 6 }).enter_action// NOLINT magic numbers
     = [](Game &game, Point, Direction) {
@@ -88,4 +88,4 @@ Game make_game(const std::vector<std::filesystem::path> &search_directories)
 
   return retval;
 }
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
diff --git a/src/game.hpp b/src/game.hpp
@@ -4,13 +4,13 @@
 #include <vector>
 #include <filesystem>
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 struct Game;
 
 Game make_game(const std::vector<std::filesystem::path> &search_directories);
 
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 
 #endif
diff --git a/src/game_components.cpp b/src/game_components.cpp
@@ -12,7 +12,7 @@
 #pragma warning(default : 4189)
 #endif
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 Game_Map load_tiled_map(const std::filesystem::path &map_json, const std::vector<std::filesystem::path> &search_paths)
 {
@@ -204,4 +204,4 @@ Menu::MenuItem check_flag(std::string text, std::string message, variable var)
 }
 
 
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
diff --git a/src/game_components.hpp b/src/game_components.hpp
@@ -13,7 +13,7 @@
 #include "tile_set.hpp"
 #include "vector2d.hpp"
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 struct Game;
 
@@ -257,6 +257,6 @@ Menu::MenuItem exit_menu();
 Menu::MenuItem set_flag(std::string text, std::string message, variable var);
 Menu::MenuItem check_flag(std::string text, std::string message, variable var);
 
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// AWESOME_GAME_GAME_COMPONENTS_HPP
diff --git a/src/game_hacking_lesson_00.cpp b/src/game_hacking_lesson_00.cpp
@@ -3,7 +3,7 @@
 #include "game_components.hpp"
 
 
-namespace lefticus::awesome_game::hacking::lesson_00 {
+namespace lefticus::travels::hacking::lesson_00 {
 Game_Map make_map()// NOLINT cognitive complexity
 {
   Game_Map map{ Size{ 10, 10 } };// NOLINT magic numbers
@@ -187,4 +187,4 @@ Game make_lesson()
 
   return retval;
 }
-}// namespace lefticus::awesome_game::hacking::lesson_00
+}// namespace lefticus::travels::hacking::lesson_00
diff --git a/src/game_hacking_lesson_00.hpp b/src/game_hacking_lesson_00.hpp
@@ -1,13 +1,13 @@
 #ifndef AWESOME_GAME_GAME_HACKING_LESSON_00_HPP
 #define AWESOME_GAME_GAME_HACKING_LESSON_00_HPP
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 struct Game;
 
 namespace hacking::lesson_00 {
   Game make_lesson();
 }
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 
 #endif// AWESOME_GAME_GAME_HACKING_LESSON_00_HPP
diff --git a/src/game_hacking_lesson_01.cpp b/src/game_hacking_lesson_01.cpp
@@ -3,7 +3,7 @@
 #include "game_components.hpp"
 
 
-namespace lefticus::awesome_game::hacking::lesson_01 {
+namespace lefticus::travels::hacking::lesson_01 {
 
 bool button_pressed(const Game &game) { return get<bool>(game.variables.at("ButtonPressed")); }
 
@@ -187,4 +187,4 @@ Game make_lesson()
 
   return retval;
 }
-}// namespace lefticus::awesome_game::hacking::lesson_01
+}// namespace lefticus::travels::hacking::lesson_01
diff --git a/src/game_hacking_lesson_01.hpp b/src/game_hacking_lesson_01.hpp
@@ -1,7 +1,7 @@
 #ifndef AWESOME_GAME_GAME_HACKING_LESSON_01_HPP
 #define AWESOME_GAME_GAME_HACKING_LESSON_01_HPP
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 struct Game;
 
@@ -10,7 +10,7 @@ namespace hacking::lesson_01 {
   Game make_lesson();
 
 }
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 
 #endif// AWESOME_GAME_GAME_HACKING_LESSON_01_HPP
diff --git a/src/game_hacking_lesson_02.cpp b/src/game_hacking_lesson_02.cpp
@@ -3,7 +3,7 @@
 #include "game_components.hpp"
 #include <set>
 
-namespace lefticus::awesome_game::hacking::lesson_02 {
+namespace lefticus::travels::hacking::lesson_02 {
 
 Game_Map make_map()// NOLINT cognitive complexity
 {
@@ -176,4 +176,4 @@ Game make_lesson()
 
   return retval;
 }
-}// namespace lefticus::awesome_game::hacking::lesson_02
+}// namespace lefticus::travels::hacking::lesson_02
diff --git a/src/game_hacking_lesson_02.hpp b/src/game_hacking_lesson_02.hpp
@@ -1,7 +1,7 @@
 #ifndef AWESOME_GAME_GAME_HACKING_LESSON_02_HPP
 #define AWESOME_GAME_GAME_HACKING_LESSON_02_HPP
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 struct Game;
 
@@ -10,7 +10,7 @@ namespace hacking::lesson_02 {
   Game make_lesson();
 
 }
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 
 #endif// AWESOME_GAME_GAME_HACKING_LESSON_01_HPP
diff --git a/src/main.cpp b/src/main.cpp
@@ -35,7 +35,7 @@
 #include <internal_use_only/config.hpp>
 
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 
 void draw(Bitmap &viewport, Point map_center, const Game &game, const Game_Map &map)
@@ -278,7 +278,7 @@ void play_game(Game &game, std::shared_ptr<log_sink<std::mutex>> log_sink)// NOL
 
   auto container = ftxui::Container::Vertical({});
 
-  auto key_press = lefticus::awesome_game::CatchEvent(container, [&](const ftxui::Event &event) {
+  auto key_press = lefticus::travels::CatchEvent(container, [&](const ftxui::Event &event) {
     events.push_back(event);
     return false;
   });
@@ -428,7 +428,7 @@ void play_game(Game &game, std::shared_ptr<log_sink<std::mutex>> log_sink)// NOL
   refresh_ui_continue = false;
   refresh_ui.join();
 }
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 
 std::vector<std::filesystem::path> resource_search_directories()
@@ -453,12 +453,12 @@ int main(int argc, const char **argv)
 {
   try {
     static constexpr auto USAGE =
-      R"(awesome_game
+      R"(travels
 
     Usage:
-          awesome_game
-          awesome_game (-h | --help)
-          awesome_game --version
+          travels
+          travels (-h | --help)
+          travels --version
  Options:
           -h --help     Show this screen.
           --version     Show version.
@@ -475,18 +475,18 @@ int main(int argc, const char **argv)
                                                   // from config.hpp via CMake
 
     // to start the lessons, comment out this line
-    auto game = lefticus::awesome_game::make_game(resource_search_directories());
+    auto game = lefticus::travels::make_game(resource_search_directories());
 
     // and uncomment this line
-    //auto game = lefticus::awesome_game::hacking::lesson_00::make_lesson();
+    //auto game = lefticus::travels::hacking::lesson_00::make_lesson();
 
     // we want to take over as the main spdlog sink
-    auto log_sink = std::make_shared<lefticus::awesome_game::log_sink<std::mutex>>();
+    auto log_sink = std::make_shared<lefticus::travels::log_sink<std::mutex>>();
 
     spdlog::set_default_logger(std::make_shared<spdlog::logger>("default", log_sink));
 
     spdlog::set_level(spdlog::level::trace);
-    lefticus::awesome_game::play_game(game, log_sink);
+    lefticus::travels::play_game(game, log_sink);
   } catch (const std::exception &e) {
     fmt::print("Unhandled exception in main: {}", e.what());
   }
diff --git a/src/point.hpp b/src/point.hpp
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 struct Point
 {
   std::size_t x;
@@ -22,6 +22,6 @@ struct Point
 
   friend auto operator<=>(const Point &, const Point &) = default;
 };
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// AWESOME_GAME_POINT_HPP
diff --git a/src/size.hpp b/src/size.hpp
@@ -3,12 +3,12 @@
 
 #include <cstdint>
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 struct Size
 {
   std::size_t width;
   std::size_t height;
 };
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// AWESOME_GAME_SIZE_HPP
diff --git a/src/tile_set.hpp b/src/tile_set.hpp
@@ -9,7 +9,7 @@
 #include "color.hpp"
 
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 struct Tile_Set
 {
@@ -47,6 +47,6 @@ struct Tile_Set
   std::size_t start_id;
 };
 
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// MY_AWESOME_GAME_TILE_SET_HPP
diff --git a/src/vector2d.hpp b/src/vector2d.hpp
@@ -9,7 +9,7 @@
 #include "size.hpp"
 
 
-namespace lefticus::awesome_game {
+namespace lefticus::travels {
 
 
 template<typename Contained> class Vector2D
@@ -139,6 +139,6 @@ void fill_line(auto &vector2d, Point from, const Point to, const auto &value)
 }
 
 
-}// namespace lefticus::awesome_game
+}// namespace lefticus::travels
 
 #endif// AWESOME_GAME_VECTOR2D_HPP

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include "bitmap.hpp"`
`4`	`4`
`5`		`-namespace lefticus::awesome_game {`
	`5`	`+namespace lefticus::travels {`
`6`	`6`	`Vector2D<Color> load_png(const std::filesystem::path &filename)`
`7`	`7`	`{`
`8`	`8`	`std::vector<unsigned char> image;// the raw pixels`
`@@ -35,4 +35,4 @@ Vector2D<Color> load_png(const std::filesystem::path &filename)`
`35`	`35`
`36`	`36`	`return results;`
`37`	`37`	`}`
`38`		`-}// namespace lefticus::awesome_game`
	`38`	`+}// namespace lefticus::travels`