mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Remove duplicate macro definitions
This commit is contained in:
parent
008602590c
commit
e1213483e6
@ -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
|
||||||
|
@ -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
|
|
||||||
|
@ -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"
|
||||||
|
@ -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)
|
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user