Ticket #2179: selectionCache.diff

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

@@ -1631 +1631 @@
     if (!selection.length)
         return;
     
-    var trainableEnts = getAllTrainableEntities(selection);
+    var trainableEnts = getAllTrainableEntitiesFromSelection();
     
     // Check if the position is valid
     if (!trainableEnts.length || trainableEnts.length <= position) 

binaries/data/mods/public/gui/session/selection.js

@@ -217 +217 @@
  */
 EntitySelection.prototype.update = function()
 {
+    var changed = false;
     this.checkRenamedEntities();
     for each (var ent in this.selected)
     {
@@ -227 +228 @@
         {
             delete this.selected[ent];
             this.groups.removeEnt(ent);
-            this.dirty = true;
+            changed = true;
             continue;
         }
 
@@ -241 +242 @@
 
             delete this.selected[ent];
             this.groups.removeEnt(ent);
-            this.dirty = true;
+            changed = true;
             continue;
         }
     }
+    if (changed)
+        this.onChange();
 };
 
 /**
@@ -318 +321 @@
     }
 
     this.groups.add(this.toList()); // Create Selection Groups
-    this.dirty = true;
+    this.onChange();
 };
 
 EntitySelection.prototype.removeList = function(ents)
@@ -339 +342 @@
     _setStatusBars(removed, false);
     _setMotionOverlay(removed, false);
 
-    this.dirty = true;
+    this.onChange();
 };
 
 EntitySelection.prototype.reset = function()
@@ -349 +352 @@
     _setMotionOverlay(this.toList(), false);
     this.selected = {};
     this.groups.reset();
-    this.dirty = true;
+    this.onChange();
 };
 
 EntitySelection.prototype.rebuildSelection = function(renamed)
@@ -407 +410 @@
     _setMotionOverlay(this.toList(), enabled);
 };
 
-var g_Selection = new EntitySelection();
+EntitySelection.prototype.onChange = function()
+{
+    this.dirty = true;
+    if (this == g_Selection)
+        onSelectionChange();
+}
 
+
 /**
  * EntityGroupsContainer class for managing grouped entities
  */
@@ -483 +492 @@
 }
 
 var g_Groups = new EntityGroupsContainer();
+
+/**
+ * Cache some quantities which depends only on g_Selection
+ */
+
+var g_Selection = new EntitySelection();
+
+var g_canMoveIntoFormation = {};
+var g_allBuildableEntities = undefined;
+var g_allTrainableEntities = undefined;
+
+// Reset cached quantities which depend on selection
+function onSelectionChange()
+{
+    g_canMoveIntoFormation = {};
+    g_allBuildableEntities = undefined;
+    g_allTrainableEntities = undefined;
+}

binaries/data/mods/public/gui/session/session.js

@@ -327 +327 @@
     // simulation state and the current selection).
     if (g_Selection.dirty)
     {
+        g_Selection.dirty = false;
+
         onSimulationUpdate();
 
         // Display rally points for selected buildings
@@ -427 +429 @@
  */
 function onSimulationUpdate()
 {
-    g_Selection.dirty = false;
     g_EntityStates = {};
     g_TemplateData = {};
     g_TechnologyData = {};

binaries/data/mods/public/gui/session/unit_commands.js

@@ -572 +572 @@
         // Get icon image
         if (guiName == FORMATION)
         {
-            var formationOk = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
-                "ents": g_Selection.toList(),
-                "formationName": item
-            });
-
+            var formationOk = canMoveSelectionIntoFormation(item);
             var grayscale = "";
             button.enabled = formationOk;
             if (!formationOk)
@@ -1272 +1268 @@
     return trainableEnts;
 }
 
+function getAllTrainableEntitiesFromSelection()
+{
+    if (!g_allTrainableEntities)
+        g_allTrainableEntities = getAllTrainableEntities(g_Selection.toList());
+
+    return g_allTrainableEntities;
+}
+
 // Get all of the available entities which can be built by the selected entities
 function getAllBuildableEntities(selection)
 {
@@ -1288 +1292 @@
     removeDupes(buildableEnts);
     return buildableEnts;
 }
+
+function getAllBuildableEntitiesFromSelection()
+{
+    if (!g_allBuildableEntities)
+        g_allBuildableEntities = getAllBuildableEntities(g_Selection.toList());
+
+    return g_allBuildableEntities;
+}
+
+// Check if the selection can move into formation, and cache the result
+function canMoveSelectionIntoFormation(formationName)
+{
+    if (!(formationName in g_canMoveIntoFormation))
+    {
+        g_canMoveIntoFormation[formationName] = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
+            "ents": g_Selection.toList(),
+            "formationName": formationName
+        });
+    }
+    return g_canMoveIntoFormation[formationName];
+}