Nametag Size Option, selectionPosition for tag pos

addons/nametags/ACE_Settings.hpp

@@ -54,4 +54,12 @@ class ACE_Settings {
         typeName = "SCALAR";
         isClientSettable = 0;
     };
+    class GVAR(tagSize) {
+        value = 2;
+        typeName = "SCALAR";
+        isClientSettable = 1;
+        displayName = "$STR_ACE_nametags_tagsize_name";
+        description = "$STR_ACE_nametags_tagsize_description";
+        values[] = {"$str_very_small", "$str_small", "$str_medium", "$str_large", "$str_very_large"};
+    };
 };

addons/nametags/functions/fnc_drawNameTagIcon.sqf

@@ -16,46 +16,35 @@
 
 #include "script_component.hpp"
 
-#define TEXTURES_RANKS [ \
-    "", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\private_gs.paa", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\corporal_gs.paa", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\sergeant_gs.paa", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\lieutenant_gs.paa", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\captain_gs.paa", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\major_gs.paa", \
-    "\A3\Ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa" \
-    ]
-
-private ["_height", "_position", "_color", "_name", "_rank", "_size", "_icon"];
-
 PARAMS_5(_player,_target,_alpha,_heightOffset,_iconType);
 
-if (_alpha < 0) exitWith {}; //Don't waste time if not visable
+private ["_position", "_color", "_name", "_rank", "_size", "_icon", "_scale"];
+
 if (_iconType == ICON_NONE) exitWith {}; //Don't waste time if not visable
 
-
-//Set Text:
-_name = if (_iconType in [ICON_NAME, ICON_NAME_RANK, ICON_NAME_SPEAK]) then {
-    [_target, true] call EFUNC(common,getName)
-} else {
-    ""
-};
-
 //Set Icon:
 _icon = "";
 _size = 0;
 if ((_iconType == ICON_NAME_SPEAK) || (_iconType == ICON_SPEAK)) then {
     _icon = QUOTE(PATHTOF(UI\soundwave)) + str (floor (random 10)) + ".paa";
-    _size = 0.75;
-    _alpha = _alpha + 0.6;//Boost alpha when speaking
+    _size = 1;
+    _alpha = _alpha max 0.6;//Boost alpha when speaking
 } else {
     if (_iconType == ICON_NAME_RANK) then {
         _icon = TEXTURES_RANKS select ((["PRIVATE", "CORPORAL", "SERGEANT", "LIEUTENANT", "CAPTAIN", "MAJOR", "COLONEL"] find (rank _target)) + 1);
-        _size = 0.75;
+        _size = 1;
     };
 };
 
+if (_alpha < 0) exitWith {}; //Don't waste time if not visable
+
+//Set Text:
+_name = if (_iconType in [ICON_NAME, ICON_NAME_RANK, ICON_NAME_SPEAK]) then {
+    [_target, true] call EFUNC(common,getName)
+} else {
+    ""
+};
+
 //Set Color:
 if !(group _target == group _player) then {
     _color = +GVAR(defaultNametagColor); //Make a copy, then multiply both alpha values (allows client to decrease alpha in settings)
@@ -64,19 +53,20 @@ if !(group _target == group _player) then {
     _color = [[1, 1, 1, _alpha], [1, 0, 0, _alpha], [0, 1, 0, _alpha], [0, 0, 1, _alpha], [1, 1, 0, _alpha]] select (["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find (if (_target == _player) then {0} else {assignedTeam _target})) max 0
 };
 
-_height = [2, 1.5, 1, 1.5, 1] select (["STAND", "CROUCH", "PRONE", "UNDEFINED", ""] find (stance _target));
 // Convert position to ASLW (expected by drawIcon3D) and add height offsets
-_position = _target modelToWorldVisual [0, 0, (_height + _heightOffset)];
+_position = _target modelToWorldVisual ((_target selectionPosition "pilot") vectorAdd [0,0,(_heightOffset + .35)]);
+
+_scale = [0.333, 0.5, 0.666, 0.83333, 1] select GVAR(tagSize);
 
 drawIcon3D [
 _icon,
 _color,
 _position,
-_size,
-_size,
+(_size * _scale),
+(_size * _scale),
 0,
 _name,
 2,
-0.033,
+(0.05 * _scale),
 "PuristaMedium"
 ];

addons/nametags/functions/fnc_onDraw3d.sqf

@@ -97,13 +97,7 @@ if (((GVAR(showPlayerNames) in [1,3]) && {_onKeyPressAlphaMax > 0}) || {GVAR(sho
             _distance = vectorMagnitude _relPos;
             _projDist = _relPos vectorDistance (_vecy vectorMultiply (_relPos vectorDotProduct _vecy));
 
-            _alpha = ((1 - 0.2 * (_distance - _maxDistance)) min (1 - 0.15 * (_projDist * 5 - _distance - 3)) min 1) * GVAR(PlayerNamesMaxAlpha);
-
-            if ((GVAR(showSoundWaves) == 2) && {([_target] call FUNC(isSpeaking)) && {(vehicle _target) == _target}}) then {
-                _alpha = 1;
-            } else {
-                _alpha = (_alpha min _onKeyPressAlphaMax);
-            };
+            _alpha = (((1 - 0.2 * (_distance - _maxDistance)) min 1) * GVAR(PlayerNamesMaxAlpha)) min _onKeyPressAlphaMax;
 
             [ACE_player, _target, _alpha, _distance * 0.026, _icon] call FUNC(drawNameTagIcon);
         };

addons/nametags/script_component.hpp

@@ -2,11 +2,11 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 #ifdef DEBUG_ENABLED_NAMETAGS
-    #define DEBUG_MODE_FULL
+#define DEBUG_MODE_FULL
 #endif
 
 #ifdef DEBUG_SETTINGS_NAMETAGS
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_NAMETAGS
+#define DEBUG_SETTINGS DEBUG_SETTINGS_NAMETAGS
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
@@ -16,3 +16,15 @@
 #define ICON_NAME_RANK 2
 #define ICON_NAME_SPEAK 3
 #define ICON_SPEAK 4
+
+//todo?: custom rank icons??
+#define TEXTURES_RANKS [ \
+    "", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\private_gs.paa", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\corporal_gs.paa", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\sergeant_gs.paa", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\lieutenant_gs.paa", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\captain_gs.paa", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\major_gs.paa", \
+    "\A3\Ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa" \
+    ]

addons/nametags/stringtable.xml

@@ -197,5 +197,11 @@
             <English></English>
             <Polish>Opcja ta pozwala dostosować sposób wyświetlania efektu fal dźwiękowych nad głowami mówiących graczy, wyświetlanych po przytrzymaniu klawisza PTT. Opcja ta współpracuje z TFAR oraz ACRE2.</Polish>
         </Key>
+        <Key ID="STR_ACE_nametags_tagsize_name">
+            <English>Nametags Size</English>
+        </Key>
+        <Key ID="STR_ACE_nametags_tagsize_description">
+            <English>Text and Icon Size Scaling</English>
+        </Key>
     </Package>
 </Project>