mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
c8404f496e
* Arsenal update * Fixes * Update fnc_onSelChangedLeft.sqf * Update fnc_updateUniqueItemsList.sqf * Header fixes * Fix for defines.hpp Co-authored-by: Dystopian <sddex@ya.ru> * Moved fnc_baseWeapon, filtered invalid items * Update addons/arsenal/functions/fnc_scanConfig.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Fixes and tweaks - Sorting is guaranteed to give a fixed order - Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played. * Cleanup, bug fixes and additions - Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs. - Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal. - Added stronger filtering on item scopes (scope > 0 at least for every item) - Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu, - Unique backpacks in containers can now be removed with either the "-" or "clear all items" button. - When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order. * More fixes and tweaks - Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array). - Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely. - Sorting now caches results, reducing repeated sorting times drastically. - CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information. - FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does. - FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal. - Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked. - FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met). * Update fnc_replaceUniqueItemsLoadout.sqf * Update fnc_onSelChangedLeft.sqf * Update fnc_scanConfig.sqf * Update docs/wiki/framework/arsenal-framework.md Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Minor cleanup * Baseweapon filtering * Improvements + better unique items support * Update fnc_fillRightPanel.sqf * Update fnc_onSelChangedLeft.sqf Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine. * Update addons/common/functions/fnc_uniqueUnitItems.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * undefined variable Co-authored-by: PabstMirror <pabstmirror@gmail.com> * fix undefined loadout var * Update fnc_fillLoadoutsList.sqf --------- Co-authored-by: Dystopian <sddex@ya.ru> Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com>
72 lines
2.3 KiB
Plaintext
72 lines
2.3 KiB
Plaintext
#include "script_component.hpp"
|
|
#include "..\defines.hpp"
|
|
/*
|
|
* Author: Karel Moricky, modified by Alganthe, johnb43
|
|
* Update the camera position and pitch/bank.
|
|
* Modernized a bit, modified to fit the rewrite.
|
|
*
|
|
* Arguments:
|
|
* 0: Not used
|
|
* 1: Arguments <ARRAY>
|
|
* 1.0: Mouse area control <CONTROL>
|
|
* 1.1: Mouse X position <NUMBER>
|
|
* 1.2: Mouse Y position <NUMBER>
|
|
*
|
|
* Return Value:
|
|
* None
|
|
*
|
|
* Public: No
|
|
*/
|
|
|
|
params ["", "_args"];
|
|
_args params ["_control", "_mouseX", "_mouseY"];
|
|
|
|
GVAR(cameraPosition) params ["", "_dirH", "_dirV", "_helperPos"];
|
|
GVAR(mouseButtonState) params ["_LMB", "_RMB"];
|
|
|
|
if (count _LMB > 0) then {
|
|
_LMB params ["_LMBcursorX", "_LMBcursorY"];
|
|
private _dX = [_mouseX - _LMBcursorX, _LMBcursorX - _mouseX] select GVAR(camInverted);
|
|
private _dY = [_mouseY -_LMBcursorY, _LMBcursorY - _mouseY] select GVAR(camInverted);
|
|
|
|
private _centerBox = boundingBoxReal GVAR(center);
|
|
private _centerSizeBottom = _centerBox select 0 select 2;
|
|
private _centerSizeUp = _centerBox select 1 select 2;
|
|
private _centerSize = sqrt ([_centerBox select 0 select 0, _centerBox select 0 select 1] distance [_centerBox select 1 select 0, _centerBox select 1 select 1]);
|
|
|
|
_helperPos = [_helperPos, _dX * _centerSize, _dirH - 90] call BIS_fnc_relPos;
|
|
|
|
_helperPos = [
|
|
[0, 0, ((_helperPos select 2) - _dY * _centerSize) max _centerSizeBottom min _centerSizeUp],
|
|
([0, 0, 0] distance2D _helperPos) min _centerSize,
|
|
[0, 0, 0] getDir _helperPos
|
|
] call BIS_fnc_relPos;
|
|
|
|
_helperPos set [2, (_helperPos select 2) max ((_centerBox select 0 select 2) + 0.2)];
|
|
|
|
GVAR(cameraPosition) set [3, _helperPos];
|
|
GVAR(mouseButtonState) set [0, [_mouseX, _mouseY]];
|
|
};
|
|
|
|
if (count _RMB > 0) then {
|
|
_RMB params ["_RMBcursorX", "_RMBcursorY"];
|
|
|
|
private _dX = (_RMBcursorX - _mouseX) * 0.75;
|
|
private _dY = (_RMBcursorY - _mouseY) * 0.75;
|
|
|
|
_helperPos = [
|
|
[0, 0, _helperPos select 2],
|
|
[0, 0, 0] distance2D _helperPos,
|
|
([0, 0, 0] getDir _helperPos) - _dX * 360
|
|
] call BIS_fnc_relPos;
|
|
|
|
GVAR(cameraPosition) set [1, _dirH - _dX * 360];
|
|
GVAR(cameraPosition) set [2, (_dirV - _dY * 100) max -89 min 89];
|
|
GVAR(cameraPosition) set [3, _helperPos];
|
|
GVAR(mouseButtonState) set [1, [_mouseX, _mouseY]];
|
|
};
|
|
|
|
if (!alive GVAR(center)) then {
|
|
(ctrlParent _control) closeDisplay IDC_CANCEL;
|
|
};
|