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

Add ability to abort module destination (#5284)

Browse Source 
* Add the ability to abort a module action via ace_zeus_fnc_getModuleDestination
* Action can be aborted by pressing ESC
* Current position is still passed to the code callback
This commit is contained in:
Christian Klemm 2017-07-10 13:41:35 +02:00 committed by SilentSpike
parent 4483045604
commit 16439f5640
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -51,6 +51,7 @@ Brakoviejo
Brisse <brisse@outlook.com> Brisse <brisse@outlook.com>
Brostrom.A | Evul <andreas.brostrom.ce@gmail.com> Brostrom.A | Evul <andreas.brostrom.ce@gmail.com>
BullHorn <bullhorn7@gmail.com> BullHorn <bullhorn7@gmail.com>
chris579 <github@klemm.one>
Clon1998 <ps.patti1998@gmail.com> Clon1998 <ps.patti1998@gmail.com>
Codingboy Codingboy
Coren <coren4@gmail.com> Coren <coren4@gmail.com>

65
addons/zeus/functions/fnc_getModuleDestination.sqf
View File

@ -5,10 +5,16 @@
* Arguments: * Arguments:
* 0: The souce object <OBJECT> * 0: The souce object <OBJECT>
* 1: Code to run when position is ready <CODE> * 1: Code to run when position is ready <CODE>
* - Code is passed [0: Successful <BOOL>, 1: Object <OBJECT>, 2: Position ASL <ARRAY>] * - Code is passed
* 2: Text <STRING><OPTIONAL> * 0: Successful <BOOL>
* 3: Icon image file <STRING><OPTIONAL> * 1: Object <OBJECT>
* 4: Icon color <ARRAY><OPTIONAL> * 2: Position ASL <ARRAY>
* 3: State of Shift <BOOL>
* 4: State of Ctrl <BOOL>
* 5: State of Alt <BOOL>
* 2: Text <STRING> (default: "")
* 3: Icon image file <STRING> (default: "\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa")
* 4: Icon color <ARRAY> (default: [1,0,0,1])
* *
* Return Value: * Return Value:
* None * None
@ -23,17 +29,22 @@
params ["_object", "_code", ["_text", ""], ["_icon", "\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa"], ["_color", [1,0,0,1]]]; params ["_object", "_code", ["_text", ""], ["_icon", "\a3\ui_f\data\IGUI\Cfg\Cursors\select_target_ca.paa"], ["_color", [1,0,0,1]]];
if (missionNamespace getVariable [QGVAR(moduleDestination_running), false]) exitWith { if (missionNamespace getVariable [QGVAR(moduleDestination_running), false]) exitWith {
[false, _object, [0,0,0]] call _code; [false, _object, [0,0,0], false, false, false] call _code;
ERROR("getModuleDestination already running"); ERROR("getModuleDestination already running");
}; };
GVAR(moduleDestination_running) = true; GVAR(moduleDestination_running) = true;
// Add mouse button eh for the zeus display (triggered from 2d or 3d) // Add mouse button eh for the zeus display (triggered from 2d or 3d)
GVAR(moduleDestination_displayEH) = [(findDisplay 312), "mouseButtonDown", { GVAR(moduleDestination_displayEHMouse) = [findDisplay 312, "mouseButtonDown", {
params ["", "_mouseButton"]; params ["", "_mouseButton", "", "", "_shift", "_ctrl", "_alt"];
if (_mouseButton != 0) exitWith {}; // Only watch for LMB if (_mouseButton != 0) exitWith {}; // Only watch for LMB
TRACE_2("placed",_object,_mousePosASL);
_thisArgs params ["_object", "_code"]; _thisArgs params ["_object", "_code"];
// Get mouse position on 2D map or 3D world
private _mousePosASL = if (ctrlShown ((findDisplay 312) displayCtrl 50)) then { private _mousePosASL = if (ctrlShown ((findDisplay 312) displayCtrl 50)) then {
private _pos2d = (((findDisplay 312) displayCtrl 50) ctrlMapScreenToWorld getMousePosition); private _pos2d = (((findDisplay 312) displayCtrl 50) ctrlMapScreenToWorld getMousePosition);
_pos2d set [2, getTerrainHeightASL _pos2d]; _pos2d set [2, getTerrainHeightASL _pos2d];
@ -41,12 +52,35 @@ GVAR(moduleDestination_displayEH) = [(findDisplay 312), "mouseButtonDown", {
} else { } else {
AGLToASL (screenToWorld getMousePosition); AGLToASL (screenToWorld getMousePosition);
}; };
TRACE_2("placed",_object,_mousePosASL);
[true, _object, _mousePosASL] call _code; [true, _object, _mousePosASL, _shift, _ctrl, _alt] call _code;
GVAR(moduleDestination_running) = false; GVAR(moduleDestination_running) = false;
}, [_object, _code]] call CBA_fnc_addBISEventHandler; }, [_object, _code]] call CBA_fnc_addBISEventHandler;
// Add draw eh for the zeus map - draws the 2d icon and line // Add key eh for the zeus display (triggered from 2d or 3d)
GVAR(moduleDestination_displayEHKeyboard) = [findDisplay 312, "KeyDown", {
params ["", "_keyCode", "_shift", "_ctrl", "_alt"];
if (_keyCode != 1) exitWith {}; // Only watch for ESC
TRACE_2("aborted",_object,_mousePosASL);
_thisArgs params ["_object", "_code"];
// Get mouse position on 2D map or 3D world
private _mousePosASL = if (ctrlShown ((findDisplay 312) displayCtrl 50)) then {
private _pos2d = (((findDisplay 312) displayCtrl 50) ctrlMapScreenToWorld getMousePosition);
_pos2d set [2, getTerrainHeightASL _pos2d];
_pos2d
} else {
AGLToASL (screenToWorld getMousePosition);
};
[false, _object, _mousePosASL, _shift, _ctrl, _alt] call _code;
GVAR(moduleDestination_running) = false;
true
}, [_object, _code]] call CBA_fnc_addBISEventHandler;
// Add draw EH for the zeus map - draws the 2D icon and line
GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw", { GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw", {
params ["_mapCtrl"]; params ["_mapCtrl"];
_thisArgs params ["_object", "_text", "_icon", "_color"]; _thisArgs params ["_object", "_text", "_icon", "_color"];
@ -56,12 +90,13 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw",
_mapCtrl drawLine [getPos _object, _pos2d, _color]; _mapCtrl drawLine [getPos _object, _pos2d, _color];
}, [_object, _text, _icon, _color]] call CBA_fnc_addBISEventHandler; }, [_object, _text, _icon, _color]] call CBA_fnc_addBISEventHandler;
// Add draw EH for 3D camera view - draws the 3D icon and line
[{ [{
(_this select 0) params ["_object", "_code", "_text", "_icon", "_color"]; (_this select 0) params ["_object", "_code", "_text", "_icon", "_color"];
if ((isNull _object) || {isNull findDisplay 312} || {!isNull findDisplay 49}) then { if ((isNull _object) || {isNull findDisplay 312} || {!isNull findDisplay 49}) then {
TRACE_3("null-exit",isNull _object,isNull findDisplay 312,isNull findDisplay 49); TRACE_3("null-exit",isNull _object,isNull findDisplay 312,isNull findDisplay 49);
GVAR(moduleDestination_running) = false; GVAR(moduleDestination_running) = false;
[false, _object, [0,0,0]] call _code; [false, _object, [0,0,0], false, false, false] call _code;
}; };
if (GVAR(moduleDestination_running)) then { if (GVAR(moduleDestination_running)) then {
// Draw the 3d icon and line // Draw the 3d icon and line
@ -69,11 +104,13 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw",
drawIcon3D [_icon, _color, _mousePosAGL, 1.5, 1.5, 45, _text]; drawIcon3D [_icon, _color, _mousePosAGL, 1.5, 1.5, 45, _text];
drawLine3D [_mousePosAGL, ASLtoAGL (getPosASL _object), _color];; drawLine3D [_mousePosAGL, ASLtoAGL (getPosASL _object), _color];;
} else { } else {
TRACE_3("cleaning up",_this select 1, GVAR(moduleDestination_displayEH), GVAR(moduleDestination_mapDrawEH)); TRACE_4("cleaning up",_this select 1,GVAR(moduleDestination_displayEHMouse),GVAR(moduleDestination_displayEHKeyboard),GVAR(moduleDestination_mapDrawEH));
(_this select 1) call CBA_fnc_removePerFrameHandler; (_this select 1) call CBA_fnc_removePerFrameHandler;
(findDisplay 312) displayRemoveEventHandler ["mouseButtonDown", GVAR(moduleDestination_displayEH)]; (findDisplay 312) displayRemoveEventHandler ["mouseButtonDown", GVAR(moduleDestination_displayEHMouse)];
(findDisplay 312) displayRemoveEventHandler ["KeyDown", GVAR(moduleDestination_displayEHKeyboard)];
((findDisplay 312) displayCtrl 50) ctrlRemoveEventHandler ["draw", GVAR(moduleDestination_mapDrawEH)]; ((findDisplay 312) displayCtrl 50) ctrlRemoveEventHandler ["draw", GVAR(moduleDestination_mapDrawEH)];
GVAR(moduleDestination_displayEH) = nil; GVAR(moduleDestination_displayEHMouse) = nil;
GVAR(moduleDestination_displayEHKeyboard) = nil;
GVAR(moduleDestination_mapDrawEH) = nil; GVAR(moduleDestination_mapDrawEH) = nil;
}; };
}, 0, [_object, _code, _text, _icon, _color]] call CBA_fnc_addPerFrameHandler; }, 0, [_object, _code, _text, _icon, _color]] call CBA_fnc_addPerFrameHandler;