Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the renderDepth variables

Browse Source
This commit is contained in:
Nicolás Badano 2015-02-27 02:35:37 -03:00
parent 08b15315bf
commit 2371bc1bb0
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/interact_menu/XEH_preInit.sqf
View File

@ -29,8 +29,6 @@ GVAR(actionSelected) = false;
GVAR(selectedTarget) = objNull;
GVAR(menuDepthPath) = [];
GVAR(renderDepth) = 0;
GVAR(lastRenderDepth) = 0;
GVAR(vecLineMap) = [];
GVAR(lastPos) = [0,0,0];
@ -40,7 +38,6 @@ GVAR(lastPath) = [];
GVAR(expanded) = false;
GVAR(maxRenderDepth) = 0;
GVAR(startHoverTime) = diag_tickTime;
GVAR(iconCtrls) = [];
GVAR(iconCount) = 0;

4
addons/interact_menu/functions/fnc_render.sqf
View File

@ -39,7 +39,6 @@ if (GVAR(keyDown)) then {
_active = [_target, ACE_player] call (_actionItem select 4);
if (_active) then {
GVAR(renderDepth) = 0;
[_target, _actionItem, 0, [180, 360]] call FUNC(renderMenu);
};
};
@ -52,7 +51,6 @@ if (GVAR(keyDown)) then {
_active = [_target, ACE_player] call (_actionItem select 4);
if (_active) then {
GVAR(renderDepth) = 0;
[_target, _actionItem, 0, [180, 360]] call FUNC(renderMenu);
};
} forEach _classActions;
@ -80,7 +78,6 @@ if (GVAR(keyDown)) then {
_active = [_target, ACE_player] call (_actionItem select 4);
if (_active) then {
GVAR(renderDepth) = 0;
[_target, _actionItem, 0, [180, 360]] call FUNC(renderMenu);
};
};
@ -94,7 +91,6 @@ if (GVAR(keyDown)) then {
_active = [_target, ACE_player] call (_actionItem select 4);
if (_active) then {
GVAR(renderDepth) = 0;
_pos = (ACE_player modelToWorld (ACE_player selectionPosition "spine3")) vectorAdd GVAR(selfMenuOffset) vectorAdd [0,0,0.25];
[ACE_player, _actionItem, 0, [180, 360], _pos] call FUNC(renderMenu);
};

6
addons/interact_menu/functions/fnc_renderMenu.sqf
View File

@ -64,15 +64,13 @@ _menuInSelectedPath = true;
// ARGB Color (First Hex Pair is transparancy)
_color = "#FFFFFFFF";
if(_menuDepth > 0 && !_menuInSelectedPath) then {
_color = format ["#%1FFFFFF", [255 * (((GVAR(renderDepth)/_menuDepth)) max 0.25)] call EFUNC(common,toHex)];
_color = format ["#%1FFFFFF", [255 * ((((count _path) - 2)/_menuDepth) max 0.25)] call EFUNC(common,toHex)];
};
[_actionData select 0, _color, _pos, 1, 1, 0, _actionData select 1, 0.5, 0.025, "TahomaB"] call FUNC(renderIcon);
// Add the action to current options
GVAR(currentOptions) pushBack [_this, _pos, _path];
_currentRenderDepth = GVAR(renderDepth);
// Exit without rendering children if it isn't
if !(_menuInSelectedPath) exitWith {};
@ -133,9 +131,7 @@ _angle = _centerAngle - _angleSpan / 2;
// drawLine3D [_pos, _newPos, [1,0,0,0.5]];
GVAR(renderDepth) = _currentRenderDepth + 1;
[_object, _x, _forEachIndex, [_angle, 140], _newPos] call FUNC(renderMenu);
GVAR(renderDepth) = _currentRenderDepth;
if (_angleSpan == 360) then {
_angle = _angle + _angleSpan / (count _activeChildren);