mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Initial commit for finger-pointing module
This commit is contained in:
parent
c40a2a9a2f
commit
96e073e66d
@ -101,3 +101,4 @@ Valentin Torikian <valentin.torikian@gmail.com>
|
||||
VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
|
||||
Winter <simon@agius-muscat.net>
|
||||
zGuba
|
||||
Drill <drill87@gmail.com>
|
||||
|
1
addons/finger/$PBOPREFIX$
Normal file
1
addons/finger/$PBOPREFIX$
Normal file
@ -0,0 +1 @@
|
||||
z\ace\addons\finger
|
23
addons/finger/ACE_Settings.hpp
Normal file
23
addons/finger/ACE_Settings.hpp
Normal file
@ -0,0 +1,23 @@
|
||||
#include "code\addon.hpp"
|
||||
|
||||
#define LOC(x) $__LOCALIZE_PREFIX__##x
|
||||
|
||||
|
||||
class ACE_Settings {
|
||||
class GVAR(FP_indicator_for_self) {
|
||||
displayName = LOC(indicator_for_self);
|
||||
description = LOC(indicator_for_self__desc);
|
||||
isClientSettable = 1;
|
||||
typeName = "BOOL";
|
||||
value = 1;
|
||||
};
|
||||
class GVAR(FP_indicator_color)
|
||||
{
|
||||
value[] = {0.83, 0.68, 0.21, 0.75};
|
||||
typeName = "COLOR";
|
||||
isClientSettable = 1;
|
||||
displayName = LOC(color);
|
||||
description = LOC(color__desc);
|
||||
};
|
||||
|
||||
};
|
26
addons/finger/code/addon.hpp
Normal file
26
addons/finger/code/addon.hpp
Normal file
@ -0,0 +1,26 @@
|
||||
#ifndef __ADDON_HPP_
|
||||
#define __ADDON_HPP_
|
||||
|
||||
|
||||
#define __ADDON_NAME__ ace_finger
|
||||
#define __BASENAME__ __ADDON_NAME__##_var
|
||||
#define __PREFIX__ "\z\ace\addons\finger"
|
||||
#define __PREFIXC__ "\z\ace\addons\finger\code\"
|
||||
|
||||
#define FUNC(x) __BASENAME__##_fnc_##x
|
||||
#define CFUNC(x) __ADDON_NAME__##_fnc_##x
|
||||
|
||||
#define GVAR(x) __BASENAME__##_##x
|
||||
|
||||
#define __LOCALIZE_PREFIX__ STR_Addons_ACE__dfinger__
|
||||
#define LOCALIZE(x) (localize ('__LOCALIZE_PREFIX__##x'))
|
||||
|
||||
|
||||
|
||||
|
||||
#define PV(x) private ['x']; x
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
24
addons/finger/code/fn__OEF_renderer.sqf
Normal file
24
addons/finger/code/fn__OEF_renderer.sqf
Normal file
@ -0,0 +1,24 @@
|
||||
#include "addon.hpp"
|
||||
#include "main.hpp"
|
||||
|
||||
#define BASE_SIZE 44
|
||||
|
||||
|
||||
PV(_pos) = [0,0,0];
|
||||
PV(_name) = "";
|
||||
|
||||
|
||||
PV(_fov_corr) = ((worldToScreen (positionCameraToWorld [1000, 0, 10000])) select 0) - 0.5;
|
||||
PV(_sz) = BASE_SIZE * _fov_corr;
|
||||
|
||||
{
|
||||
_pos = _x select 0;
|
||||
_name = _x select 1;
|
||||
|
||||
drawIcon3D [FP_ICON, [
|
||||
GVAR(FP_indicator_color) select 0,
|
||||
GVAR(FP_indicator_color) select 1,
|
||||
GVAR(FP_indicator_color) select 2,
|
||||
(GVAR(FP_indicator_color) select 3) max MIN_OPAQUE
|
||||
], _pos, _sz, _sz, 0, _name, 1, 0.03, "PuristaMedium"];
|
||||
} forEach MAP_VALUES(GVAR(cur_fps));
|
94
addons/finger/code/fn__comm.sqf
Normal file
94
addons/finger/code/fn__comm.sqf
Normal file
@ -0,0 +1,94 @@
|
||||
#include "addon.hpp"
|
||||
#include "main.hpp"
|
||||
|
||||
// finger-pointing array format:
|
||||
// 1: source player
|
||||
// 2: position of finger-pointing
|
||||
// 3: players to broadcast the finger-pointing to
|
||||
|
||||
// server-side event-handlers
|
||||
|
||||
if (isServer) then
|
||||
{
|
||||
// receives finger-pointing array and broadcasts it to provided players
|
||||
|
||||
GVAR(fnc_pv_fpToServer) =
|
||||
{
|
||||
LOGV(_this);
|
||||
|
||||
PV(_val) = _this select 1;
|
||||
|
||||
PV(_sp) = _val select 0;
|
||||
PV(_pfp) = _val select 1;
|
||||
PV(_dps) = _val select 2;
|
||||
|
||||
GVAR(pv_fpToClient) = [_sp, _pfp];
|
||||
PV(_owner) = 0;
|
||||
{
|
||||
_owner = owner _x;
|
||||
|
||||
LOGV(_x);
|
||||
LOGV(_owner);
|
||||
|
||||
if (_owner > 0 && {isPlayer _x}) then
|
||||
{
|
||||
if (player == _x) then
|
||||
{
|
||||
[0, GVAR(pv_fpToClient)] call GVAR(fnc_pv_fpToClient);
|
||||
}
|
||||
else
|
||||
{
|
||||
_owner publicVariableClient 'GVAR(pv_fpToClient)';
|
||||
};
|
||||
};
|
||||
} forEach _dps;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
'GVAR(pv_fpToServer)' addPublicVariableEventHandler GVAR(fnc_pv_fpToServer);
|
||||
|
||||
};
|
||||
|
||||
|
||||
if (hasInterface) then
|
||||
{
|
||||
// currently shown finger-pointings map
|
||||
// key: source player
|
||||
// value: [position, source player name, last update time]
|
||||
//
|
||||
|
||||
|
||||
GVAR(cur_fps) = CREATE_MAP();
|
||||
|
||||
GVAR(fp_handler_running) = false;
|
||||
|
||||
|
||||
// receives pointing-object and starts drawing process in format
|
||||
// 1: source player
|
||||
// 2: position of finger-pointing
|
||||
//
|
||||
|
||||
GVAR(fnc_pv_fpToClient) = {
|
||||
LOGV(_this);
|
||||
|
||||
PV(_val) = _this select 1;
|
||||
PV(_sp) = _val select 0;
|
||||
PV(_pfp) = _val select 1;
|
||||
|
||||
PV(_newval) = [_pfp, name _sp, diag_tickTime];
|
||||
MAP_SET(GVAR(cur_fps), _sp, _newval);
|
||||
|
||||
if (!GVAR(fp_handler_running)) then
|
||||
{
|
||||
GVAR(fp_handler_running) = true;
|
||||
|
||||
[] spawn CFUNC(_fp_handler);
|
||||
};
|
||||
};
|
||||
|
||||
'GVAR(pv_fpToClient)' addPublicVariableEventHandler GVAR(fnc_pv_fpToClient);
|
||||
|
||||
|
||||
};
|
44
addons/finger/code/fn__fp_handler.sqf
Normal file
44
addons/finger/code/fn__fp_handler.sqf
Normal file
@ -0,0 +1,44 @@
|
||||
#include "addon.hpp"
|
||||
#include "main.hpp"
|
||||
|
||||
['GVAR(_OEF_renderer)', "onEachFrame", CFUNC(_OEF_renderer)]
|
||||
call BIS_fnc_addStackedEventHandler;
|
||||
|
||||
|
||||
// deleting figner-pointings which last more than FP_TIMEOUT
|
||||
|
||||
while {MAP_LEN(GVAR(cur_fps)) > 0} do
|
||||
{
|
||||
if (!(
|
||||
alive player &&
|
||||
{player == vehicle player ||
|
||||
(vehicle player) isKindOf "StaticWeapon"}
|
||||
)) exitWith
|
||||
{
|
||||
GVAR(cur_fps) = CREATE_MAP();
|
||||
};
|
||||
|
||||
|
||||
_ct = diag_tickTime;
|
||||
|
||||
_i = 0;
|
||||
while {_i < MAP_LEN(GVAR(cur_fps))} do
|
||||
{
|
||||
_e = MAP_VALUES(GVAR(cur_fps)) select _i;
|
||||
if (_ct > (_e select 2) + FP_TIMEOUT) then
|
||||
{
|
||||
MAP_IDEL(GVAR(cur_fps), _i);
|
||||
}
|
||||
else
|
||||
{
|
||||
_i = _i + 1;
|
||||
};
|
||||
};
|
||||
|
||||
sleep 0.1;
|
||||
};
|
||||
|
||||
|
||||
['GVAR(_OEF_renderer)', "onEachFrame"] call BIS_fnc_addStackedEventHandler;
|
||||
|
||||
GVAR(fp_handler_running) = false;
|
18
addons/finger/code/fn__init.sqf
Normal file
18
addons/finger/code/fn__init.sqf
Normal file
@ -0,0 +1,18 @@
|
||||
#include "addon.hpp"
|
||||
#include "main.hpp"
|
||||
|
||||
[] spawn
|
||||
{
|
||||
[] call CFUNC(_comm);
|
||||
};
|
||||
|
||||
|
||||
if (hasInterface) then
|
||||
{
|
||||
[] spawn
|
||||
{
|
||||
[] call CFUNC(_mainLoop);
|
||||
};
|
||||
};
|
||||
|
||||
|
90
addons/finger/code/fn__mainLoop.sqf
Normal file
90
addons/finger/code/fn__mainLoop.sqf
Normal file
@ -0,0 +1,90 @@
|
||||
#include "addon.hpp"
|
||||
#include "main.hpp"
|
||||
|
||||
LOG("Starting");
|
||||
|
||||
//while {isNull (findDisplay 46)} do {sleep 1;};
|
||||
|
||||
|
||||
GVAR(FP_keyComb) = [41, false, true, false]; // Ctrl + Tilda
|
||||
|
||||
GVAR(lastFPTime) = -FP_ACTION_TIMEOUT;
|
||||
|
||||
|
||||
["ACE3 Common",
|
||||
"point_finger_at",
|
||||
[LOCALIZE(keyComb), LOCALIZE(keyComb)],
|
||||
{
|
||||
|
||||
PV(_rv) = false;
|
||||
if (alive player) then
|
||||
{
|
||||
if (!(
|
||||
(player == vehicle player ||
|
||||
(vehicle player) isKindOf "StaticWeapon") &&
|
||||
cameraView in ["INTERNAL", "EXTERNAL"]
|
||||
)) exitWith {};
|
||||
|
||||
_rv = true;
|
||||
|
||||
if (diag_tickTime < GVAR(lastFPTime) + FP_ACTION_TIMEOUT)
|
||||
exitWith {};
|
||||
|
||||
|
||||
PV(_pos_prec) = positionCameraToWorld [0, 0, FP_DISTANCE];
|
||||
PV(_pos) = positionCameraToWorld [
|
||||
random (2*FP_RANDOMIZATION_X) - FP_RANDOMIZATION_X,
|
||||
random (2*FP_RANDOMIZATION_Y) - FP_RANDOMIZATION_Y,
|
||||
FP_DISTANCE
|
||||
];
|
||||
|
||||
|
||||
PV(_dest_players) = [];
|
||||
|
||||
PV(_pep) = eyePos player;
|
||||
{
|
||||
if (isPlayer _x && _x != player && alive _x &&
|
||||
{(_x == vehicle _x || (vehicle _x) isKindOf "StaticWeapon") && {
|
||||
((eyePos _x) vectorDistance _pep) < MAX_DIST_TO_OTHER_PLAYERS
|
||||
}}) then
|
||||
{
|
||||
_dest_players pushBack _x;
|
||||
};
|
||||
} forEach playableUnits;
|
||||
|
||||
GVAR(pv_fpToServer) = [player, _pos, _dest_players];
|
||||
|
||||
LOGV(GVAR(pv_fpToServer));
|
||||
|
||||
if (isServer) then
|
||||
{
|
||||
[0, GVAR(pv_fpToServer)] call GVAR(fnc_pv_fpToServer);
|
||||
}
|
||||
else
|
||||
{
|
||||
publicVariableServer 'GVAR(pv_fpToServer)';
|
||||
};
|
||||
|
||||
|
||||
if (GVAR(FP_indicator_for_self)) then
|
||||
{
|
||||
[0, [player, _pos_prec]] call GVAR(fnc_pv_fpToClient);
|
||||
};
|
||||
|
||||
player playActionNow "GestureGo";
|
||||
GVAR(lastFPTime) = diag_tickTime;
|
||||
|
||||
_rv = true;
|
||||
};
|
||||
|
||||
_rv;
|
||||
},
|
||||
"",
|
||||
[GVAR(FP_keyComb) select 0,
|
||||
[GVAR(FP_keyComb) select 1, GVAR(FP_keyComb) select 2, GVAR(FP_keyComb) select 3]]
|
||||
] call cba_fnc_addKeybind;
|
||||
|
||||
|
||||
|
||||
|
||||
LOG("Done");
|
54
addons/finger/code/macros.hpp
Normal file
54
addons/finger/code/macros.hpp
Normal file
@ -0,0 +1,54 @@
|
||||
#define XOR(x,y) (((x)||(y)) && !((x)&&(y)))
|
||||
#define SQR(x) ((x)*(x))
|
||||
|
||||
|
||||
// debug
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
#define LOG(msg) (diag_log text format["%1:%2> %3", __FILE__, __LINE__, (msg)])
|
||||
#define LOGV(msg) (diag_log text format["%1:%2> %3 = %4", __FILE__, __LINE__, (#msg), (msg)])
|
||||
#else
|
||||
#define LOG(msg)
|
||||
#define LOGV(msg)
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// map macros
|
||||
|
||||
#define CREATE_MAP() [[],[]]
|
||||
|
||||
#define MAP_KEYS(m) ((m) select 0)
|
||||
#define MAP_VALUES(m) ((m) select 1)
|
||||
|
||||
#define MAP_SET(m, k, v) if (true) then {_____map_t = MAP_KEYS(m) find (k);\
|
||||
if (_____map_t >= 0) exitWith {MAP_VALUES(m) set [_____map_t, (v)]};\
|
||||
_____map_t = count MAP_KEYS(m);\
|
||||
MAP_KEYS(m) set [_____map_t, (k)];\
|
||||
MAP_VALUES(m) set [_____map_t, (v)];\
|
||||
}
|
||||
|
||||
#define MAP_GET(m, k) if (true) then {_____map_t = MAP_KEYS(m) find (k);\
|
||||
if (_____map_t >= 0) exitWith {MAP_VALUES(m) select _____map_t};\
|
||||
nil\
|
||||
}
|
||||
|
||||
#define MAP_DEL(m, k) if (true) then {_____map_t = MAP_KEYS(m) find (k);\
|
||||
if (_____map_t >= 0) exitWith {\
|
||||
MAP_KEYS(m) deleteAt _____map_t;\
|
||||
MAP_VALUES(m) deleteAt _____map_t;\
|
||||
};\
|
||||
}
|
||||
|
||||
#define MAP_LEN(m) (count MAP_KEYS(m))
|
||||
|
||||
#define MAP_IKEY(m, k) (MAP_KEYS(m) find (k))
|
||||
#define MAP_IGET(m, i) (MAP_VALUES(m) select (i))
|
||||
#define MAP_ISET(m, i, v) (MAP_VALUES(m) set [(i), (v)])
|
||||
#define MAP_IDEL(m, i) if (true) then {\
|
||||
MAP_KEYS(m) deleteAt (i);\
|
||||
MAP_VALUES(m) deleteAt (i);\
|
||||
}
|
12
addons/finger/code/main.hpp
Normal file
12
addons/finger/code/main.hpp
Normal file
@ -0,0 +1,12 @@
|
||||
#ifndef __MAIN_HPP_
|
||||
#define __MAIN_HPP_
|
||||
|
||||
#include "addon.hpp"
|
||||
|
||||
#include "settings.hpp"
|
||||
|
||||
#include "structures.hpp"
|
||||
#include "macros.hpp"
|
||||
|
||||
|
||||
#endif
|
23
addons/finger/code/settings.hpp
Normal file
23
addons/finger/code/settings.hpp
Normal file
@ -0,0 +1,23 @@
|
||||
#ifndef __STRUCTURES_H__
|
||||
#define __STRUCTURES_H__
|
||||
|
||||
// #define DEBUG
|
||||
|
||||
|
||||
#define FP_ICON "\z\ace\addons\finger\img\fp_icon.paa"
|
||||
|
||||
|
||||
#define FP_TIMEOUT 2
|
||||
#define FP_ACTION_TIMEOUT 1
|
||||
|
||||
#define FP_DISTANCE 10000
|
||||
#define FP_RANDOMIZATION_X 350
|
||||
#define FP_RANDOMIZATION_Y 100
|
||||
|
||||
#define MAX_DIST_TO_OTHER_PLAYERS 4
|
||||
|
||||
|
||||
#define MIN_OPAQUE 0.1
|
||||
|
||||
|
||||
#endif
|
10
addons/finger/code/structures.hpp
Normal file
10
addons/finger/code/structures.hpp
Normal file
@ -0,0 +1,10 @@
|
||||
#ifndef __STRUCTURES_H__
|
||||
#define __STRUCTURES_H__
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
52
addons/finger/config.cpp
Normal file
52
addons/finger/config.cpp
Normal file
@ -0,0 +1,52 @@
|
||||
#include "script_component.hpp"
|
||||
|
||||
#define RECOMPILE 0
|
||||
|
||||
class CfgPatches
|
||||
{
|
||||
class ace_finger
|
||||
{
|
||||
units[]={};
|
||||
weapons[]={};
|
||||
|
||||
requiredVersion = REQUIRED_VERSION;
|
||||
requiredAddons[] = {"ace_common"};
|
||||
|
||||
author[]=
|
||||
{
|
||||
"Drill"
|
||||
};
|
||||
authorUrl = "https://github.com/TheDrill/";
|
||||
|
||||
addon_version=6;
|
||||
|
||||
VERSION_CONFIG;
|
||||
};
|
||||
};
|
||||
|
||||
class CfgFunctions
|
||||
{
|
||||
class ace_finger
|
||||
{
|
||||
class Main
|
||||
{
|
||||
file="\z\ace\addons\finger\code";
|
||||
class _init
|
||||
{
|
||||
preInit=0;
|
||||
postInit=1;
|
||||
recompile=RECOMPILE;
|
||||
};
|
||||
|
||||
class _mainLoop {recompile=RECOMPILE;};
|
||||
class _comm {recompile=RECOMPILE;};
|
||||
class _fp_handler {recompile=RECOMPILE;};
|
||||
class _OEF_renderer {recompile=RECOMPILE;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
#include "ACE_Settings.hpp"
|
||||
|
BIN
addons/finger/img/fp_icon.paa
Normal file
BIN
addons/finger/img/fp_icon.paa
Normal file
Binary file not shown.
12
addons/finger/script_component.hpp
Normal file
12
addons/finger/script_component.hpp
Normal file
@ -0,0 +1,12 @@
|
||||
#define COMPONENT finger
|
||||
#include "\z\ace\Addons\main\script_mod.hpp"
|
||||
|
||||
#ifdef DEBUG_ENABLED_FINGER
|
||||
#define DEBUG_MODE_FULL
|
||||
#endif
|
||||
|
||||
#ifdef DEBUG_SETTINGS_FINGER
|
||||
#define DEBUG_SETTINGS DEBUG_SETTINGS_FINGER
|
||||
#endif
|
||||
|
||||
#include "\z\ace\Addons\main\script_macros.hpp"
|
34
addons/finger/stringtable.xml
Normal file
34
addons/finger/stringtable.xml
Normal file
@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Project name="ace_dfinger">
|
||||
<Package name="strings">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Key ID="STR_Addons_ACE__dfinger__indicator_for_self">
|
||||
<Original>Show finger indicator to self</Original>
|
||||
<Russian>Отображать пальце-индикатор для показывающего игрока</Russian>
|
||||
</Key>
|
||||
<Key ID="STR_Addons_ACE__dfinger__indicator_for_self__desc">
|
||||
<Original>Render the indicator for the pointing player. This option doesn't affect whether the other players would see the indicator</Original>
|
||||
<Russian>Отображать индикатор для показывающего игрока. Эта настройка не влияет на то, будутт ли другие игроки видеть индикатор</Russian>
|
||||
</Key>
|
||||
|
||||
<Key ID="STR_Addons_ACE__dfinger__color">
|
||||
<Original>Finger indicator</Original>
|
||||
<Russian>Пальце-индикатор</Russian>
|
||||
</Key>
|
||||
<Key ID="STR_Addons_ACE__dfinger__color__desc">
|
||||
<Original>Color of the finger-pointing indicator circle</Original>
|
||||
<Russian>Цвет индикатора пальце-указания</Russian>
|
||||
</Key>
|
||||
|
||||
<Key ID="STR_Addons_ACE__dfinger__keyComb">
|
||||
<Original>Action "point a finger at"</Original>
|
||||
<Russian>Действие "показать пальцем на"</Russian>
|
||||
</Key>
|
||||
|
||||
</Package>
|
||||
</Project>
|
Loading…
Reference in New Issue
Block a user