Merge pull request #767 from Neviothr/nev-vectors-cleanup

Vectors cleanup
CBATeam · Oct 25, 2017 · fd62c89 · fd62c89
2 parents 62e38fb + 6b23fea
commit fd62c89
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 26 deletions.
diff --git a/addons/vectors/CfgEventHandlers.hpp b/addons/vectors/CfgEventHandlers.hpp
@@ -1,8 +1,5 @@
-class Extended_PreInit_EventHandlers
-{
-    class ADDON
-    {
+class Extended_PreInit_EventHandlers {
+    class ADDON {
         init = QUOTE(call COMPILE_FILE(XEH_preInit));
     };
 };
-
diff --git a/addons/vectors/fnc_polar2vect.sqf b/addons/vectors/fnc_polar2vect.sqf
@@ -10,7 +10,7 @@ Parameters:
  _elev the elevation of the vector to create
 
 Returns:
- a vector in the form [x,z,y].
+ a vector in the form [x, z, y].
 
 Examples:
     (begin example)
@@ -25,7 +25,7 @@ scriptName "fnc_polar2vect.sqf";
 #include "script_component.hpp"
 SCRIPT(polar2vect);
 
-params ["_mag","_dir","_elev"];
+params ["_mag", "_dir", "_elev"];
 
-private _magCosElev = _mag * cos(_elev);
-[_magCosElev * sin(_dir), _magCosElev * cos(_dir), _mag * sin(_elev)];
+private _magCosElev = _mag * cos (_elev);
+[_magCosElev * sin (_dir), _magCosElev * cos (_dir), _mag * sin (_elev)];
diff --git a/addons/vectors/fnc_scaleVect.sqf b/addons/vectors/fnc_scaleVect.sqf
@@ -24,6 +24,6 @@ scriptName "fnc_scaleVect.sqf";
 #include "script_component.hpp"
 SCRIPT(scaleVect);
 
-params ["_vect","_factor"];
+params ["_vect", "_factor"];
 
 _vect vectorMultiply _factor;
diff --git a/addons/vectors/fnc_scaleVectTo.sqf b/addons/vectors/fnc_scaleVectTo.sqf
@@ -26,6 +26,6 @@ scriptName "fnc_scaleVectTo.sqf";
 #include "script_component.hpp"
 SCRIPT(scaleVectTo);
 
-params ["_vect","_newMagn"];
+params ["_vect", "_newMagn"];
 
 (vectorNormalized _vect) vectorMultiply _newMagn
diff --git a/addons/vectors/fnc_vect2polar.sqf b/addons/vectors/fnc_vect2polar.sqf
@@ -25,10 +25,10 @@ scriptName "fnc_vect2Polar.sqf";
 SCRIPT(vect2Polar);
 
 
-params ["_vx","_vy","_vz"];
+params ["_vx", "_vy", "_vz"];
 
 private _mag = vectorMagnitude _this;
-private _elev = if (_mag > 0) then { asin (_vz / _mag) } else { 0 };
+private _elev = if (_mag > 0) then {asin (_vz / _mag)} else {0};
 private _dir = _this call CBA_fnc_vectDir;
 
 [_mag, _dir, _elev];
diff --git a/addons/vectors/fnc_vectCross2D.sqf b/addons/vectors/fnc_vectCross2D.sqf
@@ -27,6 +27,6 @@ scriptName "fnc_vectCross2D.sqf";
 #include "script_component.hpp"
 SCRIPT(vectCross2D);
 
-params ["_u","_v"];
+params ["_u", "_v"];
 
 ((_u select 0) * (_v select 1)) - ((_u select 1) * (_v select 0));
diff --git a/addons/vectors/fnc_vectDir.sqf b/addons/vectors/fnc_vectDir.sqf
@@ -5,7 +5,7 @@ Description:
  Returns the angle of a vector with the given i and k coordinates in the range 0 to 360.
 
 Parameters:
- _vect the 2D vector array in the form [x,z] or [x,z,y] (y value is ignored).
+ _vect the 2D vector array in the form [x, z] or [x, z, y] (y value is ignored).
 
 Returns:
  the corresponding angle in range 0 to 360.

diff --git a/addons/vectors/fnc_vectElev.sqf b/addons/vectors/fnc_vectElev.sqf
@@ -5,7 +5,7 @@ Description:
  Returns the angle of elevation of a 3D vector with the given i, j and k coordinates in the range -90 to 90.
 
 Parameters:
- _vect the 3D vector in the form [i,k,j].
+ _vect the 3D vector in the form [i, k, j].
 
 Returns:
  the corresponding angle of elevation in range -90 to 90.
@@ -24,7 +24,7 @@ scriptName "fnc_vectElev.sqf";
 SCRIPT(vectElev);
 
 
-params ["_pos1","_pos2"];
+params ["_pos1", "_pos2"];
 
 private _dist2D = (_this) call CBA_fnc_vectMagn2D;
 

diff --git a/addons/vectors/fnc_vectMagn.sqf b/addons/vectors/fnc_vectMagn.sqf
@@ -5,7 +5,7 @@ Description:
  Returns the magnitude of a 3D vector with the given i, j and k coordinates.
 
 Parameters:
- _vect a 3D vector [i,k,j]
+ _vect a 3D vector [i, k, j]
 
 Returns:
  the magnitude of the vector.

diff --git a/addons/vectors/fnc_vectMagn2D.sqf b/addons/vectors/fnc_vectMagn2D.sqf
@@ -23,4 +23,4 @@ scriptName "fnc_vectMagn2D.sqf";
 #include "script_component.hpp"
 SCRIPT(vectMagn2D);
 
-sqrt((_this select 0)^2 + (_this select 1)^2)
+sqrt ((_this select 0) ^ 2 + (_this select 1) ^ 2)
diff --git a/addons/vectors/fnc_vectRotate2D.sqf b/addons/vectors/fnc_vectRotate2D.sqf
@@ -18,14 +18,14 @@ Author:
 
 #include "script_component.hpp"
 
-params ["_center","_vector","_angle"];
-_center params ["_x","_y"];
+params ["_center", "_vector", "_angle"];
+_center params ["_x", "_y"];
 
 
 private _dx = _x - (_vector select 0);
 private _dy = _y - (_vector select 1);
 
 [
-    _x - ((_dx* cos(_angle)) - (_dy* sin(_angle))),
-    _y - ((_dx* sin(_angle)) + (_dy* cos(_angle)))
+    _x - ((_dx * cos (_angle)) - (_dy * sin (_angle))),
+    _y - ((_dx * sin (_angle)) + (_dy * cos (_angle)))
 ]
diff --git a/addons/vectors/fnc_vectSubtract.sqf b/addons/vectors/fnc_vectSubtract.sqf
@@ -25,7 +25,7 @@ scriptName "fnc_vectSubtract.sqf";
 SCRIPT(vectSubtract);
 
 
-params ["_u","_v"];
+params ["_u", "_v"];
 
 private _i = (_u select 0) - (_v select 0);
 private _k = (_u select 1) - (_v select 1);

diff --git a/addons/vectors/script_component.hpp b/addons/vectors/script_component.hpp
@@ -1,7 +1,6 @@
 #define COMPONENT vectors
 #include "\x\cba\addons\main\script_mod.hpp"
 
-
 #ifdef DEBUG_ENABLED_VECTORS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/vectors/test_vectors.sqf b/addons/vectors/test_vectors.sqf
@@ -269,4 +269,4 @@ _result = _temp call CBA_fnc_polar2vect;
 TEST_TRUE([ARR_2(_result,_expected)] call _fnc_vectorEquals, "complex polar 2");
 
 
-nil;
+nil;