Ticket #3724: t3724_v1.patch

ps/trunk/binaries/data/config/default.cfg

@@ -144 +144 @@
 wireframe = "Alt+W"                      ; Toggle wireframe mode
 silhouettes = "Alt+S"                    ; Toggle unit silhouettes
 showsky = "Alt+Z"                        ; Toggle sky
+territory.showborder = "Alt+B"            ; Toggle territory border
 
 ; > CLIPBOARD CONTROLS
 copy = "Ctrl+C"                       ; Copy to clipboard

ps/trunk/binaries/data/mods/public/gui/session/input.js

@@ -850 +850 @@
         g_ShowGuarded = (ev.type == "hotkeydown");
         updateAdditionalHighlight();
     }
+    else if (ev.hotkey == "territory.showborder")
+    {
+        if (ev.type == "hotkeydown")
+        {
+            Engine.GuiInterfaceCall("ToggleTerritoryBorderVisibility");
+            var visible = Engine.GuiInterfaceCall("GetTerritoryBorderVisibility");
+            Engine.SetOverlayVisibility(visible);
+      }
+    }
 
     // State-machine processing:
 

ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -854 +854 @@
     }
 };
 
+GuiInterface.prototype.ToggleTerritoryBorderVisibility = function()
+{
+    var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
+    if (cmpTerritoryManager)
+    {
+        let visible = cmpTerritoryManager.GetVisibility();
+        cmpTerritoryManager.SetVisibility(!visible);
+    }
+};
+
+GuiInterface.prototype.GetTerritoryBorderVisibility = function()
+{
+    var cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager);
+    if (cmpTerritoryManager)
+        return cmpTerritoryManager.GetVisibility();
+        
+    return false;
+};
+
 GuiInterface.prototype.GetPlayerEntities = function(player)
 {
     return Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager).GetEntitiesByPlayer(player);
@@ -1858 +1877 @@
     "GetAllBuildableEntities": 1,
     "SetStatusBars": 1,
     "GetPlayerEntities": 1,
+    "ToggleTerritoryBorderVisibility": 1,
+    "GetTerritoryBorderVisibility" : 1,
     "GetNonGaiaEntities": 1,
     "DisplayRallyPoint": 1,
     "SetBuildingPlacementPreview": 1,

ps/trunk/source/gui/scripting/ScriptFunctions.cpp

@@ -66 +66 @@
 #include "simulation2/components/ICmpRangeManager.h"
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/components/ICmpTemplateManager.h"
+#include "simulation2/components/ICmpOverlayRenderer.h"
 #include "simulation2/helpers/Selection.h"
 #include "soundmanager/SoundManager.h"
 #include "soundmanager/scripting/JSInterface_Sound.h"
@@ -931 +932 @@
     js_start_times[slot].SetFromTimer();
 }
 
+void SetOverrideVisibility(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), bool visible)
+{
+    ICmpOverlayRenderer::SetOverrideVisibility(visible);
+}
+
 void StopJsTimer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), unsigned int slot)
 {
     if (slot >= MAX_JS_TIMERS)
@@ -1071 +1077 @@
     scriptInterface.RegisterFunction<void, unsigned int, &EnableTimeWarpRecording>("EnableTimeWarpRecording");
     scriptInterface.RegisterFunction<void, &RewindTimeWarp>("RewindTimeWarp");
     scriptInterface.RegisterFunction<void, bool, &SetBoundingBoxDebugOverlay>("SetBoundingBoxDebugOverlay");
+    scriptInterface.RegisterFunction<void, bool, &SetOverrideVisibility>("SetOverlayVisibility");
 }

ps/trunk/source/simulation2/components/CCmpTerritoryManager.cpp

@@ -282 +282 @@
         m_Visible = visible;
     }
 
+    bool GetVisibility()
+    {
+        return m_Visible;
+    }
 private:
 
     bool m_Visible;

ps/trunk/source/simulation2/components/ICmpTerritoryManager.cpp

@@ -27 +27 @@
 DEFINE_INTERFACE_METHOD_2("IsConnected", bool, ICmpTerritoryManager, IsConnected, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_2("SetTerritoryBlinking", void, ICmpTerritoryManager, SetTerritoryBlinking, entity_pos_t, entity_pos_t)
 DEFINE_INTERFACE_METHOD_1("GetTerritoryPercentage", u8, ICmpTerritoryManager, GetTerritoryPercentage, player_id_t)
+DEFINE_INTERFACE_METHOD_1("SetVisibility", void, ICmpTerritoryManager, SetVisibility, bool)
+DEFINE_INTERFACE_METHOD_0("GetVisibility", bool, ICmpTerritoryManager, GetVisibility)
 END_INTERFACE_WRAPPER(TerritoryManager)

ps/trunk/source/simulation2/components/ICmpTerritoryManager.h

@@ -83 +83 @@
      */
     virtual void SetVisibility(bool visible) = 0;
 
+    /**
+     * Return current state of an territory borders rendering.
+     */
+    virtual bool GetVisibility() = 0;
+
     DECLARE_INTERFACE_TYPE(TerritoryManager)
 };