diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-14 21:02:01 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-14 21:02:01 -0400 |
commit | b563953a4846bab720cae17ef4ab5a8296730c7c (patch) | |
tree | e585bda1e4a8b979c8864cd25a84f663122c83b7 /tools | |
parent | 6b1dcc5df51df4a2d8b724187eb1bcdb4fd9df8b (diff) | |
download | therapy-b563953a4846bab720cae17ef4ab5a8296730c7c.tar.gz therapy-b563953a4846bab720cae17ef4ab5a8296730c7c.tar.bz2 therapy-b563953a4846bab720cae17ef4ab5a8296730c7c.zip |
Started writing map editor
Diffstat (limited to 'tools')
-rw-r--r-- | tools/mapedit/CMakeLists.txt | 45 | ||||
-rw-r--r-- | tools/mapedit/src/main.cpp | 54 | ||||
-rw-r--r-- | tools/mapedit/src/map.cpp | 94 | ||||
-rw-r--r-- | tools/mapedit/src/map.h | 44 |
4 files changed, 237 insertions, 0 deletions
diff --git a/tools/mapedit/CMakeLists.txt b/tools/mapedit/CMakeLists.txt new file mode 100644 index 0000000..9a024c8 --- /dev/null +++ b/tools/mapedit/CMakeLists.txt | |||
@@ -0,0 +1,45 @@ | |||
1 | cmake_minimum_required(VERSION 2.6) | ||
2 | project(AromatherapyMapEditor) | ||
3 | |||
4 | set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${AromatherapyMapEditor_SOURCE_DIR}/cmake") | ||
5 | # Set an output directory for our binaries | ||
6 | set(BIN_DIR ${AromatherapyMapEditor_SOURCE_DIR}/bin) | ||
7 | |||
8 | # Bump up warning levels appropriately for clang, gcc & msvc | ||
9 | # Also set debug/optimization flags depending on the build type. IDE users choose this when | ||
10 | # selecting the build mode in their IDE | ||
11 | if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") | ||
12 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11") | ||
13 | set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g") | ||
14 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2") | ||
15 | elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") | ||
16 | if (CMAKE_CXX_FLAGS MATCHES "/W[0-4]") | ||
17 | string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") | ||
18 | else() | ||
19 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") | ||
20 | endif() | ||
21 | endif() | ||
22 | |||
23 | # Look up SDL2 and add the include directory to our include path | ||
24 | find_package(wxWidgets REQUIRED core base) | ||
25 | include(${wxWidgets_USE_FILE}) | ||
26 | |||
27 | find_package(libxml2 REQUIRED) | ||
28 | |||
29 | set(ALL_LIBS | ||
30 | ${wxWidgets_LIBRARIES} | ||
31 | ${LIBXML2_LIBRARIES} | ||
32 | ) | ||
33 | |||
34 | include_directories( | ||
35 | ${LIBXML2_INCLUDE_DIR} | ||
36 | src | ||
37 | ) | ||
38 | |||
39 | set(CMAKE_BUILD_TYPE Debug) | ||
40 | add_executable(AromatherapyMapEditor | ||
41 | src/main.cpp | ||
42 | src/map.cpp | ||
43 | ) | ||
44 | target_link_libraries(AromatherapyMapEditor ${ALL_LIBS}) | ||
45 | install(TARGETS AromatherapyMapEditor RUNTIME DESTINATION ${BIN_DIR}) | ||
diff --git a/tools/mapedit/src/main.cpp b/tools/mapedit/src/main.cpp new file mode 100644 index 0000000..09be151 --- /dev/null +++ b/tools/mapedit/src/main.cpp | |||
@@ -0,0 +1,54 @@ | |||
1 | #include <wx/wxprec.h> | ||
2 | |||
3 | #ifndef WX_PRECOMP | ||
4 | #include <wx/wx.h> | ||
5 | #endif | ||
6 | |||
7 | #include "map.h" | ||
8 | |||
9 | class MapeditApp : public wxApp { | ||
10 | public: | ||
11 | virtual bool OnInit(); | ||
12 | }; | ||
13 | |||
14 | class MapeditFrame : public wxFrame { | ||
15 | public: | ||
16 | MapeditFrame() : MapeditFrame(Map()) {} | ||
17 | MapeditFrame(Map map); | ||
18 | |||
19 | private: | ||
20 | void OnExit(wxCommandEvent& event); | ||
21 | |||
22 | Map map; | ||
23 | |||
24 | wxDECLARE_EVENT_TABLE(); | ||
25 | }; | ||
26 | |||
27 | wxBEGIN_EVENT_TABLE(MapeditFrame, wxFrame) | ||
28 | EVT_MENU(wxID_EXIT, MapeditFrame::OnExit) | ||
29 | wxEND_EVENT_TABLE() | ||
30 | |||
31 | wxIMPLEMENT_APP(MapeditApp); | ||
32 | |||
33 | bool MapeditApp::OnInit() | ||
34 | { | ||
35 | MapeditFrame* frame = new MapeditFrame(); | ||
36 | frame->Show(true); | ||
37 | return true; | ||
38 | } | ||
39 | |||
40 | MapeditFrame::MapeditFrame(Map map) : wxFrame(NULL, wxID_ANY, "Map Editor", wxPoint(50, 50), wxSize(450, 340)), map(map) | ||
41 | { | ||
42 | wxMenu* menuFile = new wxMenu; | ||
43 | menuFile->Append(wxID_EXIT); | ||
44 | |||
45 | wxMenuBar* menuBar = new wxMenuBar; | ||
46 | menuBar->Append(menuFile, "&File"); | ||
47 | |||
48 | SetMenuBar(menuBar); | ||
49 | } | ||
50 | |||
51 | void MapeditFrame::OnExit(wxCommandEvent& event) | ||
52 | { | ||
53 | Close(true); | ||
54 | } | ||
diff --git a/tools/mapedit/src/map.cpp b/tools/mapedit/src/map.cpp new file mode 100644 index 0000000..52a2096 --- /dev/null +++ b/tools/mapedit/src/map.cpp | |||
@@ -0,0 +1,94 @@ | |||
1 | #include "map.h" | ||
2 | #include <libxml/parser.h> | ||
3 | |||
4 | Map::Map() | ||
5 | { | ||
6 | mapdata = (int*) calloc(MAP_WIDTH * MAP_HEIGHT, sizeof(int)); | ||
7 | } | ||
8 | |||
9 | Map::Map(const std::string filename) | ||
10 | { | ||
11 | xmlDocPtr doc = xmlParseFile(filename.c_str()); | ||
12 | if (doc == nullptr) | ||
13 | { | ||
14 | throw MapLoadException(filename); | ||
15 | } | ||
16 | |||
17 | xmlNodePtr top = xmlDocGetRootElement(doc); | ||
18 | if (top == nullptr) | ||
19 | { | ||
20 | throw MapLoadException(filename); | ||
21 | } | ||
22 | |||
23 | if (xmlStrcmp(top->name, (const xmlChar*) "map-def")) | ||
24 | { | ||
25 | throw MapLoadException(filename); | ||
26 | } | ||
27 | |||
28 | for (xmlNodePtr node = top->xmlChildrenNode; node != NULL; node = node->next) | ||
29 | { | ||
30 | if (!xmlStrcmp(node->name, (const xmlChar*) "name")) | ||
31 | { | ||
32 | xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1); | ||
33 | title = (char*) key; | ||
34 | xmlFree(key); | ||
35 | } else if (!xmlStrcmp(node->name, (const xmlChar*) "environment")) | ||
36 | { | ||
37 | xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1); | ||
38 | mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int)); | ||
39 | mapdata[0] = atoi(strtok((char*) key, ",\n")); | ||
40 | for (int i=1; i<(MAP_WIDTH*MAP_HEIGHT); i++) | ||
41 | { | ||
42 | mapdata[i] = atoi(strtok(NULL, ",\n")); | ||
43 | } | ||
44 | xmlFree(key); | ||
45 | } else if (!xmlStrcmp(node->name, (const xmlChar*) "leftmap")) | ||
46 | { | ||
47 | xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1); | ||
48 | leftmap = (char*) key; | ||
49 | xmlFree(key); | ||
50 | } else if (!xmlStrcmp(node->name, (const xmlChar*) "rightmap")) | ||
51 | { | ||
52 | xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1); | ||
53 | rightmap = (char*) key; | ||
54 | xmlFree(key); | ||
55 | } | ||
56 | } | ||
57 | |||
58 | xmlFreeDoc(doc); | ||
59 | } | ||
60 | |||
61 | Map::Map(const Map& map) | ||
62 | { | ||
63 | mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int)); | ||
64 | memcpy(mapdata, map.mapdata, MAP_WIDTH*MAP_HEIGHT*sizeof(int)); | ||
65 | |||
66 | title = map.title; | ||
67 | leftmap = map.leftmap; | ||
68 | rightmap = map.rightmap; | ||
69 | } | ||
70 | |||
71 | Map::Map(Map&& map) : Map() | ||
72 | { | ||
73 | swap(*this, map); | ||
74 | } | ||
75 | |||
76 | Map::~Map() | ||
77 | { | ||
78 | free(mapdata); | ||
79 | } | ||
80 | |||
81 | Map& Map::operator= (Map map) | ||
82 | { | ||
83 | swap(*this, map); | ||
84 | |||
85 | return *this; | ||
86 | } | ||
87 | |||
88 | void swap(Map& first, Map& second) | ||
89 | { | ||
90 | std::swap(first.mapdata, second.mapdata); | ||
91 | std::swap(first.title, second.title); | ||
92 | std::swap(first.leftmap, second.leftmap); | ||
93 | std::swap(first.rightmap, second.rightmap); | ||
94 | } \ No newline at end of file | ||
diff --git a/tools/mapedit/src/map.h b/tools/mapedit/src/map.h new file mode 100644 index 0000000..83244f3 --- /dev/null +++ b/tools/mapedit/src/map.h | |||
@@ -0,0 +1,44 @@ | |||
1 | #ifndef MAP_H | ||
2 | #define MAP_H | ||
3 | |||
4 | #include <string> | ||
5 | #include <exception> | ||
6 | |||
7 | const int TILE_WIDTH = 8; | ||
8 | const int TILE_HEIGHT = 8; | ||
9 | const int GAME_WIDTH = 320; | ||
10 | const int GAME_HEIGHT = 200; | ||
11 | const int MAP_WIDTH = GAME_WIDTH/TILE_WIDTH; | ||
12 | const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT - 1; | ||
13 | |||
14 | class MapLoadException: public std::exception | ||
15 | { | ||
16 | public: | ||
17 | MapLoadException(std::string mapname) : mapname(mapname) {} | ||
18 | |||
19 | virtual const char* what() const throw() | ||
20 | { | ||
21 | return ("An error occured loading map " + mapname).c_str(); | ||
22 | } | ||
23 | |||
24 | private: | ||
25 | std::string mapname; | ||
26 | }; | ||
27 | |||
28 | class Map { | ||
29 | public: | ||
30 | Map(); | ||
31 | Map(const std::string name); | ||
32 | Map(const Map& map); | ||
33 | Map(Map&& map); | ||
34 | ~Map(); | ||
35 | Map& operator= (Map other); | ||
36 | friend void swap(Map& first, Map& second); | ||
37 | |||
38 | int* mapdata; | ||
39 | std::string title; | ||
40 | std::string leftmap; | ||
41 | std::string rightmap; | ||
42 | }; | ||
43 | |||
44 | #endif | ||