Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Made EntityGroups more efficient

Browse Source 
"Ability to add units to or remove from an already selected group of
units" based on patch by k776 (modified to avoid going over the max
selection size)
(Fixes #602)

This was SVN commit r8332.
This commit is contained in:
WhiteTreePaladin 2010-10-11 17:24:06 +00:00
parent 1cdc8d1726
commit 9909675b68
2 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
binaries/data/mods/public/gui/session_new/input.js
View File

@ -308,19 +308,25 @@ function handleInputBeforeGui(ev, hoveredObject)
// Get list of entities limited to preferred entities
var ents = Engine.PickFriendlyEntitiesInRect(x0, y0, x1, y1, Engine.GetPlayerID());
var preferredEntities = getPreferredEntities(ents)
if (preferredEntities.length)
ents = preferredEntities;
// Remove entities if selection is too large
if (ents.length > MAX_SELECTION_SIZE)
ents = ents.slice(0, MAX_SELECTION_SIZE);
// If shift is pressed, don't reset the selection, but allow units to be added to the existing selection
var addition = (specialKeyStates[SDLK_RSHIFT] || specialKeyStates[SDLK_LSHIFT]);
if (!addition)
g_Selection.reset();
// Set selection list
// Remove entities if new selection is too large
var selection = g_Selection.toList();
var selectionSizeEstimate = selection.length + ents.length;
if (selectionSizeEstimate > MAX_SELECTION_SIZE)
ents = ents.slice(0, MAX_SELECTION_SIZE - selection.length);
// Set Selection
g_Selection.setHighlightList([]);
g_Selection.reset();
g_Selection.addList(ents);
g_Selection.CreateSelectionGroups();
inputState = INPUT_NORMAL;
return true;
@ -582,8 +588,16 @@ function handleInputAfterGui(ev)
inputState = INPUT_NORMAL;
return true;
}
g_Selection.reset();
g_Selection.addList([ents[0]]);
// If shift is pressed, don't reset the selection, but allow units to be added to the existing selection
var addition = (specialKeyStates[SDLK_RSHIFT] || specialKeyStates[SDLK_LSHIFT]);
if (!addition)
g_Selection.reset();
// Only add the entity if selection is not too large
if (g_Selection.toList().length < MAX_SELECTION_SIZE)
g_Selection.addList([ents[0]]);
inputState = INPUT_NORMAL;
return true;
}

102
binaries/data/mods/public/gui/session_new/selection.js
View File

@ -23,51 +23,70 @@ function _playSound(ent)
//-------------------------------- -------------------------------- --------------------------------
// EntityGroup class for managing grouped entities
// (I've opted for value duplication in member vars for efficiency considering how often selections are made)
//-------------------------------- -------------------------------- --------------------------------
function EntityGroup()
{
this.groupCounts = {};
this.groupEntIDs = {};
// These are used to display the groups
this.templateNames = []; // List of templateNames
this.groupCounts = {}; // {unitName : count}
// These are used to create or modify the groups
this.entIDs = {}; // {entID : unitName}
this.rankedTemplates = {}; // {ranked unitName : templateName}
this.groupEntIDs = {}; // {unitName : entIDs of that type}
}
EntityGroup.prototype.create = function(entIDs)
EntityGroup.prototype.reset = function()
{
this.templateNames = [];
this.groupCounts = {};
var rankedTemplates = {};
this.entIDs = {};
this.rankedTemplates = {};
this.groupEntIDs = {};
};
EntityGroup.prototype.add = function(entIDs)
{
for each (var entID in entIDs)
{
var entState = GetEntityState(entID);
var rank = entState.identity.rank;
var templateName = entState.template;
var template = GetTemplateData(templateName);
var unitName = template.name.specific || template.name.generic || "???";
if (!this.entIDs[entID])
{
this.entIDs[entID] = true;
var entState = GetEntityState(entID);
var rank = entState.identity.rank;
var templateName = entState.template;
var template = GetTemplateData(templateName);
var unitName = template.name.specific || template.name.generic || "???";
if (rank)
{
if (rankedTemplates[unitName])
if (rank)
{
this.groupCounts[rankedTemplates[unitName]] += 1;
this.groupEntIDs[unitName].push(entID);
if (this.rankedTemplates[unitName])
{
this.groupCounts[this.rankedTemplates[unitName]] += 1;
this.groupEntIDs[unitName].push(entID);
}
else
{
this.rankedTemplates[unitName] = templateName; // must come before groupCounts
this.groupCounts[this.rankedTemplates[unitName]] = 1;
this.groupEntIDs[unitName] = [entID];
this.templateNames.push(templateName);
}
}
else
{
rankedTemplates[unitName] = templateName;
this.groupCounts[rankedTemplates[unitName]] = 1;
this.groupEntIDs[unitName] = [entID];
}
}
else
{
if (this.groupCounts[templateName])
{
this.groupCounts[templateName] += 1;
this.groupEntIDs[unitName].push(entID);
}
else
{
this.groupCounts[templateName] = 1;
this.groupEntIDs[unitName] = [entID];
if (this.groupCounts[templateName])
{
this.groupCounts[templateName] += 1;
this.groupEntIDs[unitName].push(entID);
}
else
{
this.groupCounts[templateName] = 1;
this.groupEntIDs[unitName] = [entID];
this.templateNames.push(templateName);
}
}
}
}
@ -88,10 +107,7 @@ EntityGroup.prototype.getCount = function(templateName)
EntityGroup.prototype.getTemplateNames = function()
{
var templateNames = [];
for (var templateName in this.groupCounts)
templateNames.push(templateName);
return templateNames;
return this.templateNames;
};
EntityGroup.prototype.getEntsByUnitName = function(unitName)
@ -99,7 +115,7 @@ EntityGroup.prototype.getEntsByUnitName = function(unitName)
return this.groupEntIDs[unitName];
};
// Gets all ents in every group except that unitname
EntityGroup.prototype.getEntsByUnitNameInverse = function(unitName)
{
var ents = [];
@ -164,7 +180,7 @@ EntitySelection.prototype.makePrimarySelection = function(primaryTemplateName, m
this.reset();
this.addList(ents);
this.CreateSelectionGroups();
this.groups.add(this.toList()); // Create Selection Groups
}
// Get a list of the template names
@ -182,12 +198,6 @@ EntitySelection.prototype.getTemplateNames = function()
return templateNames;
}
// Make selection groups
EntitySelection.prototype.CreateSelectionGroups = function()
{
this.groups.create(this.toList());
};
// Update the selection to take care of changes (like units that have been killed)
EntitySelection.prototype.update = function()
{
@ -218,7 +228,7 @@ EntitySelection.prototype.update = function()
if (numberRemoved > 0)
{
this.dirty = true;
this.groups.create(this.toList());
this.groups.add(this.toList());
}
};
@ -257,6 +267,8 @@ EntitySelection.prototype.addList = function(ents)
_setMotionOverlay(added, this.motionDebugOverlay);
if (added.length)
_playSound(added[0]);
this.groups.add(this.toList()); // Create Selection Groups
this.dirty = true;
};
@ -266,8 +278,8 @@ EntitySelection.prototype.reset = function()
_setStatusBars(this.toList(), false);
_setMotionOverlay(this.toList(), false);
this.selected = {};
this.groups.reset();
this.dirty = true;
this.groups = new EntityGroup();
};
EntitySelection.prototype.toList = function()