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

Merge pull request #5731 from acemod/macro-fix

Browse Source 
Fixes bugs in the new (macro based) mrad/moa conversion
This commit is contained in:
ulteq 2017-11-06 18:35:10 +01:00 committed by GitHub
commit 362166f819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/atragmx/functions/fnc_calculate_truing_drop.sqf
View File

@ -46,8 +46,8 @@ if (_parseInput) then {
}; };
switch (_dropUnit) do { switch (_dropUnit) do {
case 0: { case 0: {
_transonicDrop = MOA_TO_MRAD(_transonicDrop); _transonicDrop = MRAD_TO_MOA(_transonicDrop);
_subsonicDrop = MOA_TO_MRAD(_subsonicDrop); _subsonicDrop = MRAD_TO_MOA(_subsonicDrop);
}; };
case 2: { case 2: {
_transonicDrop = _transonicDrop / 1.047; _transonicDrop = _transonicDrop / 1.047;

7
addons/atragmx/script_component.hpp
View File

@ -16,11 +16,4 @@
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
#define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
#define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
#define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9
#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
#define ATRAGMX_PROFILE_NAMESPACE_VERSION 2.2 #define ATRAGMX_PROFILE_NAMESPACE_VERSION 2.2

2
addons/ballistics/script_component.hpp
View File

@ -15,5 +15,3 @@
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#define MOA_TO_RAD(d) (d * 0.00029088) // Conversion factor: PI / 10800

9
addons/main/script_macros.hpp
View File

@ -109,4 +109,13 @@
#define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) /* disabled */ #define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) /* disabled */
#endif #endif
// Angular unit conversion
#define MRAD_TO_MOA(d) ((d) * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MOA_TO_MRAD(d) ((d) * 0.29088821) // Conversion factor: (5 * PI) / 54
#define DEG_TO_MOA(d) ((d) * 60) // Conversion factor: 60
#define MOA_TO_DEG(d) ((d) / 60) // Conversion factor: 1 / 60
#define DEG_TO_MRAD(d) ((d) * 17.45329252) // Conversion factor: (50 * PI) / 9
#define MRAD_TO_DEG(d) ((d) / 17.45329252) // Conversion factor: 9 / (50 * PI)
#define MOA_TO_RAD(d) ((d) * 0.00029088) // Conversion factor: PI / 10800
#include "script_debug.hpp" #include "script_debug.hpp"

7
addons/rangecard/script_component.hpp
View File

@ -15,10 +15,3 @@
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"
#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
#define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
#define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
#define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9
#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)

2
addons/scopes/script_component.hpp
View File

@ -22,6 +22,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_SCOPES #define DEBUG_SETTINGS DEBUG_SETTINGS_SCOPES
#endif #endif
#define MRAD_TO_DEG(d) (d / 17.45329252) // Conversion factor: 9 / (50 * PI)
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"