Ticket #3915: visualrange_v0.1.patch

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

@@ -845 +845 @@
 GuiInterface.prototype.SetSelectionHighlight = function(player, cmd)
 {
     let playerColors = {}; // cache of owner -> color map
+    let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
 
     for each (let ent in cmd.entities)
     {
@@ -868 +869 @@
             playerColors[owner] = color;
         }
 
+        let cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
+
+        if (cmpIdentity.HasClass("Defensive") && owner == player)
+            cmpRangeManager.ShowRangeOverlay(ent, cmd.selected);
+
         cmpSelectable.SetSelectionHighlight({ "r": color.r, "g": color.g, "b": color.b, "a": cmd.alpha }, cmd.selected);
     }
 };

source/simulation2/components/CCmpRangeManager.cpp

@@ -304 +304 @@
     bool m_DebugOverlayDirty;
     std::vector<SOverlayLine> m_DebugOverlayLines;
 
+    bool m_ShowRangeOverlayEnabled;
+    std::vector<SOverlayLine> m_RangeOverlayLines;
+
     // Deserialization flag. A lot of different functions are called by Deserialize()
     // and we don't want to pass isDeserializing bool arguments to all of them...
     bool m_Deserializing;
@@ -1285 +1288 @@
 
     void RenderSubmit(SceneCollector& collector)
     {
+        if (m_ShowRangeOverlayEnabled)
+            for (size_t i = 0; i < m_RangeOverlayLines.size(); ++i)
+                collector.Submit(&m_RangeOverlayLines[i]);
+
         if (!m_DebugOverlayEnabled)
             return;
         static CColor disabledRingColor(1, 0, 0, 1);    // red
@@ -1421 +1428 @@
             collector.Submit(&m_DebugOverlayLines[i]);
     }
 
+    virtual void ShowRangeOverlay(entity_id_t ent, bool enabled)
+    {
+        m_ShowRangeOverlayEnabled = enabled;
+        static CColor rangeRingColor(1, 1, 1, 1); // TODO: should be player color
+
+        m_RangeOverlayLines.clear();
+        if (enabled)
+        {
+            for (std::map<tag_t, Query>::iterator it = m_Queries.begin(); it != m_Queries.end(); ++it)
+            {
+                Query& q = it->second;
+
+                CmpPtr<ICmpPosition> cmpSourcePosition(q.source);
+                if (!cmpSourcePosition || !cmpSourcePosition->IsInWorld() || q.source.GetId() != ent)
+                    continue;
+
+                CFixedVector2D pos = cmpSourcePosition->GetPosition2D();
+
+                m_RangeOverlayLines.push_back(SOverlayLine());
+                m_RangeOverlayLines.back().m_Color = rangeRingColor;
+                SimRender::ConstructCircleOnGround(GetSimContext(), pos.X.ToFloat(), pos.Y.ToFloat(), q.maxRange.ToFloat(), m_RangeOverlayLines.back(), true);
+            }
+        }
+    }
+
     virtual u8 GetEntityFlagMask(const std::string& identifier)
     {
         if (identifier == "normal")

source/simulation2/components/ICmpRangeManager.cpp

@@ -48 +48 @@
 DEFINE_INTERFACE_METHOD_1("GetEntitiesByPlayer", std::vector<entity_id_t>, ICmpRangeManager, GetEntitiesByPlayer, player_id_t)
 DEFINE_INTERFACE_METHOD_0("GetNonGaiaEntities", std::vector<entity_id_t>, ICmpRangeManager, GetNonGaiaEntities)
 DEFINE_INTERFACE_METHOD_1("SetDebugOverlay", void, ICmpRangeManager, SetDebugOverlay, bool)
+DEFINE_INTERFACE_METHOD_2("ShowRangeOverlay", void, ICmpRangeManager, ShowRangeOverlay, entity_id_t, bool)
 DEFINE_INTERFACE_METHOD_1("ExploreAllTiles", void, ICmpRangeManager, ExploreAllTiles, player_id_t)
 DEFINE_INTERFACE_METHOD_0("ExploreTerritories", void, ICmpRangeManager, ExploreTerritories)
 DEFINE_INTERFACE_METHOD_2("SetLosRevealAll", void, ICmpRangeManager, SetLosRevealAll, player_id_t, bool)

source/simulation2/components/ICmpRangeManager.h

@@ -204 +204 @@
     virtual void SetDebugOverlay(bool enabled) = 0;
 
     /**
+    * Display the range of a building/unit.
+    */
+    virtual void ShowRangeOverlay(entity_id_t ent, bool enabled) = 0;
+
+    /**
      * Returns the mask for the specified identifier.
      */
     virtual u8 GetEntityFlagMask(const std::string& identifier) = 0;