From 8016a7146fec3f6f43ca05723441750e5aae3d4d Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 28 Apr 2018 09:22:44 -0400
Subject: Restructured the way the world is loaded

The World class was removed and replaced by the RealizingSystem and RealizableComponent. The realizable entity is intended to be a singleton and to represent the world. The Map class was also removed and integrated into the MappableComponent.

These changes are to facilitate implementation of map objects without needing special intermediary objects (including the Map class). Now, map entities are created as soon as the world is created, and map object entities will be as well. They will simply be deactivated while the map is not active. Multiple players are now slightly better supported, which will be important in the future.

This will likely become inefficient as the world becomes bigger, and some sort of sector-loading process will have to be designed. This also reduces the usefulness of EntityManager's entity-searching capabilities (which are not the most efficiently implemented currently anyway), and will likely in the future require some added functionality to better search subsets of entities.

A lot of the components were also rewritten to use bare member variables instead of accessor methods, as they never had special functionality and just took up space. These components were also documented.
---
 src/world.cpp | 155 ----------------------------------------------------------
 1 file changed, 155 deletions(-)
 delete mode 100644 src/world.cpp

(limited to 'src/world.cpp')

diff --git a/src/world.cpp b/src/world.cpp
deleted file mode 100644
index 3b6bd41..0000000
--- a/src/world.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "world.h"
-#include <libxml/parser.h>
-#include <stdexcept>
-#include <cstring>
-#include "consts.h"
-
-inline xmlChar* getProp(xmlNodePtr node, const char* attr)
-{
-  xmlChar* key = xmlGetProp(node, reinterpret_cast<const xmlChar*>(attr));
-  if (key == nullptr)
-  {
-    throw std::invalid_argument("Error parsing world file");
-  }
-
-  return key;
-}
-
-World::World(std::string filename)
-{
-  xmlDocPtr doc = xmlParseFile(filename.c_str());
-  if (doc == nullptr)
-  {
-    throw std::invalid_argument("Cannot find world file");
-  }
-
-  xmlNodePtr top = xmlDocGetRootElement(doc);
-  if (top == nullptr)
-  {
-    throw std::invalid_argument("Error parsing world file");
-  }
-
-  if (xmlStrcmp(top->name, reinterpret_cast<const xmlChar*>("world")))
-  {
-    throw std::invalid_argument("Error parsing world file");
-  }
-
-  xmlChar* key = nullptr;
-
-  key = getProp(top, "startx");
-  startX_ = atoi(reinterpret_cast<char*>(key));
-  xmlFree(key);
-
-  key = getProp(top, "starty");
-  startY_ = atoi(reinterpret_cast<char*>(key));
-  xmlFree(key);
-
-  key = getProp(top, "startmap");
-  startMap_ = atoi(reinterpret_cast<char*>(key));
-  xmlFree(key);
-
-  for (xmlNodePtr node = top->xmlChildrenNode;
-    node != nullptr;
-    node = node->next)
-  {
-    if (!xmlStrcmp(node->name, reinterpret_cast<const xmlChar*>("map")))
-    {
-      key = getProp(node, "id");
-      size_t mapId = atoi(reinterpret_cast<char*>(key));
-      xmlFree(key);
-
-      key = getProp(node, "title");
-      std::string mapTitle(reinterpret_cast<char*>(key));
-      xmlFree(key);
-
-      std::vector<int> mapTiles;
-      Map::Adjacent leftAdj;
-      Map::Adjacent rightAdj;
-      Map::Adjacent upAdj;
-      Map::Adjacent downAdj;
-
-      for (xmlNodePtr mapNode = node->xmlChildrenNode;
-        mapNode != nullptr;
-        mapNode = mapNode->next)
-      {
-        if (!xmlStrcmp(
-          mapNode->name,
-          reinterpret_cast<const xmlChar*>("environment")))
-        {
-          key = xmlNodeGetContent(mapNode);
-
-          mapTiles.clear();
-          mapTiles.push_back(atoi(strtok(reinterpret_cast<char*>(key), ",\n")));
-          for (size_t i = 1; i < (MAP_WIDTH * MAP_HEIGHT); i++)
-          {
-            mapTiles.push_back(atoi(strtok(nullptr, ",\n")));
-          }
-
-          xmlFree(key);
-        } else if (!xmlStrcmp(
-          mapNode->name,
-          reinterpret_cast<const xmlChar*>("adjacent")))
-        {
-          key = getProp(mapNode, "type");
-          std::string adjTypeStr(reinterpret_cast<char*>(key));
-          xmlFree(key);
-
-          Map::Adjacent::Type adjType;
-          if (adjTypeStr == "wall")
-          {
-            adjType = Map::Adjacent::Type::wall;
-          } else if (adjTypeStr == "wrap")
-          {
-            adjType = Map::Adjacent::Type::wrap;
-          } else if (adjTypeStr == "warp")
-          {
-            adjType = Map::Adjacent::Type::warp;
-          } else if (adjTypeStr == "reverseWarp")
-          {
-            adjType = Map::Adjacent::Type::reverse;
-          } else {
-            throw std::logic_error("Invalid adjacency type");
-          }
-
-          key = getProp(mapNode, "map");
-          int adjMapId = atoi(reinterpret_cast<char*>(key));
-          xmlFree(key);
-
-          key = getProp(mapNode, "dir");
-          std::string adjDir(reinterpret_cast<char*>(key));
-          xmlFree(key);
-
-          if (adjDir == "left")
-          {
-            leftAdj = {adjType, adjMapId};
-          } else if (adjDir == "right")
-          {
-            rightAdj = {adjType, adjMapId};
-          } else if (adjDir == "up")
-          {
-            upAdj = {adjType, adjMapId};
-          } else if (adjDir == "down")
-          {
-            downAdj = {adjType, adjMapId};
-          } else {
-            throw std::logic_error("Invalid adjacency direction");
-          }
-        }
-      }
-
-      maps_.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(mapId),
-        std::forward_as_tuple(
-          mapId,
-          std::move(mapTiles),
-          std::move(mapTitle),
-          leftAdj,
-          rightAdj,
-          upAdj,
-          downAdj));
-    }
-  }
-
-  xmlFreeDoc(doc);
-}
-- 
cgit 1.4.1