Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic functions for change of basis in 3D #939

Merged
merged 16 commits into from
Jun 30, 2018
Merged

Add basic functions for change of basis in 3D #939

Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
22a14f2
Add basic functions for change of basis in 3D
Kexanone Jun 22, 2018
0884e85
Update CfgFunctions.hpp
Kexanone Jun 22, 2018
ab4efd8
Replace tabs with spaces in fnc_matrixProduct3D
Kexanone Jun 22, 2018
c2cf66c
Replace for loops with apply
Kexanone Jun 22, 2018
efe1e00
Standardize comment indentation
Kexanone Jun 22, 2018
cf63434
Fix comment grammar
Kexanone Jun 23, 2018
89e47f8
delete semicolon to indicate function return value
commy2 Jun 23, 2018
41bc3ea
delete semicolon to indicate function return value
commy2 Jun 23, 2018
8a9d880
delete semicolon to indicate function return value
commy2 Jun 23, 2018
e998ed6
delete atypical empty line
commy2 Jun 23, 2018
f11acdb
delete atypical empty line
commy2 Jun 23, 2018
99185c1
Optimize _fnc_vectorEquals and implement _fnc_matrixEquals
Kexanone Jun 23, 2018
c29d3b4
Add unit tests
Kexanone Jun 23, 2018
b0456e5
include position
commy2 Jun 30, 2018
a5995d1
include position
commy2 Jun 30, 2018
df3d6a6
include position
commy2 Jun 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion addons/vectors/test_vectors.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,28 @@ private _fnc_vectorEquals = {
if ((count _vector1) != (count _vector2)) exitWith {false};
private _equal = true;
{
if ((abs (_x - (_vector2 select _forEachIndex))) > 0.00001) then {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be replaced by findIf I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

findif does not support _forEachIndex

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to, findIf is kind of hard to read.

if ((abs (_x - (_vector2 select _forEachIndex))) > 0.00001) exitWith {
_equal = false;
};
} forEach _vector1;
_equal
};

//Need custom func to compare matrices to handle floating point errors
private _fnc_matrixEquals = {
params ["_matrix1", "_matrix2"];
if ((isNil "_matrix1") || {isNil "_matrix2"}) exitWith {false};
if (!(_matrix1 isEqualTypeArray _matrix2)) exitWith {false};
if ((count _matrix1) != (count _matrix2)) exitWith {false};
private _equal = true;
{
if !([ARR_2(_x, _matrix2 select _forEachIndex)] call _fnc_vectorEquals) exitWith {
_equal = false;
};
} forEach _matrix1;
_equal
};

// ----------------------------------------------------------------------------

LOG('Testing Vectors');
Expand Down Expand Up @@ -296,4 +311,39 @@ _result = _temp call CBA_fnc_polar2vect;
TEST_TRUE([ARR_2(_result,_expected)] call _fnc_vectorEquals, "complex polar 2");


// UNIT TESTS (vectMap3D)
_fn = "CBA_fnc_vectMap3D";
TEST_DEFINED("CBA_fnc_vectMap3D","");

_result = [[[0,1,0],[0,0,1],[1,0,0]], [1,2,3]] call CBA_fnc_vectMap3D;
_expected = [2,3,1];
TEST_TRUE([ARR_2(_result,_expected)] call _fnc_vectorEquals, _fn);

_result = [[[1,2,5],[2,-1,3],[5,6,-1]], [1,2,3]] call CBA_fnc_vectMap3D;
_expected = [20,9,14];
TEST_TRUE([ARR_2(_result,_expected)] call _fnc_vectorEquals, _fn);

// UNIT TESTS (matrixTranspose)
_fn = "CBA_fnc_matrixTranspose";
TEST_DEFINED("CBA_fnc_matrixTranspose","");

_result = [[[1,2,5],[-2,4,3],[5,6,8]]] call CBA_fnc_matrixTranspose;
_expected = [[1,-2,5],[2,4,6],[5,3,8]];
TEST_TRUE([ARR_2(_result,_expected)] call _fnc_matrixEquals, _fn);

// UNIT TESTS (matrixProduct3D)
_fn = "CBA_fnc_matrixProduct3D";
TEST_DEFINED("CBA_fnc_matrixProduct3D","");

_result = [[[1,2,5],[2,-1,3],[5,6,-1]], [[1,2,3],[3,1,2],[2,3,1]]] call CBA_fnc_matrixProduct3D;
_expected = [[17,19,12],[5,12,7],[21,13,26]];
TEST_TRUE([ARR_2(_result,_expected)] call _fnc_matrixEquals, _fn);

private _orthogonalMatrix = [[2/3,-1/3,2/3],[2/3,2/3,-1/3],[-1/3,2/3,2/3]];
private _orthogonalMatrixTransposed = [_orthogonalMatrix] call CBA_fnc_matrixTranspose;
_result = [_orthogonalMatrix, _orthogonalMatrixTransposed] call CBA_fnc_matrixProduct3D;
_expected = [[1,0,0],[0,1,0],[0,0,1]];
TEST_TRUE([ARR_2(_result,_expected)] call _fnc_matrixEquals, _fn);


nil;