Ticket #96: progress_1_96.diff

source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp

@@ -49 +49 @@
             + (m_ScreenPos.type1.y-m_Target.type1.y)*(m_ScreenPos.type1.y-m_Target.type1.y);
         bool useTarget = (dragDistSq >= 16*16);
         if (preview)
-            POST_MESSAGE(ObjectPreview, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed));
+            POST_MESSAGE(ObjectPreview, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed,true));
         else
         {
             POST_COMMAND(CreateObject, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed));

source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp

@@ -23 +23 @@
 #include "Common/MiscState.h"
 #include "Common/ObjectSettings.h"
 #include "GameInterface/Messages.h"
+#include <wx/clipbrd.h>
+#include <wx/xml/xml.h>
+#include <wx/sstream.h>
 
 using AtlasMessage::Position;
 
@@ -52 +55 @@
         POST_MESSAGE(SetSelectionPreview, (g_SelectedObjects));
     }
 
+    void TransformObject::OnPasteStart()
+    {
+        //PASTE
+        wxString entities;
+        if (wxTheClipboard->Open())
+        {
+            if (wxTheClipboard->IsSupported(wxDF_TEXT))
+            {
+                wxTextDataObject data;
+                wxTheClipboard->GetData(data);
+                entities = data.GetText();
+            }
+        }
+        else 
+        {
+            //TODO: Show something when the clipboard couldnt open
+        }
+        
+        //First do we need to check if it is a correct xml string
+        wxInputStream* is = new wxStringInputStream(entities);
+        wxXmlDocument doc;
+        if (!doc.Load(*is))
+        {
+            return;
+        }
 
+        // Entities, Entity(1.*)
+        wxXmlNode* root = doc.GetRoot();
+        if (root->GetName() != wxT("Entities"))
+        {
+            return;
+        }
+        //  Template, position,orientation
+        const wxXmlNode* child = root->GetChildren();
+
+        while (child)
+        {
+            if (child->GetName() != wxT("Entity"))
+            {
+                return;
+            }
+            //TODO Validate all attributes
+            child = child->GetNext();
+        }
+        
+        //Update selectedObjects??
+        g_SelectedObjects.empty();
+
+        // is the source code get here now you can add the objects to scene(preview)
+        // store id to move 
+        child = root->GetChildren();
+        
+        while (child)
+        {
+            wxString objectId;
+            Position objectPos;
+            unsigned int actorSeed;
+            const wxXmlNode* xmlData = child->GetChildren();
+            while (xmlData)
+            {
+                if (xmlData->GetName() == wxT("Template"))
+                {
+                    objectId = xmlData->GetContent();
+                }
+                else if (xmlData->GetName() == wxT("Position"))
+                {
+                    wxString x, z;
+                    xmlData->GetAttribute(wxT("x"), &x);
+                    xmlData->GetAttribute(wxT("z"), &z);
+
+                    objectPos = Position();
+                    //x.ToDouble(&objectPos.)
+                }
+            }
+
+            //POST_MESSAGE(ObjectPreview, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle, m_ActorSeed));
+        }
+
+
+        //Send new Object
+        //Set state paste for preview the new objects
+    }
+
+    void TransformObject::OnPasteEnd()
+    {
+        //when all is done set default state
+        this->SetState(&this->Waiting);
+    }
+
     // TODO: keys to rotate/move object?
 
     struct sWaiting : public State
@@ -167 +258 @@
                 obj->GetScenarioEditor().GetObjectSettings().NotifyObservers();
                 return true;
             }
+            else if (evt.GetModifiers() == wxMOD_CONTROL)
+            {
+                if (!g_SelectedObjects.empty())
+                {
+                    if (evt.GetKeyCode() == 'C')
+                    {
+                        //COPY current selections
+                        AtlasMessage::qGetObjectMapSettings info(g_SelectedObjects);
+                        info.Post();
+
+                        //In xmldata is the configuration
+                        //now send to clipboard
+                        if (wxTheClipboard->Open())
+                        {
+                            wxString text(info.xmldata.c_str());
+                            wxTheClipboard->SetData(new wxTextDataObject(text));
+                            wxTheClipboard->Close();
+                        }
+                        else
+                        {
+                            //TODO: Say something about couldnt open clipboard
+                        }
+
+                    }
+                    else if (evt.GetKeyCode() == 'V')
+                    {
+                        obj->OnPasteStart();
+                    }
+                }
+            }
             else
                 return false;
         }

source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp

@@ -49 +49 @@
 #include "simulation2/components/ICmpTemplateManager.h"
 #include "simulation2/components/ICmpVisual.h"
 #include "simulation2/helpers/Selection.h"
+#include "ps/XML/XMLWriter.h"
 
 
 namespace AtlasMessage {
@@ -218 +219 @@
     msg->settings = settings;
 }
 
+QUERYHANDLER(GetObjectMapSettings)
+{
+    std::vector<entity_id_t> ids = *msg->ids;
+    
+    CmpPtr<ICmpTemplateManager> cmpTemplateManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
+    ENSURE(cmpTemplateManager);
+
+    XML_Start();
+    {
+        XML_Element("Entities");
+        {
+            for (size_t i = 0; i < ids.size(); ++i)
+            {
+                entity_id_t id = (entity_id_t)ids[i];
+                XML_Element("Entity");
+                {
+                    //Template name
+                    XML_Setting("Template", cmpTemplateManager->GetCurrentTemplateName(id));
+
+                    //Player
+                    CmpPtr<ICmpOwnership> cmpOwnership(*g_Game->GetSimulation2(), id);
+                    if (cmpOwnership)
+                        XML_Setting("Player", (int)cmpOwnership->GetOwner());
+
+                    //Adding position to make some relative position later
+                    CmpPtr<ICmpPosition> cmpPosition(*g_Game->GetSimulation2(), id);
+                    if (cmpPosition)
+                    {
+                        CFixedVector3D pos = cmpPosition->GetPosition();
+                        CFixedVector3D rot = cmpPosition->GetRotation();
+                        {
+                            XML_Element("Position");
+                            XML_Attribute("x", pos.X);
+                            XML_Attribute("z", pos.Z);
+                            // TODO: height offset etc
+                        }
+                        {
+                            XML_Element("Orientation");
+                            XML_Attribute("y", rot.Y);
+                            // TODO: X, Z maybe
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    const CStr& data = XML_GetOutput();
+    msg->xmldata = std::wstring(data.begin(), data.end());
+}
+
 BEGIN_COMMAND(SetObjectSettings)
 {
     player_id_t m_PlayerOld, m_PlayerNew;
@@ -317 +369 @@
     if (*msg->id != g_PreviewUnitName)
     {
         // Delete old entity
-        if (g_PreviewEntityID != INVALID_ENTITY)
+        if (g_PreviewEntityID != INVALID_ENTITY  && msg->deleteLastPreview)
             g_Game->GetSimulation2()->DestroyEntity(g_PreviewEntityID);
 
         // Create the new entity

source/tools/atlas/GameInterface/Messages.h

@@ -344 +344 @@
         ((Position, target))
         ((float, angle))
         ((unsigned int, actorseed))
+        ((bool, deleteLastPreview)) // use with "paste" option
         );
 
 COMMAND(CreateObject, NOMERGE,
@@ -590 +591 @@
         ((sObjectSettings, settings))
         );
 
+QUERY(GetObjectMapSettings,
+        ((std::vector<ObjectID>, ids))
+        ,
+        ((std::wstring,xmldata))
+        );
+
 QUERY(GetPlayerObjects,
         ((int, player))
         ,