Ticket #1022: Atlas-ActorViewer-PlayerColour(1022)-v2.patch

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp

@@ -97 +97 @@
 
 struct ObjectSidebarImpl
 {
-    ObjectSidebarImpl() :
+    ObjectSidebarImpl(ScenarioEditor& scenarioEditor) :
         m_ObjectListBox(NULL), m_ActorViewerActive(false),
-        m_ActorViewerEntity(_T("actor|structures/fndn_1x1.xml")), m_ActorViewerAnimation(_T("idle")), m_ActorViewerSpeed(0.f)
+        m_ActorViewerEntity(_T("actor|structures/fndn_1x1.xml")),
+        m_ActorViewerAnimation(_T("idle")), m_ActorViewerSpeed(0.f),
+        m_ObjectSettings(scenarioEditor.GetObjectSettings())
     {
     }
 
@@ -111 +113 @@
     wxString m_ActorViewerEntity;
     wxString m_ActorViewerAnimation;
     float m_ActorViewerSpeed;
+    ObjectSettings& m_ObjectSettings;
 
     void ActorViewerPostToGame()
     {
-        POST_MESSAGE(SetActorViewer, ((std::wstring)m_ActorViewerEntity.wc_str(), (std::wstring)m_ActorViewerAnimation.wc_str(), m_ActorViewerSpeed, false));
+        POST_MESSAGE(SetActorViewer, ((std::wstring)m_ActorViewerEntity.wc_str(), (std::wstring)m_ActorViewerAnimation.wc_str(), m_ObjectSettings.GetPlayerID(), m_ActorViewerSpeed, false));
     }
 };
 
@@ -124 +127 @@
     wxWindow* bottomBarContainer
 )
     : Sidebar(scenarioEditor, sidebarContainer, bottomBarContainer),
-      p(new ObjectSidebarImpl())
+      p(new ObjectSidebarImpl(scenarioEditor))
 {
     wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add(new wxStaticText(this, wxID_ANY, _("Filter")), wxSizerFlags().Align(wxALIGN_CENTER));

source/tools/atlas/GameInterface/Messages.h

@@ -340 +340 @@
 MESSAGE(SetActorViewer,
         ((std::wstring, id))
         ((std::wstring, animation))
+        ((int, playerId))
         ((float, speed))
         ((bool, flushcache)) // true => unload all actor files before starting the preview (because we don't have proper hotloading yet)
         );

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

@@ -153 +153 @@
 //      vfs_reload_changed_files();
     }
     AtlasView::GetView_Actor()->SetSpeedMultiplier(msg->speed);
-    AtlasView::GetView_Actor()->GetActorViewer().SetActor(*msg->id, *msg->animation);
+    AtlasView::GetView_Actor()->GetActorViewer().SetActor(*msg->id, *msg->animation, msg->playerId);
 }
 
 //////////////////////////////////////////////////////////////////////////

source/tools/atlas/GameInterface/ActorViewer.cpp

@@ -48 +48 @@
 #include "renderer/WaterManager.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
+#include "simulation2/components/ICmpOwnership.h"
 #include "simulation2/components/ICmpPosition.h"
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpTerrain.h"
@@ -314 +315 @@
     m.ObjectManager.UnloadObjects();
 }
 
-void ActorViewer::SetActor(const CStrW& name, const CStrW& animation)
+void ActorViewer::SetActor(const CStrW& name, const CStrW& animation, int playerId)
 {
     bool needsAnimReload = false;
 
@@ -428 +429 @@
         m.UpdatePropList();
     }
 
+    // Unit ownership (sets to the correct player colour)
+    CmpPtr<ICmpOwnership> cmpOwnership(m.Simulation2, m.Entity);
+    if (cmpOwnership)
+        cmpOwnership->SetOwner(playerId);
+
     m.CurrentUnitID = id;
     m.CurrentUnitAnim = animation;
 }

source/tools/atlas/GameInterface/ActorViewer.h

@@ -34 +34 @@
 
     CSimulation2* GetSimulation2();
     entity_id_t GetEntity();
-    void SetActor(const CStrW& id, const CStrW& animation);
+    void SetActor(const CStrW& id, const CStrW& animation, int playerId=0);
     void UnloadObjects();
     void SetBackgroundColour(const SColor4ub& colour);
     void SetWalkEnabled(bool enabled);