diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-15 23:24:22 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-15 23:24:22 -0400 |
commit | 213cab3c04b81428ab715f340bd7c12438fdb980 (patch) | |
tree | 295d25eac4b94357ac5b9bb4b3fd03130181b956 /tools/mapedit/src/widget.h | |
parent | 25240241e91dc913d20fbb93aa4acc9433dda6a0 (diff) | |
download | therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.gz therapy-213cab3c04b81428ab715f340bd7c12438fdb980.tar.bz2 therapy-213cab3c04b81428ab715f340bd7c12438fdb980.zip |
Map editor can now add entities to maps
Also fixed a big bug regarding scrolling
Diffstat (limited to 'tools/mapedit/src/widget.h')
-rw-r--r-- | tools/mapedit/src/widget.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/mapedit/src/widget.h b/tools/mapedit/src/widget.h index c8bfb57..9de5b02 100644 --- a/tools/mapedit/src/widget.h +++ b/tools/mapedit/src/widget.h | |||
@@ -10,6 +10,13 @@ | |||
10 | #include "map.h" | 10 | #include "map.h" |
11 | #include "tile_widget.h" | 11 | #include "tile_widget.h" |
12 | 12 | ||
13 | class MapeditFrame; | ||
14 | |||
15 | enum EditMode { | ||
16 | EditTiles, | ||
17 | EditEntities | ||
18 | }; | ||
19 | |||
13 | class MapeditWidget : public wxScrolledWindow { | 20 | class MapeditWidget : public wxScrolledWindow { |
14 | public: | 21 | public: |
15 | MapeditWidget(); | 22 | MapeditWidget(); |
@@ -17,6 +24,11 @@ class MapeditWidget : public wxScrolledWindow { | |||
17 | 24 | ||
18 | void ZoomIn(); | 25 | void ZoomIn(); |
19 | void ZoomOut(); | 26 | void ZoomOut(); |
27 | void SetEditMode(EditMode editMode); | ||
28 | void StartAddingEntity(MapObject* object); | ||
29 | void CancelAddingEntity(); | ||
30 | |||
31 | MapeditFrame* frame; | ||
20 | 32 | ||
21 | protected: | 33 | protected: |
22 | void Init(); | 34 | void Init(); |
@@ -38,9 +50,12 @@ class MapeditWidget : public wxScrolledWindow { | |||
38 | int scale; | 50 | int scale; |
39 | wxPoint mousePos; | 51 | wxPoint mousePos; |
40 | bool mouseIsIn = false; | 52 | bool mouseIsIn = false; |
53 | EditMode editMode = EditTiles; | ||
54 | |||
55 | MapObject* addingEntity = nullptr; | ||
41 | 56 | ||
42 | DECLARE_DYNAMIC_CLASS(MapeditWidget); | 57 | DECLARE_DYNAMIC_CLASS(MapeditWidget) |
43 | DECLARE_EVENT_TABLE(); | 58 | DECLARE_EVENT_TABLE() |
44 | }; | 59 | }; |
45 | 60 | ||
46 | #endif | 61 | #endif |