8 files changed, 244 insertions, 7 deletions

@@ -7,7 +7,7 @@ MapCollisionComponent::MapCollisionComponent(const Map& map) : map(map)
   addCollision(-6, 0, GAME_WIDTH, Direction::left, (map.getLeftMap() == nullptr) ? Collision::Type::wrap : Collision::Type::teleport);
   addCollision(GAME_WIDTH+6, 0, GAME_WIDTH, Direction::right, (map.getRightMap() == nullptr) ? Collision::Type::reverse : Collision::Type::teleport);
   
-  for (int i=0; i<MAP_WIDTH*(MAP_HEIGHT-1); i++)
+  for (int i=0; i<MAP_WIDTH*MAP_HEIGHT; i++)
   {
     int x = i % MAP_WIDTH;
     int y = i / MAP_WIDTH;
@@ -8,7 +8,7 @@ MapRenderComponent::MapRenderComponent(const Map& map) : screen(GAME_WIDTH, GAME
   
   Texture tiles("../res/tiles.png");
   
-  for (int i=0; i<MAP_WIDTH*(MAP_HEIGHT-1); i++)
+  for (int i=0; i<MAP_WIDTH*MAP_HEIGHT; i++)
   {
     int tile = map.getMapdata()[i];
     int x = i % MAP_WIDTH;
@@ -14,7 +14,7 @@ const int TILE_HEIGHT = 8;
 const int GAME_WIDTH = 320;
 const int GAME_HEIGHT = 200;
 const int MAP_WIDTH = GAME_WIDTH/TILE_WIDTH;
-const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT;
+const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT - 1;
 
 const int FRAMES_PER_SECOND = 60;
 const double SECONDS_PER_FRAME = 1.0 / FRAMES_PER_SECOND;
@@ -50,9 +50,9 @@ Map::Map(const std::string name)
     } else if (!xmlStrcmp(node->name, (const xmlChar*) "environment"))
     {
       xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-      mapdata = (int*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
+      mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
       mapdata[0] = atoi(strtok((char*) key, ",\n"));
-      for (int i=1; i<(MAP_WIDTH*(MAP_HEIGHT-1)); i++)
+      for (int i=1; i<(MAP_WIDTH*MAP_HEIGHT); i++)
       {
         mapdata[i] = atoi(strtok(NULL, ",\n"));
       }
@@ -100,8 +100,8 @@ Map::Map(const std::string name)
 
 Map::Map(const Map& map)
 {
-  mapdata = (int*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
-  memcpy(mapdata, map.mapdata, MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
+  mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
+  memcpy(mapdata, map.mapdata, MAP_WIDTH*MAP_HEIGHT*sizeof(int));
   
   title = (char*) malloc((MAP_WIDTH+1)*sizeof(char));
   strncpy(title, map.title, MAP_WIDTH+1);
@@ -0,0 +1,45 @@
+cmake_minimum_required(VERSION 2.6)
+project(AromatherapyMapEditor)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${AromatherapyMapEditor_SOURCE_DIR}/cmake")
+# Set an output directory for our binaries
+set(BIN_DIR ${AromatherapyMapEditor_SOURCE_DIR}/bin)
+
+# Bump up warning levels appropriately for clang, gcc & msvc
+# Also set debug/optimization flags depending on the build type. IDE users choose this when
+# selecting the build mode in their IDE
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11")
+        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g")
+        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2")
+elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+        if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+                string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+        else()
+                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+        endif()
+endif()
+
+# Look up SDL2 and add the include directory to our include path
+find_package(wxWidgets REQUIRED core base)
+include(${wxWidgets_USE_FILE})
+
+find_package(libxml2 REQUIRED)
+
+set(ALL_LIBS
+  ${wxWidgets_LIBRARIES}
+  ${LIBXML2_LIBRARIES}
+)
+
+include_directories(
+  ${LIBXML2_INCLUDE_DIR}
+  src
+)
+
+set(CMAKE_BUILD_TYPE Debug)
+add_executable(AromatherapyMapEditor
+  src/main.cpp
+  src/map.cpp
+)
+target_link_libraries(AromatherapyMapEditor ${ALL_LIBS})
+install(TARGETS AromatherapyMapEditor RUNTIME DESTINATION ${BIN_DIR})
@@ -0,0 +1,54 @@
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#include "map.h"
+
+class MapeditApp : public wxApp {
+  public:
+    virtual bool OnInit();
+};
+
+class MapeditFrame : public wxFrame {
+  public:
+    MapeditFrame() : MapeditFrame(Map()) {}
+    MapeditFrame(Map map);
+    
+  private:
+    void OnExit(wxCommandEvent& event);
+    
+    Map map;
+    
+    wxDECLARE_EVENT_TABLE();
+};
+
+wxBEGIN_EVENT_TABLE(MapeditFrame, wxFrame)
+  EVT_MENU(wxID_EXIT, MapeditFrame::OnExit)
+wxEND_EVENT_TABLE()
+
+wxIMPLEMENT_APP(MapeditApp);
+
+bool MapeditApp::OnInit()
+{
+  MapeditFrame* frame = new MapeditFrame();
+  frame->Show(true);
+  return true;
+}
+
+MapeditFrame::MapeditFrame(Map map) : wxFrame(NULL, wxID_ANY, "Map Editor", wxPoint(50, 50), wxSize(450, 340)), map(map)
+{
+  wxMenu* menuFile = new wxMenu;
+  menuFile->Append(wxID_EXIT);
+
+  wxMenuBar* menuBar = new wxMenuBar;
+  menuBar->Append(menuFile, "&File");
+  
+  SetMenuBar(menuBar);
+}
+
+void MapeditFrame::OnExit(wxCommandEvent& event)
+{
+  Close(true);
+}
@@ -0,0 +1,94 @@
+#include "map.h"
+#include <libxml/parser.h>
+
+Map::Map()
+{
+  mapdata = (int*) calloc(MAP_WIDTH * MAP_HEIGHT, sizeof(int));
+}
+
+Map::Map(const std::string filename)
+{
+  xmlDocPtr doc = xmlParseFile(filename.c_str());
+  if (doc == nullptr)
+  {
+    throw MapLoadException(filename);
+  }
+  
+  xmlNodePtr top = xmlDocGetRootElement(doc);
+  if (top == nullptr)
+  {
+    throw MapLoadException(filename);
+  }
+  
+  if (xmlStrcmp(top->name, (const xmlChar*) "map-def"))
+  {
+    throw MapLoadException(filename);
+  }
+  
+  for (xmlNodePtr node = top->xmlChildrenNode; node != NULL; node = node->next)
+  {
+    if (!xmlStrcmp(node->name, (const xmlChar*) "name"))
+    {
+      xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
+      title = (char*) key;
+      xmlFree(key);
+    } else if (!xmlStrcmp(node->name, (const xmlChar*) "environment"))
+    {
+      xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
+      mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
+      mapdata[0] = atoi(strtok((char*) key, ",\n"));
+      for (int i=1; i<(MAP_WIDTH*MAP_HEIGHT); i++)
+      {
+        mapdata[i] = atoi(strtok(NULL, ",\n"));
+      }
+      xmlFree(key);
+    } else if (!xmlStrcmp(node->name, (const xmlChar*) "leftmap"))
+    {
+      xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
+      leftmap = (char*) key;
+      xmlFree(key);
+    } else if (!xmlStrcmp(node->name, (const xmlChar*) "rightmap"))
+    {
+      xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
+      rightmap = (char*) key;
+      xmlFree(key);
+    }
+  }
+  
+  xmlFreeDoc(doc);
+}
+
+Map::Map(const Map& map)
+{
+  mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
+  memcpy(mapdata, map.mapdata, MAP_WIDTH*MAP_HEIGHT*sizeof(int));
+  
+  title = map.title;
+  leftmap = map.leftmap;
+  rightmap = map.rightmap;
+}
+
+Map::Map(Map&& map) : Map()
+{
+  swap(*this, map);
+}
+
+Map::~Map()
+{
+  free(mapdata);
+}
+
+Map& Map::operator= (Map map)
+{
+  swap(*this, map);
+  
+  return *this;
+}
+
+void swap(Map& first, Map& second)
+{
+  std::swap(first.mapdata, second.mapdata);
+  std::swap(first.title, second.title);
+  std::swap(first.leftmap, second.leftmap);
+  std::swap(first.rightmap, second.rightmap);
+}
\ No newline at end of file
@@ -0,0 +1,44 @@
+#ifndef MAP_H
+#define MAP_H
+
+#include <string>
+#include <exception>
+
+const int TILE_WIDTH = 8;
+const int TILE_HEIGHT = 8;
+const int GAME_WIDTH = 320;
+const int GAME_HEIGHT = 200;
+const int MAP_WIDTH = GAME_WIDTH/TILE_WIDTH;
+const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT - 1;
+
+class MapLoadException: public std::exception
+{
+  public:
+    MapLoadException(std::string mapname) : mapname(mapname) {}
+    
+    virtual const char* what() const throw()
+    {
+      return ("An error occured loading map " + mapname).c_str();
+    }
+    
+  private:
+    std::string mapname;
+};
+
+class Map {
+  public:
+    Map();
+    Map(const std::string name);
+    Map(const Map& map);
+    Map(Map&& map);
+    ~Map();
+    Map& operator= (Map other);
+    friend void swap(Map& first, Map& second);
+    
+    int* mapdata;
+    std::string title;
+    std::string leftmap;
+    std::string rightmap;
+};
+
+#endif