Ticket #9: visualreplay-WIP-r16491_no_gui.patch

source/network/NetTurnManager.cpp

@@ -38 +38 @@
 #include <iomanip>
 
 static const int DEFAULT_TURN_LENGTH_MP = 500;
-static const int DEFAULT_TURN_LENGTH_SP = 200;
+static const int DEFAULT_TURN_LENGTH_SP = 500;
 
 static const int COMMAND_DELAY = 2;
 
@@ -467 +467 @@
 
 
 
+CNetReplayTurnManager::CNetReplayTurnManager(CSimulation2& simulation, IReplayLogger& replay) :
+    CNetLocalTurnManager(simulation, replay)
+{
+}
+
+void CNetReplayTurnManager::StoreReplayCommand(u32 turn, int player, const std::string& command)
+{
+    m_ReplayCommands[turn][player].push_back(command);
+}
+
+void CNetReplayTurnManager::NotifyFinishedUpdate(u32 turn)
+{
+    DoTurn(turn);
+}
+
+void CNetReplayTurnManager::DoTurn(u32 turn)
+{
+    std::map<int, std::vector<std::string> > playerCommands = m_ReplayCommands[turn];
+    std::map<int, std::vector<std::string> >::iterator it;
+    for (it = playerCommands.begin(); it != playerCommands.end(); ++it)
+    {
+        int player = it->first;
+        for (size_t i = 0; i < it->second.size(); ++i)
+        {
+            //JS::HandleValue data;
+            JS::RootedValue data(m_Simulation2.GetScriptInterface().GetContext());
+            // JS::MutableHandleValue data;
+            m_Simulation2.GetScriptInterface().ParseJSON(it->second[i], &data);
+            AddCommand(m_ClientId, player, data, m_CurrentTurn + 1);
+        }
+    }
+}
+
+
+
+
 CNetServerTurnManager::CNetServerTurnManager(CNetServerWorker& server) :
     m_NetServer(server), m_ReadyTurn(1), m_TurnLength(DEFAULT_TURN_LENGTH_MP)
 {

source/network/NetTurnManager.h

@@ -22 +22 @@
 
 #include <list>
 #include <map>
-
+#include <vector>
 class CNetServerWorker;
 class CNetClient;
 class CSimulationMessage;
@@ -189 +189 @@
     std::string m_QuickSaveMetadata;
 };
 
+
 /**
  * Implementation of CNetTurnManager for network clients.
  */
@@ -233 +234 @@
 };
 
 
+
 /**
+ * Implementation of CNetTurnManager for replay games.
+ */
+class CNetReplayTurnManager : public CNetLocalTurnManager
+{
+public:
+    CNetReplayTurnManager(CSimulation2& simulation, IReplayLogger& replay);
+
+    void StoreReplayCommand(u32 turn, int player, const std::string& command);
+
+protected:
+    virtual void NotifyFinishedUpdate(u32 turn);
+
+    void DoTurn(u32 turn);
+
+    std::map<u32, std::map<int, std::vector<std::string> > > m_ReplayCommands;
+};
+/**
  * The server-side counterpart to CNetClientTurnManager.
  * Records the turn state of each client, and sends turn advancement messages
  * when all clients are ready.

source/ps/Game.cpp

@@ -63 +63 @@
  * Constructor
  *
  **/
-CGame::CGame(bool disableGraphics):
+CGame::CGame(bool disableGraphics, bool replayLog):
     m_World(new CWorld(this)),
     m_Simulation2(new CSimulation2(&m_World->GetUnitManager(), g_ScriptRuntime, m_World->GetTerrain())),
     m_GameView(disableGraphics ? NULL : new CGameView(this)),
@@ -71 +71 @@
     m_Paused(false),
     m_SimRate(1.0f),
     m_PlayerID(-1),
-    m_IsSavedGame(false)
+    m_IsSavedGame(false),
+    m_IsReplay(false),
+    m_ReplayStream(NULL)
 {
     m_ReplayLogger = new CReplayLogger(m_Simulation2->GetScriptInterface());
-    // TODO: should use CDummyReplayLogger unless activated by cmd-line arg, perhaps?
+    /* TODO: use CDummyReplayLogger ?
+    if (replayLog)
+        m_ReplayLogger = new CReplayLogger(m_Simulation2->GetScriptInterface());
+    else
+        m_ReplayLogger = new CDummyReplayLogger();
+    */
 
     // Need to set the CObjectManager references after various objects have
     // been initialised, so do it here rather than via the initialisers above.
@@ -85 +92 @@
 
     m_Simulation2->LoadDefaultScripts();
 }
+int CGame::LoadReplayData()
+{
+    ENSURE(m_IsReplay);
+    ENSURE(!m_ReplayPath.empty());
 
+    CNetReplayTurnManager* replayTurnMgr = static_cast<CNetReplayTurnManager*>(GetTurnManager());
+
+    u32 currentTurn = 0;
+    std::string type;
+    while ((*m_ReplayStream >> type).good())
+    {
+        if (type == "turn")
+        {
+            u32 turn = 0;
+            u32 turnLength = 0;
+            *m_ReplayStream >> turn >> turnLength;
+            ENSURE(turn == currentTurn);
+        }
+        else if (type == "cmd")
+        {
+            int player;
+            *m_ReplayStream >> player;
+
+            std::string line;
+            std::getline(*m_ReplayStream, line);
+            replayTurnMgr->StoreReplayCommand(currentTurn, player, line);
+        }
+        else if (type == "hash" || type == "hash-quick")
+        {
+            // Ignored for now
+            std::string replayHash;
+            *m_ReplayStream >> replayHash;
+        }
+        else if (type == "end")
+        {
+            currentTurn++;
+        }
+        else
+        {
+            CancelLoad(L"Failed to load replay data (unrecognized content)");
+        }
+    }
+    m_FinalReplayTurn = currentTurn + 1;
+
+    return 0;
+}
+void CGame::StartReplay(const std::string& replayPath)
+{
+    m_IsReplay = true;
+    ScriptInterface& scriptInterface = m_Simulation2->GetScriptInterface();
+
+    SetTurnManager(new CNetReplayTurnManager(*m_Simulation2, GetReplayLogger()));
+
+    m_ReplayPath = replayPath;
+    m_ReplayStream = new std::ifstream(m_ReplayPath.c_str());
+    ENSURE(m_ReplayStream->good());
+
+    std::string type;
+    ENSURE((*m_ReplayStream >> type).good() && type == "start");
+
+    std::string line;
+    std::getline(*m_ReplayStream, line);
+    JS::RootedValue attribs(scriptInterface.GetContext());
+    scriptInterface.ParseJSON(line, &attribs);
+    StartGame(&attribs, "");
+}
 /**
  * Destructor
  *
@@ -101 +173 @@
     delete m_Simulation2;
     delete m_World;
     delete m_ReplayLogger;
+    delete m_ReplayStream;
 }
 
 void CGame::SetTurnManager(CNetTurnManager* turnManager)
@@ -125 +198 @@
     ScriptInterface& scriptInterface = m_Simulation2->GetScriptInterface();
     JSContext* cx = scriptInterface.GetContext();
     JSAutoRequest rq(cx);
-    
+
     m_InitialSavedState = savedState;
     m_IsSavedGame = !savedState.empty();
 
@@ -176 +249 @@
     if (m_IsSavedGame)
         RegMemFun(this, &CGame::LoadInitialState, L"Loading game", 1000);
 
+    if (m_IsReplay)
+        RegMemFun(this, &CGame::LoadReplayData, L"Loading replay data", 1000);
+
     LDR_EndRegistering();
 }
 
@@ -208 +284 @@
 {
     JSContext* cx = m_Simulation2->GetScriptInterface().GetContext();
     JSAutoRequest rq(cx);
-    
+
     // Call the script function InitGame only for new games, not saved games
     if (!m_IsSavedGame)
     {
@@ -230 +306 @@
     Interpolate(0, 0);
 
     m_GameStarted=true;
-    
+
     // Render a frame to begin loading assets
     if (CRenderer::IsInitialised())
         Render();
@@ -289 +365 @@
         return true;
 
     const double deltaSimTime = deltaRealTime * m_SimRate;
-    
+
     bool ok = true;
     if (deltaSimTime)
     {
@@ -310 +386 @@
                 PROFILE3("gui sim update");
                 g_GUI->SendEventToAll("SimulationUpdate");
             }
+             if (m_IsReplay && m_TurnManager->GetCurrentTurn() == m_FinalReplayTurn)
+                 g_GUI->SendEventToAll("ReplayFinished");
 
             GetView()->GetLOSTexture().MakeDirty();
         }
-        
+
         if (CRenderer::IsInitialised())
             g_Renderer.GetTimeManager().Update(deltaSimTime);
     }

source/ps/Game.h

@@ -20 +20 @@
 
 #include "ps/Errors.h"
 #include <vector>
-
+#include <map>
 #include "scriptinterface/ScriptVal.h"
 
 class CWorld;
@@ -65 +65 @@
     CNetTurnManager* m_TurnManager;
 
 public:
-    CGame(bool disableGraphics = false);
+    CGame(bool disableGraphics = false, bool replayLog = true);
     ~CGame();
 
     /**
@@ -76 +76 @@
     void StartGame(JS::MutableHandleValue attribs, const std::string& savedState);
     PSRETURN ReallyStartGame();
 
+    void StartReplay(const std::string& replayPath);
+
     /**
      * Periodic heartbeat that controls the process. performs all per-frame updates.
      * Simulation update is called and game status update is called.
@@ -171 +173 @@
     int LoadInitialState();
     std::string m_InitialSavedState; // valid between RegisterInit and LoadInitialState
     bool m_IsSavedGame; // true if loading a saved game; false for a new game
+
+    int LoadReplayData();
+    std::string m_ReplayPath;
+    bool m_IsReplay;
+    std::istream* m_ReplayStream;
+    u32 m_FinalReplayTurn;
 };
 
 extern CGame *g_Game;

source/ps/GameSetup/GameSetup.cpp

@@ -880 +880 @@
 }
 
 bool Autostart(const CmdLineArgs& args);
+bool VisualReplay(const CmdLineArgs& args);
 
 bool Init(const CmdLineArgs& args, int flags)
 {
@@ -1073 +1074 @@
 
     try
     {
-        if (!Autostart(args))
+        if (!VisualReplay(args) && !Autostart(args))
         {
             const bool setup_gui = ((flags & INIT_NO_GUI) == 0);
             // We only want to display the splash screen at startup
@@ -1473 +1474 @@
     return true;
 }
 
+bool VisualReplay(const CmdLineArgs& args)
+{
+    CStr replayPath = args.Get("replay-visual");
+    if (!replayPath.empty())
+    {
+        g_Game = new CGame(false, false);
+
+        g_Game->SetPlayerID(1);
+        g_Game->StartReplay(replayPath);
+
+        // TODO: Non progressive load can fail - need a decent way to handle this
+        LDR_NonprogressiveLoad();
+
+        PSRETURN ret = g_Game->ReallyStartGame();
+        ENSURE(ret == PSRETURN_OK);
+
+        ScriptInterface& scriptInterface = g_Game->GetSimulation2()->GetScriptInterface();
+
+        InitPs(true, L"page_replay.xml", &scriptInterface, JS::UndefinedHandleValue);
+        return true;
+    }
+
+    return false;
+}
+
 void CancelLoad(const CStrW& message)
 {
     shared_ptr<ScriptInterface> pScriptInterface = g_GUI->GetActiveGUI()->GetScriptInterface();