diff --git a/binaries/data/mods/public/simulation/components/Auras.js b/binaries/data/mods/public/simulation/components/Auras.js index b78dd4eb02..4f4e60cbdb 100644 --- a/binaries/data/mods/public/simulation/components/Auras.js +++ b/binaries/data/mods/public/simulation/components/Auras.js @@ -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); } } }; diff --git a/binaries/data/mods/public/simulation/components/GuiInterface.js b/binaries/data/mods/public/simulation/components/GuiInterface.js index d992009b09..d904bc7fbb 100644 --- a/binaries/data/mods/public/simulation/components/GuiInterface.js +++ b/binaries/data/mods/public/simulation/components/GuiInterface.js @@ -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); diff --git a/binaries/data/mods/public/simulation/components/RangeVisualization.js b/binaries/data/mods/public/simulation/components/RangeOverlayManager.js similarity index 59% rename from binaries/data/mods/public/simulation/components/RangeVisualization.js rename to binaries/data/mods/public/simulation/components/RangeOverlayManager.js index e6c91a6d86..e8dafb847d 100644 --- a/binaries/data/mods/public/simulation/components/RangeVisualization.js +++ b/binaries/data/mods/public/simulation/components/RangeOverlayManager.js @@ -1,8 +1,8 @@ -function RangeVisualization() {} +function RangeOverlayManager() {} -RangeVisualization.prototype.Schema = ""; +RangeOverlayManager.prototype.Schema = ""; -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); diff --git a/binaries/data/mods/public/simulation/components/interfaces/RangeOverlayManager.js b/binaries/data/mods/public/simulation/components/interfaces/RangeOverlayManager.js new file mode 100644 index 0000000000..dc9b92cca8 --- /dev/null +++ b/binaries/data/mods/public/simulation/components/interfaces/RangeOverlayManager.js @@ -0,0 +1 @@ +Engine.RegisterInterface("RangeOverlayManager"); diff --git a/binaries/data/mods/public/simulation/components/interfaces/RangeVisualization.js b/binaries/data/mods/public/simulation/components/interfaces/RangeVisualization.js deleted file mode 100644 index ea36ce68da..0000000000 --- a/binaries/data/mods/public/simulation/components/interfaces/RangeVisualization.js +++ /dev/null @@ -1 +0,0 @@ -Engine.RegisterInterface("RangeVisualization"); diff --git a/binaries/data/mods/public/simulation/components/tests/test_Auras.js b/binaries/data/mods/public/simulation/components/tests/test_Auras.js index 23a0e038c5..c7406793c4 100644 --- a/binaries/data/mods/public/simulation/components/tests/test_Auras.js +++ b/binaries/data/mods/public/simulation/components/tests/test_Auras.js @@ -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"); diff --git a/binaries/data/mods/public/simulation/templates/special/filter/preview.xml b/binaries/data/mods/public/simulation/templates/special/filter/preview.xml index e58113ed7c..0c39862255 100644 --- a/binaries/data/mods/public/simulation/templates/special/filter/preview.xml +++ b/binaries/data/mods/public/simulation/templates/special/filter/preview.xml @@ -24,8 +24,8 @@ true + - diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml index ca6cdae754..21add38784 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure.xml @@ -100,8 +100,8 @@ round default + - 2.0 diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml index 976950c4a3..be95f1cdcb 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit.xml @@ -66,8 +66,8 @@ false + - 2.0 1.0