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

Vector - New reticle using CBA scripted optics (#6981)

Browse Source 
* vector IV updates

* vector IV updates

* compat cba optics and vector scripts

* hide periphery

* reticle texture for 7x magnification

* vector display config

* idc macros, fix illum mode

* add radblur effect when using optic

* hide zeroing control

* delete a broken config entry

* fix horizontal and vertical distance mode

* set REQUIRED_CBA_VERSION to 3.11.2
This commit is contained in:
commy2 2019-05-27 17:46:07 +02:00 committed by PabstMirror
parent 452cba7ff7
commit 33602df517
34 changed files with 377 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/main/script_mod.hpp
View File

@ -10,7 +10,7 @@
// MINIMAL required version for the Mod. Components can specify others.. // MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 1.88 #define REQUIRED_VERSION 1.88
#define REQUIRED_CBA_VERSION {3,11,1} #define REQUIRED_CBA_VERSION {3,11,2}
#ifdef COMPONENT_BEAUTIFIED #ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED) #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)

7
addons/vector/CfgOpticsEffect.hpp Normal file
View File

@ -0,0 +1,7 @@
class CfgOpticsEffect {
class GVAR(OpticsRadBlur1) {
type = "radialblur";
params[] = {0.01,0.01,0.18,0.36};
priority = 950;
};
};

22
addons/vector/CfgVehicles.hpp
View File

@ -5,16 +5,36 @@ class CfgVehicles {
scope = 2; scope = 2;
scopeCurator = 2; scopeCurator = 2;
displayName = CSTRING(VectorName); displayName = CSTRING(VectorName);
editorCategory = "EdCat_Equipment";
editorSubcategory = "EdSubcat_InventoryItems";
vehicleClass = "Items"; vehicleClass = "Items";
model = "\A3\Weapons_F\DummyBinoc.p3d";
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Vector,1); MACRO_ADDITEM(ACE_Vector,1);
}; };
}; };
class ACE_Item_VectorDay: Item_Base_F {
author = ECSTRING(common,ACETeam);
scope = 2;
scopeCurator = 2;
displayName = CSTRING(VectorDayName);
editorCategory = "EdCat_Equipment";
editorSubcategory = "EdSubcat_InventoryItems";
vehicleClass = "Items";
model = "\A3\Weapons_F\DummyBinoc.p3d";
class TransportItems {
MACRO_ADDITEM(ACE_VectorDay,1);
};
};
class Box_NATO_Support_F; class Box_NATO_Support_F;
class ACE_Box_Misc: Box_NATO_Support_F { class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems { class TransportItems {
MACRO_ADDITEM(ACE_Vector,6); MACRO_ADDITEM(ACE_Vector,3);
MACRO_ADDITEM(ACE_VectorDay,3);
}; };
}; };
}; };

18
addons/vector/CfgWeapons.hpp
View File

@ -1,4 +1,3 @@
class CfgWeapons { class CfgWeapons {
class Binocular; class Binocular;
class ACE_Vector: Binocular { class ACE_Vector: Binocular {
@ -6,13 +5,24 @@ class CfgWeapons {
displayName = CSTRING(VectorName); displayName = CSTRING(VectorName);
descriptionShort = CSTRING(VectorDescription); descriptionShort = CSTRING(VectorDescription);
model = QPATHTOF(ace_vector.p3d); model = QPATHTOF(ace_vector.p3d);
modelOptics = QPATHTOF(ace_vector_optics.p3d);
picture = QPATHTOF(UI\ace_vector_x_ca.paa); picture = QPATHTOF(UI\ace_vector_x_ca.paa);
visionMode[] = {"Normal","NVG"}; visionMode[] = {"Normal","NVG"};
opticsZoomMax = 0.06621; opticsZoomMax = 0.25/7;
opticsZoomMin = 0.06621; opticsZoomMin = 0.25/7;
modelOptics = "\A3\Weapons_F\empty.p3d";
class CBA_ScriptedOptic {
reticleTexture = QPATHTOF(data\reticles\ace_vector_reticle_ca.paa);
reticleTextureSize = 1.026;
bodyTexture = QPATHTOF(data\reticles\ace_vector_body_co.paa);
bodyTextureSize = 1.25;
reticleSafezoneSize = 1;
hidePeripheralVision = 1;
opticsPPEffects[] = {QGVAR(OpticsRadBlur1)};
};
weaponInfoType = "ACE_RscOptics_vector"; weaponInfoType = "ACE_RscOptics_vector";
}; };
class ACE_VectorDay: ACE_Vector { class ACE_VectorDay: ACE_Vector {
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
displayName = CSTRING(VectorDayName); displayName = CSTRING(VectorDayName);

149
addons/vector/RscInGameUI.hpp
View File

@ -1,163 +1,138 @@
class RscText; class RscText;
class RscPicture; class RscPicture;
class RscControlsGroupNoScrollbars;
//class ScrollBar;
class RscControlsGroup {
class VScrollbar;//: ScrollBar {};
class HScrollbar;//: ScrollBar {};
};
class RscInGameUI { class RscInGameUI {
class RscUnitInfo; class RscWeaponZeroing;
class ACE_RscOptics_vector: RscUnitInfo { class CBA_ScriptedOptic: RscWeaponZeroing {
onLoad = "[""onLoad"",_this,""RscUnitInfo"",'IGUI'] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable ['ACE_dlgVector', _this select 0];"; class CA_Zeroing;
onUnload = "[""onUnload"",_this,""RscUnitInfo"",'IGUI'] call (uinamespace getvariable 'BIS_fnc_initDisplay')"; };
idd = 300;
controls[] = {"CA_Distance","CA_Heading","CA_OpticsPitch","CA_Elev","CA_OpticsZoom","CA_VisionMode","ACE_ScriptedDisplayControlsGroup"}; class ACE_RscOptics_vector: CBA_ScriptedOptic {
controls[] = {
"CA_FOVMode","ScopeBlack","Reticle","BodyNight","BodyDay","TrippleHeadLeft","TrippleHeadRight","CA_Zeroing","Magnification","ActiveDisplayHelper",
"CA_Distance","CA_Heading","CA_OpticsPitch","CA_Elev","CA_OpticsZoom","CA_VisionMode","ACE_ScriptedDisplayControlsGroup"
};
class CA_Distance: RscText { class CA_Distance: RscText {
idc = 151; // distance idc = 151; // distance
w = 0; w = 0;
h = 0; h = 0;
}; };
class CA_Heading: RscText { class CA_Heading: RscText {
idc = 156; // azimuth idc = 156; // azimuth
w = 0; w = 0;
h = 0; h = 0;
}; };
class CA_OpticsPitch: RscText { class CA_OpticsPitch: RscText {
idc = 182; // inclination idc = 182; // inclination
w = 0; w = 0;
h = 0; h = 0;
}; };
class CA_Elev: RscText { class CA_Elev: RscText {
idc = 175; // inclination, more accurate idc = 175; // inclination, more accurate
w = 0; w = 0;
h = 0; h = 0;
}; };
class CA_OpticsZoom: RscText { class CA_OpticsZoom: RscText {
idc = 180; // some kind of zoom idc = 180; // some kind of zoom
w = 0; w = 0;
h = 0; h = 0;
}; };
class CA_VisionMode: RscText { class CA_VisionMode: RscText {
idc = 179; // ??? idc = 179; // ???
w = 0; w = 0;
h = 0; h = 0;
}; };
class CA_Zeroing: CA_Zeroing {
onLoad = "(_this select 0) ctrlShow false";
};
class ACE_ScriptedDisplayControlsGroup: RscControlsGroup { class ACE_ScriptedDisplayControlsGroup: RscControlsGroupNoScrollbars {
onLoad = "uiNamespace setVariable ['ACE_dlgVector', ctrlParent (_this select 0)];";
idc = 170; idc = 170;
x = "SafezoneX"; x = "safezoneX";
y = "SafezoneY"; y = "safezoneY";
w = "SafezoneW"; w = "safezoneW";
h = "SafezoneH"; h = "safezoneH";
class VScrollbar: VScrollbar {
width = 0;
};
class HScrollbar: HScrollbar {
height = 0;
};
class controls { class controls {
class Center: RscPicture { class Center: RscPicture {
idc = 1301; idc = IDC_CENTER;
text = "";
colorText[] = {1,0,0,0.5}; colorText[] = {1,0,0,0.5};
x = 0.488 * safezoneW /*+ safezoneX*/; x = "0.5 - (0.8 / 16 * safezoneW)/2 - safezoneX";
y = 0.4783 * safezoneH /*+ safezoneY*/; y = "0.5 - (0.8 / 9 * safezoneH)/2 - safezoneY";
w = 0.4 / 16 * safezoneW; w = "0.8 / 16 * safezoneW";
h = 0.4 / 9 * safezoneH; h = "0.8 / 9 * safezoneH";
}; };
class Crosshair: Center { class Crosshair: Center {
idc = 1302; idc = IDC_CROSSHAIR;
x = 0.4848 * safezoneW /*+ safezoneX*/; x = "0.5 - (0.7 / 16 * safezoneW)/2 - safezoneX";
y = 0.4732 * safezoneH /*+ safezoneY*/; y = "0.5 - (0.7 / 9 * safezoneH)/2 - safezoneY";
w = 0.5 / 16 * safezoneW; w = "0.7 / 16 * safezoneW";
h = 0.5 / 9 * safezoneH; h = "0.7 / 9 * safezoneH";
}; };
class Digit0: Center { class Digit0: Center {
idc = 1310; idc = IDC_DIGIT_0;
x = (0.54 + 0 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.54 + 0 * 0.02) * safezoneW";
y = 0.54 * safezoneH /*+ safezoneY*/; y = "0.54 * safezoneH";
w = 0.5 / 16 * safezoneW; w = "0.5 / 16 * safezoneW";
h = 0.5 / 9 * safezoneH; h = "0.5 / 9 * safezoneH";
}; };
class Digit1: Digit0 { class Digit1: Digit0 {
idc = 1311; idc = IDC_DIGIT_1;
x = (0.54 + 1 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.54 + 1 * 0.02) * safezoneW";
}; };
class Digit2: Digit0 { class Digit2: Digit0 {
idc = 1312; idc = IDC_DIGIT_2;
x = (0.54 + 2 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.54 + 2 * 0.02) * safezoneW";
}; };
class Digit3: Digit0 { class Digit3: Digit0 {
idc = 1313; idc = IDC_DIGIT_3;
x = (0.54 + 3 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.54 + 3 * 0.02) * safezoneW";
}; };
class Digit4: Digit0 { class Digit4: Digit0 {
idc = 1314; idc = IDC_DIGIT_4;
x = (0.54 + 4 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.54 + 4 * 0.02) * safezoneW";
}; };
class Digit5: Digit0 { class Digit5: Digit0 {
idc = 1315; idc = IDC_DIGIT_5;
x = (0.35 + 0 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.35 + 0 * 0.02) * safezoneW";
}; };
class Digit6: Digit0 { class Digit6: Digit0 {
idc = 1316; idc = IDC_DIGIT_6;
x = (0.35 + 1 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.35 + 1 * 0.02) * safezoneW";
}; };
class Digit7: Digit0 { class Digit7: Digit0 {
idc = 1317; idc = IDC_DIGIT_7;
x = (0.35 + 2 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.35 + 2 * 0.02) * safezoneW";
}; };
class Digit8: Digit0 { class Digit8: Digit0 {
idc = 1318; idc = IDC_DIGIT_8;
x = (0.35 + 3 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.35 + 3 * 0.02) * safezoneW";
}; };
class Digit9: Digit0 { class Digit9: Digit0 {
idc = 1319; idc = IDC_DIGIT_9;
x = (0.35 + 4 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.35 + 4 * 0.02) * safezoneW";
}; };
class DigitE1: Digit0 { class DigitE1: Digit0 {
idc = 1321; idc = IDC_DIGIT_E1;
x = (0.39 + 0 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.39 + 0 * 0.02) * safezoneW";
y = 0.42 * safezoneH /*+ safezoneY*/; y = "0.42 * safezoneH";
}; };
class DigitE2: DigitE1 { class DigitE2: DigitE1 {
idc = 1322; idc = IDC_DIGIT_E2;
x = (0.39 + 1 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.39 + 1 * 0.02) * safezoneW";
}; };
class DigitE3: DigitE1 { class DigitE3: DigitE1 {
idc = 1323; idc = IDC_DIGIT_E3;
x = (0.39 + 2 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.39 + 2 * 0.02) * safezoneW";
}; };
class DigitE4: DigitE1 { class DigitE4: DigitE1 {
idc = 1324; idc = IDC_DIGIT_E4;
x = (0.39 + 3 * 0.02) * safezoneW /*+ safezoneX*/; x = "(0.39 + 3 * 0.02) * safezoneW";
}; };
}; };
}; };

1
addons/vector/XEH_PREP.hpp
View File

@ -1,4 +1,3 @@
PREP(clearDisplay); PREP(clearDisplay);
PREP(convertToTexturesDegree); PREP(convertToTexturesDegree);
PREP(convertToTexturesDistance); PREP(convertToTexturesDistance);

BIN
addons/vector/ace_vector_optics.p3d
View File

Binary file not shown.

11
addons/vector/config.cpp
View File

@ -3,8 +3,8 @@
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
name = COMPONENT_NAME; name = COMPONENT_NAME;
units[] = {"ACE_Item_Vector"}; units[] = {"ACE_Item_Vector","ACE_Item_VectorDay"};
weapons[] = {"ACE_Vector", "ACE_VectorDay"}; weapons[] = {"ACE_Vector","ACE_VectorDay"};
requiredVersion = REQUIRED_VERSION; requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"}; requiredAddons[] = {"ace_common"};
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
@ -15,8 +15,11 @@ class CfgPatches {
}; };
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "CfgWeapons.hpp" #include "CfgWeapons.hpp"
#include "CfgOpticsEffect.hpp"
#include "RscInGameUI.hpp" #include "RscInGameUI.hpp"
class CBA_PIPItems {
GVAR(enable) = "-";
};

BIN
addons/vector/data/reticles/ace_vector_body_co.paa Normal file
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle.paa
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle_1_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle_2_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle_3_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle_4_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle_5_ca.paa Normal file
View File

Binary file not shown.

BIN
addons/vector/data/reticles/ace_vector_reticle_ca.paa Normal file
View File

Binary file not shown.

32
addons/vector/functions/fnc_adjustBrightness.sqf
View File

@ -20,22 +20,22 @@ private _dlgVector = GETUVAR(ACE_dlgVector,displayNull);
private _color = [[1,0,0,0.5], [1,0,0,1]] select (_this select 0); private _color = [[1,0,0,0.5], [1,0,0,1]] select (_this select 0);
(_dlgVector displayCtrl 1301) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_CENTER) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1302) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_CROSSHAIR) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1310) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1311) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1312) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1313) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1314) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1315) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1316) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1317) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1318) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1319) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1321) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_E1) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1322) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_E2) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1323) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_E3) ctrlSetTextColor _color;
(_dlgVector displayCtrl 1324) ctrlSetTextColor _color; (_dlgVector displayCtrl IDC_DIGIT_E4) ctrlSetTextColor _color;
GVAR(illuminate) = _this select 0; GVAR(illuminate) = _this select 0;

20
addons/vector/functions/fnc_clearDisplay.sqf
View File

@ -20,18 +20,18 @@ private _dlgVector = GETUVAR(ACE_dlgVector,displayNull);
switch (_this select 0) do { switch (_this select 0) do {
case ("azimuth"): { case ("azimuth"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText "";
(_dlgVector displayCtrl 1317) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText "";
(_dlgVector displayCtrl 1318) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText "";
(_dlgVector displayCtrl 1319) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText "";
}; };
case ("distance"): { case ("distance"): {
(_dlgVector displayCtrl 1310) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText "";
(_dlgVector displayCtrl 1311) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText "";
(_dlgVector displayCtrl 1312) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText "";
(_dlgVector displayCtrl 1313) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText "";
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
}; };

22
addons/vector/functions/fnc_getRelativeHeightLength.sqf
View File

@ -15,24 +15,20 @@
* Public: No * Public: No
*/ */
private _distanceP1 = GVAR(pData) select 0; GVAR(pData) params ["_distanceP1", "_directionP1"];
private _directionP1 = GVAR(pData) select 1; _directionP1 params ["_azimuthP1", "_inclinationP1"];
private _azimuthP1 = _directionP1 select 0;
private _inclinationP1 = _directionP1 select 1;
private _distanceP2 = call FUNC(getDistance); private _distanceP2 = call FUNC(getDistance);
private _directionP2 = call FUNC(getDirection); private _directionP2 = call FUNC(getDirection);
private _azimuthP2 = _directionP2 select 0; _directionP2 params ["_azimuthP2", "_inclinationP2"];
private _inclinationP2 = _directionP2 select 1;
private _azimuth = abs (_azimuthP1 - _azimuthP2);
private _inclination = abs (_inclinationP1 - _inclinationP2);
private _height = sqrt (_distanceP1 ^ 2 + _distanceP2 ^ 2 - 2 * _distanceP1 * _distanceP2 * cos _inclination);
private _length = sqrt (_distanceP1 ^ 2 + _distanceP2 ^ 2 - 2 * _distanceP1 * _distanceP2 * cos _azimuth);
if (_inclination < 0) then {_height = -1 * _height};
if (_distanceP1 < -999 || {_distanceP2 < -999}) exitWith { if (_distanceP1 < -999 || {_distanceP2 < -999}) exitWith {
[-1000, -1000] // return [-1000, -1000] // return
}; };
private _position1 = [_distanceP1, _azimuthP1, _inclinationP1] call CBA_fnc_polar2vect;
private _position2 = [_distanceP2, _azimuthP2, _inclinationP2] call CBA_fnc_polar2vect;
private _length = _position1 distance2D _position2;
private _height = abs ((_position1 vectorDiff _position2) select 2);
[_height, _length] [_height, _length]

19
addons/vector/functions/fnc_illuminate.sqf
View File

@ -20,31 +20,28 @@ private _dlgVector = GETUVAR(ACE_dlgVector,displayNull);
if (_this select 0) then { if (_this select 0) then {
{ {
if (ctrlIDC _x != 170) then { private _control = _dlgVector displayCtrl _x;
private _string = ctrlText _x; private _string = ctrlText _control;
private _index = _string find ".paa"; private _index = _string find ".paa";
if (_index != -1 && {_string find "_illum.paa" == -1}) then { if (_index != -1 && {_string find "_illum.paa" == -1}) then {
_string = toArray _string; _string = toArray _string;
_string resize _index; _string resize _index;
_x ctrlSetText format ["%1_illum.paa", toString _string]; _control ctrlSetText format ["%1_illum.paa", toString _string];
}; };
}; } forEach ILLUM_CONTROLS;
} forEach allControls _dlgVector;
} else { } else {
{ {
if (ctrlIDC _x != 170) then { private _control = _dlgVector displayCtrl _x;
private _string = ctrlText _x; private _string = ctrlText _control;
private _index = _string find "_illum.paa"; private _index = _string find "_illum.paa";
if (_index != -1) then { if (_index != -1) then {
_string = toArray _string; _string = toArray _string;
_string resize _index; _string resize _index;
_x ctrlSetText format ["%1.paa", toString _string]; _control ctrlSetText format ["%1.paa", toString _string];
}; };
} forEach ILLUM_CONTROLS;
};
} forEach allControls _dlgVector;
}; };

8
addons/vector/functions/fnc_showAzimuth.sqf
View File

@ -22,9 +22,9 @@ private _direction = call FUNC(getDirection);
private _digits = _direction call FUNC(convertToTexturesDegree); private _digits = _direction call FUNC(convertToTexturesDegree);
(_dlgVector displayCtrl 1315) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1316) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1317) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1318) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText (_digits select 3);
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

16
addons/vector/functions/fnc_showAzimuthInclination.sqf
View File

@ -23,17 +23,17 @@ private _direction = call FUNC(getDirection);
// azimuth // azimuth
private _digits = [_direction select 0] call FUNC(convertToTexturesDegree); private _digits = [_direction select 0] call FUNC(convertToTexturesDegree);
(_dlgVector displayCtrl 1315) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1316) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1317) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1318) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText (_digits select 3);
// inclination // inclination
_digits = [_direction select 1] call FUNC(convertToTexturesDegree); _digits = [_direction select 1] call FUNC(convertToTexturesDegree);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 3);
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

2
addons/vector/functions/fnc_showCenter.sqf
View File

@ -15,6 +15,6 @@
* Public: No * Public: No
*/ */
((GETUVAR(ACE_dlgVector,displayNull)) displayCtrl 1301) ctrlSetText (["", QPATHTOF(rsc\vector_center.paa)] select (_this select 0)); ((GETUVAR(ACE_dlgVector,displayNull)) displayCtrl IDC_CENTER) ctrlSetText (["", QPATHTOF(rsc\vector_center.paa)] select (_this select 0));
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

8
addons/vector/functions/fnc_showDistance.sqf
View File

@ -22,9 +22,9 @@ private _distance = call FUNC(getDistance);
private _digits = [_distance] call FUNC(convertToTexturesDistance); private _digits = [_distance] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 3);
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

40
addons/vector/functions/fnc_showFallOfShot.sqf
View File

@ -26,37 +26,37 @@ if !(_this select 0) then {
// of ordinate // of ordinate
private _digits = [_fosData, 1] call FUNC(convertToTexturesFOS); private _digits = [_fosData, 1] call FUNC(convertToTexturesFOS);
(_dlgVector displayCtrl 1310) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 3);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 4); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 4);
// of abscissa // of abscissa
_digits = [_fosData, 0] call FUNC(convertToTexturesFOS); _digits = [_fosData, 0] call FUNC(convertToTexturesFOS);
(_dlgVector displayCtrl 1315) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1316) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1317) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1318) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText (_digits select 3);
(_dlgVector displayCtrl 1319) ctrlSetText (_digits select 4); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText (_digits select 4);
} else { } else {
// applicate // applicate
private _digits = [_fosData, 2] call FUNC(convertToTexturesFOS); private _digits = [_fosData, 2] call FUNC(convertToTexturesFOS);
(_dlgVector displayCtrl 1310) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 3);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 4); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 4);
// nothing // nothing
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText "";
(_dlgVector displayCtrl 1317) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText "";
(_dlgVector displayCtrl 1318) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText "";
(_dlgVector displayCtrl 1319) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText "";
}; };

16
addons/vector/functions/fnc_showHeightDistance.sqf
View File

@ -23,17 +23,17 @@ private _heightDistance = call FUNC(getHeightDistance);
// height // height
private _digits = [_heightDistance select 0] call FUNC(convertToTexturesDistance); private _digits = [_heightDistance select 0] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 3);
// non-slope distance // non-slope distance
_digits = [_heightDistance select 1] call FUNC(convertToTexturesDistance); _digits = [_heightDistance select 1] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1315) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1316) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1317) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1318) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText (_digits select 3);
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

16
addons/vector/functions/fnc_showP1.sqf
View File

@ -19,15 +19,15 @@ disableSerialization;
private _dlgVector = GETUVAR(ACE_dlgVector,displayNull); private _dlgVector = GETUVAR(ACE_dlgVector,displayNull);
if (_this select 0) then { if (_this select 0) then {
(_dlgVector displayCtrl 1321) ctrlSetText QPATHTOF(rsc\vector_1.paa); (_dlgVector displayCtrl IDC_DIGIT_E1) ctrlSetText QPATHTOF(rsc\vector_1.paa);
(_dlgVector displayCtrl 1322) ctrlSetText QPATHTOF(rsc\vector_minus.paa); (_dlgVector displayCtrl IDC_DIGIT_E2) ctrlSetText QPATHTOF(rsc\vector_minus.paa);
(_dlgVector displayCtrl 1323) ctrlSetText QPATHTOF(rsc\vector_p.paa); (_dlgVector displayCtrl IDC_DIGIT_E3) ctrlSetText QPATHTOF(rsc\vector_p.paa);
(_dlgVector displayCtrl 1324) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E4) ctrlSetText "";
} else { } else {
(_dlgVector displayCtrl 1321) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E1) ctrlSetText "";
(_dlgVector displayCtrl 1322) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E2) ctrlSetText "";
(_dlgVector displayCtrl 1323) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E3) ctrlSetText "";
(_dlgVector displayCtrl 1324) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E4) ctrlSetText "";
}; };
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

16
addons/vector/functions/fnc_showRelativeAzimuthDistance.sqf
View File

@ -23,17 +23,17 @@ private _azimuthDistance = call FUNC(getRelativeAzimuthDistance);
// relative azimuth // relative azimuth
private _digits = [_azimuthDistance select 0] call FUNC(convertToTexturesDegree); private _digits = [_azimuthDistance select 0] call FUNC(convertToTexturesDegree);
(_dlgVector displayCtrl 1315) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1316) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1317) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1318) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText (_digits select 3);
// relative non-slope distance // relative non-slope distance
_digits = [_azimuthDistance select 1] call FUNC(convertToTexturesDistance); _digits = [_azimuthDistance select 1] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 3);
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

8
addons/vector/functions/fnc_showRelativeDistance.sqf
View File

@ -23,7 +23,7 @@ private _distance = call FUNC(getRelativeDistance);
// relative slope distance // relative slope distance
private _digits = [_distance] call FUNC(convertToTexturesDistance); private _digits = [_distance] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 3);

16
addons/vector/functions/fnc_showRelativeHeightLength.sqf
View File

@ -23,17 +23,17 @@ private _heightLength = call FUNC(getRelativeHeightLength);
// height // height
private _digits = [_heightLength select 0] call FUNC(convertToTexturesDistance); private _digits = [_heightLength select 0] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1311) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1312) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1313) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1314) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText (_digits select 3);
// length // length
_digits = [_heightLength select 1] call FUNC(convertToTexturesDistance); _digits = [_heightLength select 1] call FUNC(convertToTexturesDistance);
(_dlgVector displayCtrl 1315) ctrlSetText (_digits select 0); (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText (_digits select 0);
(_dlgVector displayCtrl 1316) ctrlSetText (_digits select 1); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText (_digits select 1);
(_dlgVector displayCtrl 1317) ctrlSetText (_digits select 2); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText (_digits select 2);
(_dlgVector displayCtrl 1318) ctrlSetText (_digits select 3); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText (_digits select 3);
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

2
addons/vector/functions/fnc_showReticle.sqf
View File

@ -15,6 +15,6 @@
* Public: No * Public: No
*/ */
((GETUVAR(ACE_dlgVector,displayNull)) displayCtrl 1302) ctrlSetText (["", QPATHTOF(rsc\vector_crosshair.paa)] select (_this select 0)); ((GETUVAR(ACE_dlgVector,displayNull)) displayCtrl IDC_CROSSHAIR) ctrlSetText (["", QPATHTOF(rsc\vector_crosshair.paa)] select (_this select 0));
[GVAR(illuminate)] call FUNC(illuminate); [GVAR(illuminate)] call FUNC(illuminate);

196
addons/vector/functions/fnc_showText.sqf
View File

@ -20,149 +20,149 @@ private _dlgVector = GETUVAR(ACE_dlgVector,displayNull);
switch (_this select 0) do { switch (_this select 0) do {
case ("config"): { case ("config"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText "";
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_c.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_c.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_n.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_n.paa);
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_f.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_f.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_i.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_i.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_g.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_g.paa);
(_dlgVector displayCtrl 1313) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText "";
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("settings"): { case ("settings"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText QPATHTOF(rsc\vector_u.paa); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText QPATHTOF(rsc\vector_u.paa);
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_n.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_n.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_i.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_i.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_t.paa);
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_5.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_5.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_e.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_e.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_t.paa);
(_dlgVector displayCtrl 1313) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText QPATHTOF(rsc\vector_t.paa);
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("nigt"): { case ("nigt"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText QPATHTOF(rsc\vector_n.paa); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText QPATHTOF(rsc\vector_n.paa);
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_i.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_i.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_g.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_g.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_t.paa);
}; };
case ("eret"): { case ("eret"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText QPATHTOF(rsc\vector_e.paa); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText QPATHTOF(rsc\vector_e.paa);
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_r.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_r.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_e.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_e.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_t.paa);
}; };
case ("on"): { case ("on"): {
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_n.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_n.paa);
(_dlgVector displayCtrl 1312) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText "";
(_dlgVector displayCtrl 1313) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText "";
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("off"): { case ("off"): {
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_f.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_f.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_f.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_f.paa);
(_dlgVector displayCtrl 1313) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText "";
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("deg"): { case ("deg"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText QPATHTOF(rsc\vector_3.paa); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText QPATHTOF(rsc\vector_3.paa);
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_6.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_6.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_0.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_0.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_degree.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_degree.paa);
}; };
case ("mil"): { case ("mil"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText QPATHTOF(rsc\vector_6.paa); (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText QPATHTOF(rsc\vector_6.paa);
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_4.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_4.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_0.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_0.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_0.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_0.paa);
}; };
case ("meter"): { case ("meter"): {
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_5.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_5.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_1.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_1.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_minus.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_minus.paa);
(_dlgVector displayCtrl 1313) ctrlSetText QPATHTOF(rsc\vector_u.paa); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText QPATHTOF(rsc\vector_u.paa);
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("feet"): { case ("feet"): {
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_f.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_f.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_e.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_e.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_e.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_e.paa);
(_dlgVector displayCtrl 1313) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText QPATHTOF(rsc\vector_t.paa);
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("stor"): { case ("stor"): {
(_dlgVector displayCtrl 1321) ctrlSetText QPATHTOF(rsc\vector_5.paa); (_dlgVector displayCtrl IDC_DIGIT_E1) ctrlSetText QPATHTOF(rsc\vector_5.paa);
(_dlgVector displayCtrl 1322) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_E2) ctrlSetText QPATHTOF(rsc\vector_t.paa);
(_dlgVector displayCtrl 1323) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_E3) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1324) ctrlSetText QPATHTOF(rsc\vector_r.paa); (_dlgVector displayCtrl IDC_DIGIT_E4) ctrlSetText QPATHTOF(rsc\vector_r.paa);
}; };
case ("old_config"): { case ("old_config"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText "";
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_1.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_1.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_d.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_d.paa);
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_c.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_c.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_n.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_n.paa);
(_dlgVector displayCtrl 1313) ctrlSetText QPATHTOF(rsc\vector_f.paa); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText QPATHTOF(rsc\vector_f.paa);
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("old_settings"): { case ("old_settings"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText "";
(_dlgVector displayCtrl 1317) ctrlSetText QPATHTOF(rsc\vector_o.paa); (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText QPATHTOF(rsc\vector_o.paa);
(_dlgVector displayCtrl 1318) ctrlSetText QPATHTOF(rsc\vector_1.paa); (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText QPATHTOF(rsc\vector_1.paa);
(_dlgVector displayCtrl 1319) ctrlSetText QPATHTOF(rsc\vector_d.paa); (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText QPATHTOF(rsc\vector_d.paa);
(_dlgVector displayCtrl 1310) ctrlSetText QPATHTOF(rsc\vector_u.paa); (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText QPATHTOF(rsc\vector_u.paa);
(_dlgVector displayCtrl 1311) ctrlSetText QPATHTOF(rsc\vector_n.paa); (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText QPATHTOF(rsc\vector_n.paa);
(_dlgVector displayCtrl 1312) ctrlSetText QPATHTOF(rsc\vector_i.paa); (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText QPATHTOF(rsc\vector_i.paa);
(_dlgVector displayCtrl 1313) ctrlSetText QPATHTOF(rsc\vector_t.paa); (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText QPATHTOF(rsc\vector_t.paa);
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("clear_left"): { case ("clear_left"): {
(_dlgVector displayCtrl 1315) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_5) ctrlSetText "";
(_dlgVector displayCtrl 1316) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_6) ctrlSetText "";
(_dlgVector displayCtrl 1317) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_7) ctrlSetText "";
(_dlgVector displayCtrl 1318) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_8) ctrlSetText "";
(_dlgVector displayCtrl 1319) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_9) ctrlSetText "";
}; };
case ("clear_right"): { case ("clear_right"): {
(_dlgVector displayCtrl 1310) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_0) ctrlSetText "";
(_dlgVector displayCtrl 1311) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_1) ctrlSetText "";
(_dlgVector displayCtrl 1312) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_2) ctrlSetText "";
(_dlgVector displayCtrl 1313) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_3) ctrlSetText "";
(_dlgVector displayCtrl 1314) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_4) ctrlSetText "";
}; };
case ("clear_stor"): { case ("clear_stor"): {
(_dlgVector displayCtrl 1321) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E1) ctrlSetText "";
(_dlgVector displayCtrl 1322) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E2) ctrlSetText "";
(_dlgVector displayCtrl 1323) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E3) ctrlSetText "";
(_dlgVector displayCtrl 1324) ctrlSetText ""; (_dlgVector displayCtrl IDC_DIGIT_E4) ctrlSetText "";
}; };
}; };

25
addons/vector/initKeybinds.sqf
View File

@ -1,11 +1,8 @@
// by commy2 ["ACE3 Equipment", QGVAR(AzimuthKey), localize LSTRING(AzimuthKey), {
["ACE3 Equipment", QGVAR(AzimuthKey), localize LSTRING(AzimuthKey),
{
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(((currentWeapon ACE_player) isKindOf ["ACE_Vector", configFile >> "CfgWeapons"]) && {cameraView == "GUNNER"}) exitWith {false}; if !(currentWeapon ACE_player isKindOf ["ACE_Vector", configFile >> "CfgWeapons"] && {cameraView == "GUNNER"}) exitWith {false};
// prevent holding down // prevent holding down
if (GETGVAR(isDownStateKey1,false)) exitWith {false}; if (GETGVAR(isDownStateKey1,false)) exitWith {false};
@ -14,8 +11,7 @@
// Statement // Statement
["azimuth"] call FUNC(onKeyDown); ["azimuth"] call FUNC(onKeyDown);
false false
}, }, {
{
// prevent holding down // prevent holding down
GVAR(isDownStateKey1) = false; GVAR(isDownStateKey1) = false;
@ -25,16 +21,13 @@
// Statement // Statement
["azimuth"] call FUNC(onKeyUp); ["azimuth"] call FUNC(onKeyUp);
false false
}, }, [DIK_TAB, [false, false, false]], false, 0] call CBA_fnc_addKeybind;
[15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key
["ACE3 Equipment", QGVAR(DistanceKey), localize LSTRING(DistanceKey), {
["ACE3 Equipment", QGVAR(DistanceKey), localize LSTRING(DistanceKey),
{
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific
if !(((currentWeapon ACE_player) isKindOf ["ACE_Vector", configFile >> "CfgWeapons"]) && {cameraView == "GUNNER"}) exitWith {false}; if !(currentWeapon ACE_player isKindOf ["ACE_Vector", configFile >> "CfgWeapons"] && {cameraView == "GUNNER"}) exitWith {false};
// prevent holding down // prevent holding down
if (GETGVAR(isDownStateKey2,false)) exitWith {false}; if (GETGVAR(isDownStateKey2,false)) exitWith {false};
@ -43,8 +36,7 @@
// Statement // Statement
["distance"] call FUNC(onKeyDown); ["distance"] call FUNC(onKeyDown);
false false
}, }, {
{
// prevent holding down // prevent holding down
GVAR(isDownStateKey2) = false; GVAR(isDownStateKey2) = false;
@ -54,5 +46,4 @@
// Statement // Statement
["distance"] call FUNC(onKeyUp); ["distance"] call FUNC(onKeyUp);
false false
}, }, [DIK_R, [false, false, false]], false, 0] call CBA_fnc_addKeybind;
[19, [false, false, false]], false] call CBA_fnc_addKeybind; //R Key

28
addons/vector/script_component.hpp
View File

@ -15,3 +15,31 @@
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#include "\a3\ui_f\hpp\defineDIKCodes.inc"
#define IDC_CENTER 1301
#define IDC_CROSSHAIR 1302
#define IDC_DIGIT_0 1310
#define IDC_DIGIT_1 1311
#define IDC_DIGIT_2 1312
#define IDC_DIGIT_3 1313
#define IDC_DIGIT_4 1314
#define IDC_DIGIT_5 1315
#define IDC_DIGIT_6 1316
#define IDC_DIGIT_7 1317
#define IDC_DIGIT_8 1318
#define IDC_DIGIT_9 1319
#define IDC_DIGIT_E1 1321
#define IDC_DIGIT_E2 1322
#define IDC_DIGIT_E3 1323
#define IDC_DIGIT_E4 1324
#define ILLUM_CONTROLS [\
IDC_CENTER, IDC_CROSSHAIR,\
IDC_DIGIT_0, IDC_DIGIT_1, IDC_DIGIT_2, IDC_DIGIT_3, IDC_DIGIT_4,\
IDC_DIGIT_5, IDC_DIGIT_6, IDC_DIGIT_7, IDC_DIGIT_8, IDC_DIGIT_9,\
IDC_DIGIT_E1, IDC_DIGIT_E2, IDC_DIGIT_E3, IDC_DIGIT_E4\
]