Page MenuHomeWildfire Games
Differential D2405

[WIP] - Show turrets separately from hidden entities in a garrisonHolder.
Changes PlannedPublic
Actions

Authored by Freagarach on Nov 5 2019, 9:40 AM.

Details

Reviewers
None
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Summary

We need a GUI overhaul badly.

This shows the hidden garrisoned entities differently from entities which are currently a turret.
Could be used for the functionality mentioned in #3488.

It would be nice if the combined health bar could also be shown :)

Test Plan

Verify this works as intented.

Diff Detail

Event Timeline

Freagarach created this revision.Nov 5 2019, 9:40 AM
Freagarach created this object with visibility "No One".
Owners added a subscriber: Restricted Owners Package.Nov 5 2019, 9:40 AM
Freagarach updated this revision to Diff 10275.Nov 5 2019, 9:14 PM
Freagarach edited the summary of this revision. (Show Details)
Freagarach added a reviewer: Restricted Owners Package.
Freagarach changed the visibility from "No One" to "Public (No Login Required)".
Freagarach added a child revision: D1958: Turrets and/or sub-units..Nov 5 2019, 9:17 PM
Vulcan added a comment.Nov 5 2019, 9:17 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/540/display/redirect

Freagarach mentioned this in D1958: Turrets and/or sub-units..Nov 5 2019, 9:19 PM
Freagarach edited the summary of this revision. (Show Details)Nov 5 2019, 9:23 PM
Freagarach added a child revision: D2372: [WIP] - Support for mining..Nov 5 2019, 9:27 PM
Freagarach retitled this revision from [WIP] - Show turrets seperately from hidden entities in a garrisonHolder. to [WIP] - Show turrets separately from hidden entities in a garrisonHolder..
Vulcan added a comment.Nov 5 2019, 9:31 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/gui/ObjectBases/IGUIButtonBehavior.h
|  38| class·IGUIButtonBehavior
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classIGUIButtonBehavior{' is invalid C code. Use --std or --language to configure the language.
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
| 823| 823| 		updateEntityColor(data.showAllStatusBars && (i == player || player == -1) ?
| 824| 824| 			[IID_Minimap, IID_RangeOverlayRenderer, IID_RallyPointRenderer, IID_StatusBars] :
| 825| 825| 			[IID_Minimap, IID_RangeOverlayRenderer, IID_RallyPointRenderer],
| 826|    |-			cmpRangeManager.GetEntitiesByPlayer(i));
|    | 826|+		cmpRangeManager.GetEntitiesByPlayer(i));
| 827| 827| 	}
| 828| 828| 	updateEntityColor([IID_Selectable, IID_StatusBars], data.selected);
| 829| 829| 	Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager).UpdateColors();
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|1656|1656| 			{
|1657|1657| 				minDist2 = dist2;
|1658|1658| 				minDistEntitySnapData = {
|1659|    |-						"x": pos.x,
|    |1659|+					"x": pos.x,
|1660|1660| 						"z": pos.z,
|1661|1661| 						"angle": cmpPosition.GetRotation().y,
|1662|1662| 						"ent": ent
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|1657|1657| 				minDist2 = dist2;
|1658|1658| 				minDistEntitySnapData = {
|1659|1659| 						"x": pos.x,
|1660|    |-						"z": pos.z,
|    |1660|+					"z": pos.z,
|1661|1661| 						"angle": cmpPosition.GetRotation().y,
|1662|1662| 						"ent": ent
|1663|1663| 				};
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|1658|1658| 				minDistEntitySnapData = {
|1659|1659| 						"x": pos.x,
|1660|1660| 						"z": pos.z,
|1661|    |-						"angle": cmpPosition.GetRotation().y,
|    |1661|+					"angle": cmpPosition.GetRotation().y,
|1662|1662| 						"ent": ent
|1663|1663| 				};
|1664|1664| 			}
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 5 tabs but found 6.
|----|    | /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
|1659|1659| 						"x": pos.x,
|1660|1660| 						"z": pos.z,
|1661|1661| 						"angle": cmpPosition.GetRotation().y,
|1662|    |-						"ent": ent
|    |1662|+					"ent": ent
|1663|1663| 				};
|1664|1664| 			}
|1665|1665| 		}
|    | [NORMAL] ESLintBear (space-before-function-paren):
|    | Unexpected space before function parentheses.
|----|    | /zpool0/trunk/binaries/data/mods/public/gui/session/selection_panels.js
|    |++++| /zpool0/trunk/binaries/data/mods/public/gui/session/selection_panels.js
| 761| 761| 				addResearchToQueue(data.item.researchFacilityId, t);
| 762| 762| 			})(tech);
| 763| 763| 
| 764|    |-			button.onPressRight = (t => function () {
|    | 764|+			button.onPressRight = (t => function() {
| 765| 765| 				showTemplateDetails(
| 766| 766| 					t,
| 767| 767| 					GetTemplateData(data.unitEntStates.find(state => state.id == data.item.researchFacilityId).template).nativeCiv);

binaries/data/mods/public/gui/session/selection_panels.js
|  50| »   »   »   switch·(data.item)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/selection_panels.js
|  61| »   »   switch·(data.item)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.

binaries/data/mods/public/gui/session/selection_panels.js
| 729| »   »   »   »   »   »   switch·(entity.check)
|    | [NORMAL] ESLintBear (default-case):
|    | Expected a default case.
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1053/display/redirect

Harbormaster completed remote builds in B9960: Diff 10275.Nov 5 2019, 9:31 PM
Stan added a subscriber: Stan.Nov 6 2019, 11:42 AM
Stan added inline comments.
binaries/data/mods/public/gui/session/selection_panels.js
1024

Magic number ? Is it used anywhere else ?

Freagarach added inline comments.Nov 6 2019, 4:36 PM
binaries/data/mods/public/gui/session/selection_panels.js
338

From here. I was trying to combine, yet seperate them.

Freagarach mentioned this in rP23179: Amphitheater name fix, Gladiator commit and amphitheater integration, Maurya….Nov 24 2019, 2:32 PM
Freagarach planned changes to this revision.Nov 25 2019, 9:36 AM
  • Do not use the middle mouse button.
  • It probably requires a GUI overhaul, since there is no logical place of showing this now.
Freagarach removed a child revision: D1958: Turrets and/or sub-units..Mar 17 2020, 11:51 AM
wraitii added a subscriber: wraitii.May 30 2020, 3:42 PM

I think we need D2367 first, but this seems like another step in the right direction.

I am wondering if we don't want a specific "popup" panel for this though.

Freagarach added a parent revision: D3150: Technically seperate Turrets from GarrisonHolder..Dec 11 2020, 10:58 AM
Freagarach removed a child revision: D2372: [WIP] - Support for mining..

Revision Contents
Changeset List

PathSize
binaries/
data/
mods/
public/
gui/
session/
73 lines
15 lines
selection_panels_right/
13 lines
7 lines
simulation/
components/
33 lines
4 lines
source/
gui/
5 lines
ObjectBases/
1 line
25 lines
3 lines

Diff 10275

View Options

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

Loading...
View Options

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

Loading...
View Options

binaries/data/mods/public/gui/session/selection_panels_right/turrets_panel.xml

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

source/gui/CGUI.cpp

Loading...
View Options

source/gui/ObjectBases/IGUIButtonBehavior.h

Loading...
View Options

source/gui/ObjectBases/IGUIButtonBehavior.cpp

Loading...
View Options

source/gui/SGUIMessage.h

Loading...
Wildfire Games · Phabricator