8 files changed, 126 insertions, 19 deletions

@@ -301,6 +301,13 @@ void MapeditFrame::OnCancelAddEntity(wxCommandEvent&)
   mapEditor->CancelAddingEntity();
 }
 
+void MapeditFrame::StartAddingEntity()
+{
+  addingEntity = true;
+  addEntityButton->Disable();
+  cancelEntityButton->Enable();
+}
+
 void MapeditFrame::FinishAddingEntity()
 {
   addingEntity = false;
@@ -19,6 +19,7 @@ class MapeditFrame : public wxFrame {
     MapeditFrame(Map map, std::string filename);
     
     MapeditWidget* GetMapEditor();
+    void StartAddingEntity();
     void FinishAddingEntity();
     
     static void NewMap();
@@ -60,18 +60,19 @@ Map::Map(std::string filename)
       {
         if (!xmlStrcmp(entityNode->name, (const xmlChar*) "entity"))
         {
-          MapObjectEntry data;
+          auto data = std::make_shared<MapObjectEntry>();
+          
           for (xmlNodePtr entityDataNode = entityNode->xmlChildrenNode; entityDataNode != NULL; entityDataNode = entityDataNode->next)
           {
             if (!xmlStrcmp(entityDataNode->name, (const xmlChar*) "entity-type"))
             {
               xmlChar* key = xmlNodeListGetString(doc, entityDataNode->xmlChildrenNode, 1);
-              data.object = MapObject::getAllObjects().at((char*) key).get();
+              data->object = MapObject::getAllObjects().at((char*) key).get();
               xmlFree(key);
             } else if (!xmlStrcmp(entityDataNode->name, (const xmlChar*) "entity-position"))
             {
               xmlChar* key = xmlNodeListGetString(doc, entityDataNode->xmlChildrenNode, 1);
-              sscanf((char*) key, "%lf,%lf", &data.position.first, &data.position.second);
+              sscanf((char*) key, "%lf,%lf", &data->position.first, &data->position.second);
               xmlFree(key);
             }
           }
@@ -172,11 +173,11 @@ void Map::save(std::string name)
     rc = xmlTextWriterStartElement(writer, (xmlChar*) "entity");
     if (rc < 0) throw MapWriteException(name);
     
-    rc = xmlTextWriterWriteElement(writer, (xmlChar*) "entity-type", (xmlChar*) object.object->getType().c_str());
+    rc = xmlTextWriterWriteElement(writer, (xmlChar*) "entity-type", (xmlChar*) object->object->getType().c_str());
     if (rc < 0) throw MapWriteException(name);
     
     std::ostringstream entpos_out;
-    entpos_out << object.position.first << "," << object.position.second;
+    entpos_out << object->position.first << "," << object->position.second;
     
     rc = xmlTextWriterWriteElement(writer, (xmlChar*) "entity-position", (xmlChar*) entpos_out.str().c_str());
     if (rc < 0) throw MapWriteException(name);
@@ -226,7 +227,19 @@ void Map::setTitle(std::string title)
   this->title = title;
 }
 
-std::list<MapObjectEntry>& Map::getObjects()
+const std::list<std::shared_ptr<MapObjectEntry>>& Map::getObjects() const
 {
   return objects;
 }
+
+void Map::addObject(std::shared_ptr<MapObjectEntry>& obj)
+{
+  dirty = true;
+  objects.push_back(obj);
+}
+
+void Map::removeObject(std::shared_ptr<MapObjectEntry>& obj)
+{
+  dirty = true;
+  objects.remove(obj);
+}
@@ -46,6 +46,11 @@ class MapWriteException: public std::exception
 struct MapObjectEntry {
   MapObject* object;
   std::pair<double, double> position;
+  
+  bool operator==(MapObjectEntry& other) const
+  {
+    return (object == other.object) && (position == other.position);
+  }
 };
 
 class Map {
@@ -64,10 +69,12 @@ class Map {
     bool hasUnsavedChanges() const;
     void setTileAt(int x, int y, int tile);
     int getTileAt(int x, int y) const;
-    std::list<MapObjectEntry>& getObjects();
+    const std::list<std::shared_ptr<MapObjectEntry>>& getObjects() const;
+    void addObject(std::shared_ptr<MapObjectEntry>& obj);
+    void removeObject(std::shared_ptr<MapObjectEntry>& obj);
     
   private:
-    std::list<MapObjectEntry> objects;
+    std::list<std::shared_ptr<MapObjectEntry>> objects;
     int* mapdata;
     std::string title;
     std::string leftmap;
@@ -10,7 +10,7 @@ const std::map<std::string, std::shared_ptr<MapObject>> MapObject::getAllObjects
 {
   if (!objsInit)
   {
-    DIR* dir = opendir("../../../entities/");
+    DIR* dir = opendir("entities/");
     if (dir != NULL)
     {
       struct dirent* ent;
@@ -37,7 +37,7 @@ MapObject::MapObject(const char* filename)
 {
   type = filename;
   
-  xmlDocPtr doc = xmlParseFile(("../../../entities/" + std::string(filename) + ".xml").c_str());
+  xmlDocPtr doc = xmlParseFile(("entities/" + std::string(filename) + ".xml").c_str());
   if (doc == nullptr) throw MapObjectLoadException(filename);
 
   xmlNodePtr top = xmlDocGetRootElement(doc);
@@ -56,7 +56,7 @@ MapObject::MapObject(const char* filename)
       std::string spriteFile = (char*) key;
       xmlFree(key);
       
-      sprite = wxImage("../../" + spriteFile);
+      sprite = wxImage(spriteFile);
     } else if (!xmlStrcmp(node->name, (const xmlChar*) "action"))
     {
       xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
@@ -26,7 +26,7 @@ int TileWidget::getSelected()
 
 void TileWidget::Init()
 {
-  tiles = wxBitmap(wxImage("../../../res/tiles.png"));
+  tiles = wxBitmap(wxImage("res/tiles.png"));
   
   this->FitInside();
   this->SetScrollRate(5, 5);
@@ -6,6 +6,7 @@ IMPLEMENT_DYNAMIC_CLASS(MapeditWidget,wxScrolledWindow)
 BEGIN_EVENT_TABLE(MapeditWidget, wxScrolledWindow)
         EVT_PAINT(MapeditWidget::OnPaint)
   EVT_LEFT_DOWN(MapeditWidget::OnClick)
+  EVT_RIGHT_DOWN(MapeditWidget::OnRightClick)
   EVT_LEFT_UP(MapeditWidget::OnMouseUp)
   EVT_MOTION(MapeditWidget::OnMouseMove)
   EVT_LEAVE_WINDOW(MapeditWidget::OnMouseOut)
@@ -24,7 +25,7 @@ MapeditWidget::MapeditWidget(wxWindow* parent, wxWindowID winid, Map* map, TileW
 
 void MapeditWidget::Init()
 {
-  tiles = wxBitmap(wxImage("../../../res/tiles.png"));
+  tiles = wxBitmap(wxImage("res/tiles.png"));
   
   this->FitInside();
   this->SetScrollRate(5, 5);
@@ -62,10 +63,18 @@ void MapeditWidget::OnPaint(wxPaintEvent&)
   {
     tiles_dc.SelectObject(wxNullBitmap);
     
-    wxBitmap sprite = object.object->getSprite();
+    wxBitmap sprite = object->object->getSprite();
     tiles_dc.SelectObject(sprite);
     
-    dc.StretchBlit(object.position.first*scale-vX, object.position.second*scale-vY, object.object->getWidth()*scale, object.object->getHeight()*scale, &tiles_dc, 0, 0, object.object->getWidth(), object.object->getHeight());
+    dc.StretchBlit(object->position.first*scale-vX, object->position.second*scale-vY, object->object->getWidth()*scale, object->object->getHeight()*scale, &tiles_dc, 0, 0, object->object->getWidth(), object->object->getHeight());
+    
+    if ((editMode == EditEntities) && (selectedEntity) && (object == selectedEntity))
+    {
+      wxPen pen(*wxGREEN, 2);
+      dc.SetPen(pen);
+      dc.SetBrush(*wxTRANSPARENT_BRUSH);
+      dc.DrawRectangle(object->position.first*scale-vX, object->position.second*scale-vY, object->object->getWidth()*scale, object->object->getHeight()*scale);
+    }
   }
   
   if (editMode == EditTiles)
@@ -140,22 +149,87 @@ void MapeditWidget::OnClick(wxMouseEvent& event)
       int x = (event.GetPosition().x + vX) / scale - (addingEntity->getWidth() / 2);
       int y = (event.GetPosition().y + vY) / scale - (addingEntity->getHeight() / 2);
 
-      MapObjectEntry data;
-      data.object = addingEntity;
-      data.position = std::make_pair(x,y);
-      map->getObjects().push_back(data);
+      auto data = std::make_shared<MapObjectEntry>();
+      data->object = addingEntity;
+      data->position = std::make_pair(x,y);
+      map->addObject(data);
       
       addingEntity = nullptr;
       
       frame->FinishAddingEntity();
       
       Refresh();
+    } else {
+      int vX, vY;
+      GetViewStart(&vX, &vY);
+      int vXX, vYX;
+      GetScrollPixelsPerUnit(&vXX, &vYX);
+      vX *= vXX;
+      vY *= vYX;
+      
+      int x = (event.GetPosition().x + vX) / scale;
+      int y = (event.GetPosition().y + vY) / scale;
+      
+      if (selectedEntity)
+      {
+        if ((x > selectedEntity->position.first) && (x < selectedEntity->position.first + selectedEntity->object->getWidth())
+          && (y > selectedEntity->position.second) && (y < selectedEntity->position.second + selectedEntity->object->getHeight()))
+        {
+          addingEntity = selectedEntity->object;
+          map->removeObject(selectedEntity);
+          selectedEntity.reset();
+          frame->StartAddingEntity();
+        } else {
+          selectedEntity.reset();
+        }
+        
+        Refresh();
+      } else {
+        for (auto object : map->getObjects())
+        {
+          if ((x >= object->position.first) && (x <= object->position.first + object->object->getWidth())
+            && (y >= object->position.second) && (y <= object->position.second + object->object->getHeight()))
+          {
+            selectedEntity = object;
+            
+            Refresh();
+            
+            break;
+          }
+        }
+      }
     }
   }
   
   event.Skip();
 }
 
+void MapeditWidget::OnRightClick(wxMouseEvent& event)
+{
+  if (editMode == EditEntities)
+  {
+    if (selectedEntity)
+    {
+      int vX, vY;
+      GetViewStart(&vX, &vY);
+      int vXX, vYX;
+      GetScrollPixelsPerUnit(&vXX, &vYX);
+      vX *= vXX;
+      vY *= vYX;
+      
+      int x = (event.GetPosition().x + vX) / scale;
+      int y = (event.GetPosition().y + vY) / scale;
+      
+      if ((x > selectedEntity->position.first) && (x < selectedEntity->position.first + selectedEntity->object->getWidth())
+        && (y > selectedEntity->position.second) && (y < selectedEntity->position.second + selectedEntity->object->getHeight()))
+      {
+        map->removeObject(selectedEntity);
+        selectedEntity.reset();
+      }
+    }
+  }
+}
+
 void MapeditWidget::OnMouseMove(wxMouseEvent& event)
 {
   mousePos = event.GetPosition();
@@ -216,6 +290,7 @@ void MapeditWidget::SetEditMode(EditMode editMode)
 void MapeditWidget::StartAddingEntity(MapObject* object)
 {
   addingEntity = object;
+  selectedEntity = nullptr;
 }
 
 void MapeditWidget::CancelAddingEntity()
@@ -9,6 +9,8 @@
 
 #include "map.h"
 #include "tile_widget.h"
+#include <list>
+#include <memory>
 
 class MapeditFrame;
 
@@ -35,6 +37,7 @@ class MapeditWidget : public wxScrolledWindow {
     virtual wxSize DoGetBestSize() const;
     void OnPaint(wxPaintEvent& event);
     void OnClick(wxMouseEvent& event);
+    void OnRightClick(wxMouseEvent& event);
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
     void OnMouseOut(wxMouseEvent& event);
@@ -53,6 +56,7 @@ class MapeditWidget : public wxScrolledWindow {
     EditMode editMode = EditTiles;
     
     MapObject* addingEntity = nullptr;
+    std::shared_ptr<MapObjectEntry> selectedEntity;
     
     DECLARE_DYNAMIC_CLASS(MapeditWidget)
     DECLARE_EVENT_TABLE()