From 5dfa4304d30649c824db3faea6877924ad4be41d Mon Sep 17 00:00:00 2001 From: Nou Date: Wed, 28 Jan 2015 12:03:30 -0800 Subject: [PATCH] Tweaks --- addons/interact_menu/functions/fnc_render.sqf | 2 +- addons/interact_menu/functions/fnc_renderIcon.sqf | 1 + addons/interact_menu/functions/fnc_renderMenu.sqf | 14 ++++++++------ addons/interact_menu/functions/fnc_setToRender.sqf | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/addons/interact_menu/functions/fnc_render.sqf b/addons/interact_menu/functions/fnc_render.sqf index 9a0990e861..29033e3407 100644 --- a/addons/interact_menu/functions/fnc_render.sqf +++ b/addons/interact_menu/functions/fnc_render.sqf @@ -81,7 +81,7 @@ if(GVAR(keyDown)) then { GVAR(startHoverTime) = diag_tickTime; GVAR(expanded) = false; } else { - if(!GVAR(expanded) && diag_tickTime-GVAR(startHoverTime) > 0.5) then { + if(!GVAR(expanded) && diag_tickTime-GVAR(startHoverTime) > 0.25) then { GVAR(expanded) = true; GVAR(menuDepthPath) = +GVAR(lastPath); }; diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf index 91e142c95c..39b4b120b9 100644 --- a/addons/interact_menu/functions/fnc_renderIcon.sqf +++ b/addons/interact_menu/functions/fnc_renderIcon.sqf @@ -7,6 +7,7 @@ _color = _this select 1; _pos = _this select 2; _icon = _this select 6; _sPos = worldToScreen _pos; +// _sPos = _pos; if(count _sPos > 0) then { // player sideChat format["render!"]; if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then { diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf index 761fe3f5f1..0337d4e8c9 100644 --- a/addons/interact_menu/functions/fnc_renderMenu.sqf +++ b/addons/interact_menu/functions/fnc_renderMenu.sqf @@ -37,26 +37,28 @@ if(_cursorScreenPos distance _pos <= _distance) then { _currentRenderDepth = GVAR(renderDepth); GVAR(renderDepth) = GVAR(renderDepth) + 1; if(_index == (GVAR(menuDepthPath) select (GVAR(renderDepth)-1))) then { - _radialOffset = 0; - { + _radialOffset = 0; + { // if(_index != (GVAR(menuDepthPath) select (GVAR(renderDepth)))) then { this = _object; _target = _object; _player = ACE_player; _active = [_object, ACE_player] call (_x select 4); + // diag_log text format["_active: %1: %2", (_x select 0), _active]; if(_active) then { _offset = [GVAR(vecLineMap), (270*(GVAR(renderDepth)%2))-(_radialOffset*45)] call FUNC(rotateVectLine); + _mod = 0.1*_distance; _newPos = [ - (_pos select 0) + ((_offset select 0)*0.08*_distance), - (_pos select 1) + ((_offset select 1)*0.08*_distance), - (_pos select 2) + ((_offset select 2)*0.08*_distance) + (_pos select 0) + ((_offset select 0)*_mod), + (_pos select 1) + ((_offset select 1)*_mod), + (_pos select 2) + ((_offset select 2)*_mod) ]; // drawLine3D [_pos, _newPos, [1,0,0,1]]; [_object, _x, _forEachIndex, _newPos, _path] call FUNC(renderMenu); _radialOffset = _radialOffset + 1; }; // }; - } forEach (_actionData select 6); + } forEach (_actionData select 6); }; GVAR(renderDepth) = GVAR(renderDepth) - 1; }; diff --git a/addons/interact_menu/functions/fnc_setToRender.sqf b/addons/interact_menu/functions/fnc_setToRender.sqf index 7b37a1fc80..4cc7cfd68f 100644 --- a/addons/interact_menu/functions/fnc_setToRender.sqf +++ b/addons/interact_menu/functions/fnc_setToRender.sqf @@ -1,6 +1,6 @@ //fnc_setToRender.sqf #include "script_component.hpp" - +// No idea what this function was for, it was autogenerated out of my WIP file... private ["_options"]; _object = _this select 0; _options = _this select 1;