Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize player events #1289

Merged
merged 15 commits into from
Feb 7, 2020
Merged

optimize player events #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
152a53f
optimize playerEvents
commy2 Feb 1, 2020
1bd0ffd
optimizations for the common case
commy2 Feb 2, 2020
437fc99
optimizations, missing private fix
commy2 Feb 2, 2020
8045584
simplify a check
commy2 Feb 2, 2020
2b2c3ae
simplify a check
commy2 Feb 2, 2020
4ae6fdc
pass old and new states as arguments
commy2 Feb 2, 2020
9b57e86
raise muzzle and weaponMode events on weapon and muzzle switch respec…
commy2 Feb 2, 2020
17c4ecd
Update addons/events/fnc_addPlayerEventHandler.sqf
commy2 Feb 2, 2020
836ccbb
an optimization by dedmen
commy2 Feb 4, 2020
73b7eb2
Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into playe…
commy2 Feb 4, 2020
8cb68c7
offload each frame function to own script file
commy2 Feb 4, 2020
20ede7b
offload each frame function to own script file
commy2 Feb 5, 2020
a286f8c
fix the name in the header
commy2 Feb 5, 2020
b32b5d5
fix some things, add turretWeapon event
commy2 Feb 6, 2020
0c26986
fix some things, add turretWeapon event
commy2 Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/events/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if (isServer) then {
ADDON = true;

if (!hasInterface) exitWith {};
PREP(playerEvent);

GVAR(skipCheckingUserActions) = true;

Expand Down
2 changes: 2 additions & 0 deletions addons/events/XEH_preStart.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "script_component.hpp"

if (hasInterface) then {
PREP(playerEvent);

PREP(initDisplayMission);
PREP(initDisplayMainMap);
PREP(initDisplayCurator);
Expand Down
179 changes: 54 additions & 125 deletions addons/events/fnc_addPlayerEventHandler.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Description:
Possible events:
"unit" - player controlled unit changed
"weapon" - currently selected weapon change
"turretweapon" - currently selected turret weapon change
"muzzle" - currently selected muzzle change
"weaponMode" - currently selected weapon mode change
"loadout" - players loadout changed
"vehicle" - players current vehicle changed
"turret" - position in vehicle changed
Expand Down Expand Up @@ -42,70 +45,93 @@ params [["_type", "", [""]], ["_function", {}, [{}]], ["_applyRetroactively", fa

_type = toLower _type;

// Skip retroactive execution if no current unit.
if (_applyRetroactively && {isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
_applyRetroactively = false;
};

private _id = switch (_type) do {
case "unit": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
if (_applyRetroactively) then {
[GVAR(oldUnit), objNull] call _function;
};
[QGVAR(unitEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "weapon": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), currentWeapon GVAR(oldUnit)] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), currentWeapon GVAR(oldUnit), ""] call _function;
};
[QGVAR(weaponEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "turretweapon": {
if (_applyRetroactively) then {
[GVAR(oldUnit), GVAR(oldUnit) currentWeaponTurret (GVAR(oldUnit) call CBA_fnc_turretPath), ""] call _function;
};
[QGVAR(turretWeaponEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "muzzle": {
if (_applyRetroactively) then {
[GVAR(oldUnit), currentMuzzle GVAR(oldUnit), ""] call _function;
};
[QGVAR(muzzleEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "weaponmode": {
if (_applyRetroactively) then {
[GVAR(oldUnit), currentWeaponMode GVAR(oldUnit), ""] call _function;
};
[QGVAR(weaponModeEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "loadout": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), getUnitLoadout GVAR(oldUnit)] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), getUnitLoadout GVAR(oldUnit), []] call _function;
};
[QGVAR(loadoutEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "vehicle": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), vehicle GVAR(oldUnit)] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), vehicle GVAR(oldUnit), objNull] call _function;
};
[QGVAR(vehicleEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "turret": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), GVAR(oldUnit) call CBA_fnc_turretPath] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), GVAR(oldUnit) call CBA_fnc_turretPath, []] call _function;
};
[QGVAR(turretEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "visionmode": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), currentVisionMode GVAR(oldUnit)] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), currentVisionMode GVAR(oldUnit), -1] call _function;
};
[QGVAR(visionModeEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "cameraview": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), cameraView] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), cameraView, ""] call _function;
};
[QGVAR(cameraViewEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "featurecamera": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
if (_applyRetroactively) then {
[GVAR(oldUnit), call CBA_fnc_getActiveFeatureCamera] call _function;
};
[QGVAR(featureCameraEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "visiblemap": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
if (_applyRetroactively) then {
[GVAR(oldUnit), visibleMap] call _function;
};
[QGVAR(visibleMapEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "group": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), group GVAR(oldUnit)] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), group GVAR(oldUnit), grpNull] call _function;
};
[QGVAR(groupEvent), _function] call CBA_fnc_addEventHandler // return id
};
case "leader": {
if (_applyRetroactively && {!isNull (missionNamespace getVariable [QGVAR(oldUnit), objNull])}) then {
[GVAR(oldUnit), group GVAR(oldUnit)] call _function;
if (_applyRetroactively) then {
[GVAR(oldUnit), leader GVAR(oldUnit), objNull] call _function;
};
[QGVAR(leaderEvent), _function] call CBA_fnc_addEventHandler // return id
};
Expand All @@ -121,127 +147,29 @@ if (_id != -1) then {
GVAR(oldGroup) = grpNull;
GVAR(oldLeader) = objNull;
GVAR(oldWeapon) = "";
GVAR(oldTurretWeapon) = "";
GVAR(oldMuzzle) = [objNull, "", ""];
GVAR(oldWeaponMode) = [objNull, GVAR(oldMuzzle), ""];
GVAR(oldLoadout) = [];
GVAR(oldLoadoutNoAmmo) = [];
GVAR(oldVehicle) = objNull;
GVAR(inVehicle) = false;
GVAR(oldTurret) = [];
GVAR(oldVisionMode) = -1;
GVAR(oldCameraView) = "";
GVAR(oldFeatureCamera) = "";
GVAR(oldVisibleMap) = false;
GVAR(oldUAVControl) = [];
GVAR(controlledEntity) = objNull;

GVAR(playerEHInfo) pushBack addMissionEventHandler ["EachFrame", {call FUNC(playerEH_EachFrame)}];
[QFUNC(playerEH_EachFrame), {
SCRIPT(playerEH_EachFrame);
private _player = missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", player];
if !(_player isEqualTo GVAR(oldUnit)) then {
[QGVAR(unitEvent), [_player, GVAR(oldUnit)]] call CBA_fnc_localEvent;
GVAR(oldUnit) = _player;
GVAR(oldUAVControl) = []; // force update
};

private _data = group _player;
if !(_data isEqualTo GVAR(oldGroup)) then {
[QGVAR(groupEvent), [_player, GVAR(oldGroup)]] call CBA_fnc_localEvent;
GVAR(oldGroup) = _data;
};

_data = leader _player;
if !(_data isEqualTo GVAR(oldLeader)) then {
[QGVAR(leaderEvent), [_player, GVAR(oldLeader)]] call CBA_fnc_localEvent;
GVAR(oldLeader) = _data;
};

_data = currentWeapon _player;
if !(_data isEqualTo GVAR(oldWeapon)) then {
GVAR(oldWeapon) = _data;
[QGVAR(weaponEvent), [_player, _data]] call CBA_fnc_localEvent;
};

_data = getUnitLoadout _player;
if !(_data isEqualTo GVAR(oldLoadout)) then {
GVAR(oldLoadout) = _data;

// we don't want to trigger this just because your ammo counter decreased.
_data = + GVAR(oldLoadout);

{
private _weaponInfo = _data param [_forEachIndex, []];
if !(_weaponInfo isEqualTo []) then {
_weaponInfo set [4, _x];
_weaponInfo deleteAt 5;
};
} forEach [primaryWeaponMagazine _player, secondaryWeaponMagazine _player, handgunMagazine _player];
GVAR(oldState) = [];

if !(_data isEqualTo GVAR(oldLoadoutNoAmmo)) then {
GVAR(oldLoadoutNoAmmo) = _data;
[QGVAR(loadoutEvent), [_player, GVAR(oldLoadout)]] call CBA_fnc_localEvent;
};
};

_data = vehicle _player;
if !(_data isEqualTo GVAR(oldVehicle)) then {
GVAR(oldVehicle) = _data;
[QGVAR(vehicleEvent), [_player, _data]] call CBA_fnc_localEvent;
GVAR(inVehicle) = _data != _player;
if (!GVAR(inVehicle)) then {
_data = _player call CBA_fnc_turretPath;
if !(_data isEqualTo GVAR(oldTurret)) then {
GVAR(oldTurret) = _data;
[QGVAR(turretEvent), [_player, _data]] call CBA_fnc_localEvent;
};
};
};
if (GVAR(inVehicle)) then {
_data = _player call CBA_fnc_turretPath;
if !(_data isEqualTo GVAR(oldTurret)) then {
GVAR(oldTurret) = _data;
[QGVAR(turretEvent), [_player, _data]] call CBA_fnc_localEvent;
};
};

// handle controlling UAV, UAV entity needed for visionMode
_data = UAVControl getConnectedUAV _player;
if !(_data isEqualTo GVAR(oldUAVControl)) then {
GVAR(oldUAVControl) = _data;

private _role = _data param [(_data find _player) + 1, ""];
if (_role isEqualTo "DRIVER") exitWith {
GVAR(controlledEntity) = driver getConnectedUAV _player;
};
GVAR(playerEHInfo) pushBack addMissionEventHandler ["EachFrame", {call FUNC(playerEvent)}];
GVAR(playerEHInfo) pushBack addMissionEventHandler ["Map", {
SCRIPT(playerEvent_Map);

if (_role isEqualTo "GUNNER") exitWith {
GVAR(controlledEntity) = gunner getConnectedUAV _player;
};

GVAR(controlledEntity) = _player;
};

_data = currentVisionMode GVAR(controlledEntity);
if !(_data isEqualTo GVAR(oldVisionMode)) then {
GVAR(oldVisionMode) = _data;
[QGVAR(visionModeEvent), [_player, _data]] call CBA_fnc_localEvent;
};

_data = cameraView;
if !(_data isEqualTo GVAR(oldCameraView)) then {
GVAR(oldCameraView) = _data;
[QGVAR(cameraViewEvent), [_player, _data]] call CBA_fnc_localEvent;
};
}] call CBA_fnc_compileFinal;

GVAR(playerEHInfo) pushBack addMissionEventHandler ["Map", {call FUNC(playerEH_Map)}];
[QFUNC(playerEH_Map), {
SCRIPT(playerEH_Map);
params ["_data"]; // visibleMap is updated one frame later
if !(_data isEqualTo GVAR(oldVisibleMap)) then {
GVAR(oldVisibleMap) = _data;
[QGVAR(visibleMapEvent), [call CBA_fnc_currentUnit, _data]] call CBA_fnc_localEvent;
};
}] call CBA_fnc_compileFinal;
}];

// emulate change to first value from default one frame later
// using spawn-dc to not having to wait for postInit to complete
Expand All @@ -257,6 +185,7 @@ if (_id != -1) then {

GVAR(playerEHInfo) pushBack ([{
SCRIPT(playerEH_featureCamera);

private _data = call CBA_fnc_getActiveFeatureCamera;
if !(_data isEqualTo GVAR(oldFeatureCamera)) then {
GVAR(oldFeatureCamera) = _data;
Expand Down
Loading