Dogtags - Allow dogtags display to be repositioned #6351
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commy2
reviewed
May 19, 2018
addons/dogtags/CfgUIGrids.hpp
Outdated
| class Presets { | ||
| class Arma3 { | ||
| class Variables { | ||
| grid_ACE_dogtags[] = {{"(safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)", "safeZoneY + 0.175 * safeZoneH", "8 * (((safeZoneW / safeZoneH) min 1.2) / 40)", "8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"}, "(((safeZoneW / safeZoneH) min 1.2) / 40)", "((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"}; |
There was a problem hiding this comment.
Suggestion:
#include "\a3\ui_f\hpp\defineCommonGrids.inc"
Then this line becomes:
GVAR(grid)[] = {
{
(safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W,
safeZoneY + 0.175 * safeZoneH,
8 * GUI_GRID_W,
8 * GUI_GRID_H
},
GUI_GRID_W,
GUI_GRID_H
};
commy2
reviewed
May 19, 2018
addons/dogtags/RscTitles.hpp
Outdated
| x = "profileNamespace getVariable ['IGUI_grid_ACE_dogtags_X', (safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)]"; | ||
| y = "profileNamespace getVariable ['IGUI_grid_ACE_dogtags_Y', safeZoneY + 0.175 * safeZoneH]"; | ||
| w = "8 * (((safeZoneW / safeZoneH) min 1.2) / 40)"; | ||
| h = "8 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"; |
There was a problem hiding this comment.
And this becomes:
x = profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - 12.9 * GUI_GRID_W];
y = profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),Y)', safeZoneY + 0.175 * safeZoneH];
w = 8 * GUI_GRID_W;
h = 8 * GUI_GRID_H;
commy2
reviewed
May 19, 2018
addons/dogtags/RscTitles.hpp
Outdated
| x = "(1.6 * ((safeZoneW / safeZoneH) min 1.2) / 40) + (profileNamespace getVariable ['IGUI_grid_ACE_dogtags_X', (safeZoneX + safeZoneW) - (12.9 * ((safeZoneW / safeZoneH) min 1.2) / 40)])"; | ||
| y = "(0.065 * safeZoneH) + (profileNamespace getVariable ['IGUI_grid_ACE_dogtags_Y', safeZoneY + 0.175 * safeZoneH])"; | ||
| w = "5.9 * (((safeZoneW / safeZoneH) min 1.2) / 40)"; | ||
| h = "3 * ((((safeZoneW / safeZoneH) min 1.2) / 1.2) / 25)"; |
There was a problem hiding this comment.
And this becomes:
x = (1.6 * GUI_GRID_W + (profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', (safeZoneX + safeZoneW) - GUI_GRID_W]);
y = (0.065 * safeZoneH) + (profileNamespace getVariable ['TRIPLES(IGUI,GVAR(grid),X)', safeZoneY + 0.175 * safeZoneH]);
w = 5.9 * GUI_GRID_W;
h = 3 * GUI_GRID_H;I think this makes it much easier to read and comprehend.
PabstMirror
approved these changes
May 31, 2018
BaerMitUmlaut
pushed a commit
that referenced
this pull request
Aug 5, 2019
* Allow dogtags display to be repositioned * Update IGUI preview image * Use common grid macros
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merged this pull request will:
Dogtag.hpptoRscTitles.hppand clean up the file