Changeset 9609 for ps

Timestamp:

06/10/11 01:47:20 (14 years ago)

Author:

ben

Message:

 

Location:

ps/trunk

Files:

• build/premake/premake.lua (modified) (1 diff)
• source/graphics/MapReader.cpp (modified) (2 diffs)
• source/simulation2/Simulation2.cpp (modified) (1 diff)
• source/simulation2/Simulation2.h (modified) (1 diff)
• source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h (modified) (2 diffs)
• source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp (modified) (2 diffs)
• source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp (modified) (1 diff)
• source/tools/atlas/GameInterface/Messages.h (modified) (1 diff)

ps/trunk/build/premake/premake.lua

@@ -824 +824 @@
         "ScenarioEditor/Sections/Map",
         "ScenarioEditor/Sections/Object",
+        "ScenarioEditor/Sections/Player",
         "ScenarioEditor/Sections/Terrain",
         "ScenarioEditor/Sections/Trigger",

ps/trunk/source/graphics/MapReader.cpp

@@ -849 +849 @@
     XMBElementList entities = parent.GetChildNodes();
 
+    CSimulation2& sim = *m_MapReader.pSimulation2;
+    CmpPtr<ICmpPlayerManager> cmpPlayerManager(sim.GetSimContext(), SYSTEM_ENTITY);
+
     while (entity_idx < entities.Count)
     {
@@ -904 +907 @@
         }
 
-        CSimulation2& sim = *m_MapReader.pSimulation2;
         entity_id_t ent = sim.AddEntity(TemplateName, EntityUid);
         if (ent == INVALID_ENTITY)
+        {
             LOGERROR(L"Failed to load entity template '%ls'", TemplateName.c_str());
-        else
-        {
+        }
+        else if (cmpPlayerManager->GetPlayerByID(PlayerID) != INVALID_ENTITY)
+        {   // Don't add entities with invalid player IDs
+            // TODO: Is a warning OK or should it just silently fail?
+
             CmpPtr<ICmpPosition> cmpPosition(sim, ent);
             if (!cmpPosition.null())

ps/trunk/source/simulation2/Simulation2.cpp

@@ -593 +593 @@
 std::string CSimulation2::GetPlayerDefaults()
 {
-    VfsPath path = VfsPath(L"simulation/data/player_defaults.json");
-
+    return ReadJSON(L"simulation/data/player_defaults.json");
+}
+
+std::string CSimulation2::GetMapSizes()
+{
+    return ReadJSON(L"simulation/data/map_sizes.json");
+}
+
+std::string CSimulation2::ReadJSON(VfsPath path)
+{
     std::string data;
 

ps/trunk/source/simulation2/Simulation2.h

@@ -227 +227 @@
     std::string GetPlayerDefaults();
 
+    /**
+     * Get map sizes data
+     *
+     * @return string containing JSON format data
+     */
+    std::string GetMapSizes();
+
 private:
     CSimulation2Impl* m;
 
+    // Helper for reading JSON files
+    std::string ReadJSON(VfsPath path);
+
     NONCOPYABLE(CSimulation2);
 };

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.h

@@ -65 +65 @@
     ScriptInterface& GetScriptInterface() const { return m_ScriptInterface; }
     Observable<ObjectSettings>& GetObjectSettings() { return m_ObjectSettings; }
+    Observable<AtObj>& GetMapSettings() { return m_MapSettings; }
 
     ToolManager& GetToolManager() { return m_ToolManager; }
@@ -78 +79 @@
 
     Observable<ObjectSettings> m_ObjectSettings;
+    Observable<AtObj> m_MapSettings;
 
     void SetOpenFilename(const wxString& filename);

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp

@@ -32 +32 @@
 #include "Sections/Map/Map.h"
 #include "Sections/Object/Object.h"
+#include "Sections/Player/Player.h"
 #include "Sections/Terrain/Terrain.h"
 #include "Sections/Trigger/Trigger.h"
@@ -289 +290 @@
     
     ADD_SIDEBAR(MapSidebar,             _T("map.png"),         _("Map"));
+    ADD_SIDEBAR(PlayerSidebar,          _T("player.png"),      _("Player"));
     ADD_SIDEBAR(TerrainSidebar,         _T("terrain.png"),     _("Terrain"));
     ADD_SIDEBAR(ObjectSidebar,          _T("object.png"),      _("Object"));

ps/trunk/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

@@ -140 +140 @@
 }
 
-MESSAGEHANDLER(SetMapSettings)
-{
-    g_Game->GetSimulation2()->SetMapSettings(*msg->settings);
-}
+QUERYHANDLER(GetMapSizes)
+{
+    msg->sizes = g_Game->GetSimulation2()->GetMapSizes();
+}
+
+BEGIN_COMMAND(SetMapSettings)
+{
+    void Do()
+    {
+        Redo();
+    }
+
+    void Undo()
+    {
+        // TODO
+        debug_warn(L"Can't undo SetMapSettings");
+    }
+
+    void Redo()
+    {
+        g_Game->GetSimulation2()->SetMapSettings(*msg->settings);
+    }
+};
+END_COMMAND(SetMapSettings)
 
 QUERYHANDLER(GetRMSData)

ps/trunk/source/tools/atlas/GameInterface/Messages.h

@@ -153 +153 @@
         );
 
-MESSAGE(SetMapSettings,
+QUERY(GetMapSizes,
+        ,
+        ((std::string, sizes))
+        );
+
+COMMAND(SetMapSettings, NOMERGE,
         ((std::string, settings))
         );