dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename RangeVisualization component from ee5bb1fd61 / D238 to RangeOverlayManager for consistency with the RangeOverlayRenderer from 5fbb224dc0 / D555.

Browse source 
Refs #4899, #3915

This was SVN commit r20627.
This commit is contained in:
elexis 2017-12-10 03:28:38 +00:00
parent ddf868cfdc
commit 40cc3aaa09
9 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
binaries/data/mods/public/simulation/components/Auras.js
View file

@ -281,11 +281,11 @@ Auras.prototype.Clean = function()
if (needVisualizationUpdate)
{
let cmpRangeVisualization = Engine.QueryInterface(this.entity, IID_RangeVisualization);
if (cmpRangeVisualization)
let cmpRangeOverlayManager = Engine.QueryInterface(this.entity, IID_RangeOverlayManager);
if (cmpRangeOverlayManager)
{
cmpRangeVisualization.UpdateRangeOverlays("Auras");
cmpRangeVisualization.RegenerateRangeVisualizations(false);
cmpRangeOverlayManager.UpdateRangeOverlays("Auras");
cmpRangeOverlayManager.RegenerateRangeOverlayManagers(false);
}
}
};

18
binaries/data/mods/public/simulation/components/GuiInterface.js
View file

@ -891,11 +891,11 @@ GuiInterface.prototype.SetSelectionHighlight = function(player, cmd)
cmpSelectable.SetSelectionHighlight({ "r": color.r, "g": color.g, "b": color.b, "a": cmd.alpha }, cmd.selected);
let cmpRangeVisualization = Engine.QueryInterface(ent, IID_RangeVisualization);
if (!cmpRangeVisualization || player != owner && player != -1)
let cmpRangeOverlayManager = Engine.QueryInterface(ent, IID_RangeOverlayManager);
if (!cmpRangeOverlayManager || player != owner && player != -1)
continue;
cmpRangeVisualization.SetEnabled(cmd.selected, this.enabledVisualRangeOverlayTypes, false);
cmpRangeOverlayManager.SetEnabled(cmd.selected, this.enabledVisualRangeOverlayTypes, false);
}
};
@ -948,9 +948,9 @@ GuiInterface.prototype.SetRangeOverlays = function(player, cmd)
{
for (let ent of cmd.entities)
{
let cmpRangeVisualization = Engine.QueryInterface(ent, IID_RangeVisualization);
if (cmpRangeVisualization)
cmpRangeVisualization.SetEnabled(cmd.enabled, this.enabledVisualRangeOverlayTypes, true);
let cmpRangeOverlayManager = Engine.QueryInterface(ent, IID_RangeOverlayManager);
if (cmpRangeOverlayManager)
cmpRangeOverlayManager.SetEnabled(cmd.enabled, this.enabledVisualRangeOverlayTypes, true);
}
};
@ -1108,9 +1108,9 @@ GuiInterface.prototype.SetBuildingPlacementPreview = function(player, cmd)
else
result = cmpBuildRestrictions.CheckPlacement();
let cmpRangeVisualization = Engine.QueryInterface(ent, IID_RangeVisualization);
if (cmpRangeVisualization)
cmpRangeVisualization.SetEnabled(true, this.enabledVisualRangeOverlayTypes);
let cmpRangeOverlayManager = Engine.QueryInterface(ent, IID_RangeOverlayManager);
if (cmpRangeOverlayManager)
cmpRangeOverlayManager.SetEnabled(true, this.enabledVisualRangeOverlayTypes);
// Set it to a red shade if this is an invalid location
let cmpVisual = Engine.QueryInterface(ent, IID_Visual);

32
binaries/data/mods/public/simulation/components/RangeVisualization.js → binaries/data/mods/public/simulation/components/RangeOverlayManager.js
View file

@ -1,8 +1,8 @@
function RangeVisualization() {}
function RangeOverlayManager() {}
RangeVisualization.prototype.Schema = "<empty/>";
RangeOverlayManager.prototype.Schema = "<empty/>";
RangeVisualization.prototype.Init = function()
RangeOverlayManager.prototype.Init = function()
{
this.enabled = false;
this.enabledRangeTypes = {
@ -15,29 +15,29 @@ RangeVisualization.prototype.Init = function()
};
// The GUI enables visualizations
RangeVisualization.prototype.Serialize = null;
RangeOverlayManager.prototype.Serialize = null;
RangeVisualization.prototype.Deserialize = function(data)
RangeOverlayManager.prototype.Deserialize = function(data)
{
this.Init();
};
RangeVisualization.prototype.UpdateRangeOverlays = function(componentName)
RangeOverlayManager.prototype.UpdateRangeOverlays = function(componentName)
{
let cmp = Engine.QueryInterface(this.entity, global["IID_" + componentName]);
if (cmp)
this.rangeVisualizations.set(componentName, cmp.GetRangeOverlays());
};
RangeVisualization.prototype.SetEnabled = function(enabled, enabledRangeTypes, forceUpdate)
RangeOverlayManager.prototype.SetEnabled = function(enabled, enabledRangeTypes, forceUpdate)
{
this.enabled = enabled;
this.enabledRangeTypes = enabledRangeTypes;
this.RegenerateRangeVisualizations(forceUpdate);
this.RegenerateRangeOverlayManagers(forceUpdate);
};
RangeVisualization.prototype.RegenerateRangeVisualizations = function(forceUpdate)
RangeOverlayManager.prototype.RegenerateRangeOverlayManagers = function(forceUpdate)
{
let cmpRangeOverlayRenderer = Engine.QueryInterface(this.entity, IID_RangeOverlayRenderer);
if (!cmpRangeOverlayRenderer)
@ -59,17 +59,17 @@ RangeVisualization.prototype.RegenerateRangeVisualizations = function(forceUpdat
rangeOverlay.thickness);
};
RangeVisualization.prototype.OnOwnershipChanged = function(msg)
RangeOverlayManager.prototype.OnOwnershipChanged = function(msg)
{
if (msg.to == -1)
return;
for (let type in this.enabledRangeTypes)
this.UpdateRangeOverlays(type);
this.RegenerateRangeVisualizations(false);
this.RegenerateRangeOverlayManagers(false);
};
RangeVisualization.prototype.OnValueModification = function(msg)
RangeOverlayManager.prototype.OnValueModification = function(msg)
{
if (msg.valueNames.indexOf("Heal/Range") == -1 &&
msg.valueNames.indexOf("Attack/Ranged/MinRange") == -1 &&
@ -77,16 +77,16 @@ RangeVisualization.prototype.OnValueModification = function(msg)
return;
this.UpdateRangeOverlays(msg.component);
this.RegenerateRangeVisualizations(false);
this.RegenerateRangeOverlayManagers(false);
};
/**
* RangeVisualization component is deserialized before the TechnologyManager, so need to update the ranges here
* RangeOverlayManager component is deserialized before the TechnologyManager, so need to update the ranges here
*/
RangeVisualization.prototype.OnDeserialized = function(msg)
RangeOverlayManager.prototype.OnDeserialized = function(msg)
{
for (let type in this.enabledRangeTypes)
this.UpdateRangeOverlays(type);
};
Engine.RegisterComponentType(IID_RangeVisualization, "RangeVisualization", RangeVisualization);
Engine.RegisterComponentType(IID_RangeOverlayManager, "RangeOverlayManager", RangeOverlayManager);

1
binaries/data/mods/public/simulation/components/interfaces/RangeOverlayManager.js Normal file
View file

@ -0,0 +1 @@
Engine.RegisterInterface("RangeOverlayManager");

1
binaries/data/mods/public/simulation/components/interfaces/RangeVisualization.js
View file

@ -1 +0,0 @@
Engine.RegisterInterface("RangeVisualization");

2
binaries/data/mods/public/simulation/components/tests/test_Auras.js
View file

@ -2,7 +2,7 @@ Engine.LoadHelperScript("Player.js");
Engine.LoadHelperScript("ValueModification.js");
Engine.LoadComponentScript("interfaces/Auras.js");
Engine.LoadComponentScript("interfaces/AuraManager.js");
Engine.LoadComponentScript("interfaces/RangeVisualization.js");
Engine.LoadComponentScript("interfaces/RangeOverlayManager.js");
Engine.LoadComponentScript("interfaces/TechnologyManager.js");
Engine.LoadComponentScript("Auras.js");
Engine.LoadComponentScript("AuraManager.js");

2
binaries/data/mods/public/simulation/templates/special/filter/preview.xml
View file

@ -24,8 +24,8 @@
<Preview>true</Preview>
</Visibility>
<!-- Displays attack range -->
<RangeOverlayManager merge=""/>
<RangeOverlayRenderer merge=""/>
<RangeVisualization merge=""/>
<!-- Previews should not cast shadows -->
<VisualActor merge="">
<DisableShadows/>

2
binaries/data/mods/public/simulation/templates/template_structure.xml
View file

@ -100,8 +100,8 @@
<LineEndCap>round</LineEndCap>
<LinePassabilityClass>default</LinePassabilityClass>
</RallyPointRenderer>
<RangeOverlayManager/>
<RangeOverlayRenderer/>
<RangeVisualization/>
<Repairable>
<RepairTimeRatio>2.0</RepairTimeRatio>
</Repairable>

2
binaries/data/mods/public/simulation/templates/template_unit.xml
View file

@ -66,8 +66,8 @@
<DisableBlockPathfinding>false</DisableBlockPathfinding>
</Obstruction>
<OverlayRenderer/>
<RangeOverlayManager/>
<RangeOverlayRenderer/>
<RangeVisualization/>
<ResourceGatherer>
<MaxDistance>2.0</MaxDistance>
<BaseSpeed>1.0</BaseSpeed>