Merge remote-tracking branch 'origin/explosive_reflection' into fragSpallOptimization

Conflicts:
	addons/frag/XEH_preInit.sqf

addons/frag/CfgAmmo.hpp

@@ -8,6 +8,9 @@ class CfgAmmo {
     //class ace_arty_105mm_m1_m782_delay: ace_arty_105mm_m1_m782_prox {
     //    GVAR(skip) = 1;
     //};
+    
+    #include "CfgAmmoReflections.hpp"
+    
     class Bo_GBU12_LGB;
     class ACE_GBU12 : Bo_GBU12_LGB {
         GVAR(enabled) = 1;

addons/frag/XEH_preInit.sqf

@@ -36,6 +36,13 @@ PREP(pfhRound);
 PREP(addPfhRound);
 PREP(removePfhRound); // THIS SHOULD ABE USED SPARINGLY
 
+// Explosive Reflection
+GVAR(replacedBisArtyWrapper) = true;
+PREP(findReflections);
+PREP(doExplosions);
+PREP(doReflections);
+
+
 GVAR(objects) = [];
 GVAR(objectTypes) = [];
 GVAR(arguments) = [];

addons/frag/functions/fnc_doExplosions.sqf

@@ -0,0 +1,26 @@
+//fnc_doExplosions.sqf
+#include "script_component.hpp"
+
+private ["_params", "_explosions", "_index", "_i", "_exp", "_refExp", "_bpos", "_hit", "_distance", "_indirectHitRange", "_depth"];
+_params = _this select 0;
+_explosions = _params select 0;
+_index = _params select 1;
+for "_i" from _index to ((_index+2) min (count _explosions)) do {
+    _exp = _explosions select _i;
+    _refExp = _exp select 0;
+    _bpos = _exp select 1;
+    _hit = _exp select 2;
+    _distance = _exp select 3;
+    _indirectHitRange = _exp select 4;
+    _depth = _exp select 5;
+    _refExp createVehicle (ASLtoATL _bpos);
+    // if(_hit >= 150 && _distance > _indirectHitRange) then {
+        // [_bpos, _refExp, _depth] call FUNC(doReflections);
+    // };
+};
+_index = _index + 2;
+if(_index >= (count _explosions)) then {
+    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+} else {
+    _params set[1, _index];
+};

addons/frag/functions/fnc_doReflections.sqf

@@ -0,0 +1,22 @@
+//fnc_doReflections.sqf
+#include "script_component.hpp"
+
+private ["_pos", "_ammo", "_depth", "_hit", "_range", "_hitFactor", "_indirectHitRange", "_indirectHit", "_testParams"];
+
+_pos = _this select 0;
+_ammo = _this select 1;
+_depth = 1;
+if(count _this > 2) then {
+    _depth = _this select 2;
+};
+// TEST_ICONS pushBack [_pos, format["EXP!", _hit, _range, _hitFactor]];
+if(_depth <= 2) then {
+    _indirectHitRange = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange");
+    _indirectHit = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHit");
+    
+    
+    
+    
+    _testParams = [_pos, [_indirectHitRange, _indirectHit], [], [], -4, _depth, 0];
+    [DFUNC(findReflections), 0, _testParams] call cba_fnc_addPerFrameHandler;
+};

addons/frag/functions/fnc_findReflections.sqf

@@ -0,0 +1,130 @@
+//fnc_findReflections.sqf
+#include "script_component.hpp"
+
+private ["_split", "_radi", "_params", "_pos", "_explosiveInfo", "_los", "_nlos", "_zIndex", "_depth", "_indirectHitRange", 
+    "_indirectHit", "_distanceCount", "_lastPos", "_test", "_vec", "_testPos", "_buckets", "_excludes", "_bucketIndex", "_bucketPos", 
+    "_bucketList", "_c", "_index", "_blist", "_avgX", "_avgY", "_avgZ", "_bpos", "_distance", "_hitFactor", "_hit", "_range", "_refExp", 
+    "_rand", "_i", "_x", "_res", "_forEachIndex", "_explosions", "_can", "_dirvec"];
+
+
+_params = _this select 0;
+_pos = _params select 0;
+_explosiveInfo = _params select 1;
+_los = _params select 2;
+_nlos = _params select 3;
+_zIndex = _params select 4;
+_depth = _params select 5;
+_rand = _params select 6;
+
+_split = 15;
+_radi = (360/_split*_depth);
+
+// player sideChat format["p: %1", _explosiveInfo];
+_indirectHitRange = _explosiveInfo select 0;
+_indirectHit = _explosiveInfo select 1;
+_distanceCount = (floor _indirectHitRange*4) min 100;
+
+if(_zIndex < 5) then {
+    _lastPos = _pos;
+    _zAng = _zIndex*20+2;
+    if(_zAng > 80) then {
+        _radi = 1;
+        _zAng = 90;
+    };
+    for "_i" from 0 to _radi do {
+        _test = true;
+        _vec = [1, ((_i*_split)+_rand) mod 360, _zAng] call cba_fnc_polar2vect;
+        for "_x" from 1 to _distanceCount do {
+            _testPos = _pos vectorAdd (_vec vectorMultiply _x);
+            // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
+            _res = lineIntersectsWith [_pos, _testPos];
+            if(count _res > 0) exitWith {
+                _test = false;
+                _nlos pushBack _lastPos;
+                // {
+                    // _x addEventHandler ["HandleDamage", { diag_log text format["this: %1", _this]; }];
+                // } forEach _res;
+                // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
+                // TEST_PAIRS pushBack [_pos, _lastPos, [1,0,0,1]];
+                
+            };
+            // if(terrainIntersectASL [_pos, _testPos]) exitWith {};
+            _lastPos = _testPos;
+        };
+    };
+    _params set[4, _zIndex+1];
+} else {
+    _depth = _depth + 1;
+    _buckets = [];
+    _excludes = [];
+    _bucketIndex = 0;
+    _bucketPos = nil;
+    _bucketList = nil;
+    _c = 0;
+    while { count(_nlos) != count(_excludes) && _c < (count _nlos) } do {
+        scopeName "mainSearch";
+        {
+            if(!(_forEachIndex in _excludes)) then {
+                _index = _buckets pushBack [_x, [_x]];
+                _excludes pushBack _forEachIndex;
+                _bucketPos = _x;
+                _bucketList = (_buckets select _index) select 1;
+                breakTo "mainSearch";
+            };
+        } forEach _nlos;
+        {
+            if(!(_forEachIndex in _excludes)) then {
+                _testPos = _x;
+                if(_testPos vectorDistanceSqr _bucketPos <= 30) then {
+                    _bucketList pushBack _x;
+                    _excludes pushBack _forEachIndex;
+                };
+            };
+        } forEach _nlos;
+        _c = _c + 1;
+    };
+
+    // player sideChat format["c: %1", count _buckets];
+    _explosions = [];
+    {
+        _blist = _x select 1;
+        _avgX = 0;
+        _avgY = 0;
+        _avgZ = 0;
+        
+        {
+            _avgX = _avgX + (_x select 0);
+            _avgY = _avgY + (_x select 1);
+            _avgZ = _avgZ + (_x select 2);
+        } forEach _blist;
+        _c = count _blist;
+        _bpos = [_avgX/_c, _avgY/_c, _avgZ/_c];
+        
+        _distance = _pos vectorDistance _bpos;
+        _hitFactor = 1-(((_distance/(_indirectHitRange*4)) min 1) max 0);
+        // _hitFactor = 1/(_distance^2);
+        _hit = _indirectHit*_hitFactor;
+        _hit = (floor (_hit/4)) min 500;
+        _hit = _hit - (_hit%10);
+        _range = (floor (_indirectHitRange-(_distance/4))) min 100;
+        _range = _range - (_range%2);
+        
+        if(_hit >= 10 && _range > 0) then {
+            // TEST_ICONS pushBack [_bpos, format["h: %1, r: %2, hf: %3 d: %4 ihr: %5", _hit, _range, _hitFactor, _distance, _indirectHitRange*4]];
+            // TEST_PAIRS pushBack [_pos, _bpos, [1,0,0,1]];
+            _refExp = format["ace_explosion_reflection_%1_%2", _range, _hit];
+            // _refExp createVehicle (ASLtoATL _bpos);
+            // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _bpos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
+            
+            _explosions pushBack [_refExp, _bpos, _hit, _distance, _indirectHitRange/4, _depth];
+            
+        };
+        if(count _explosions > (_radi*2)/_depth) exitWith {};
+    } forEach _buckets;
+    // _can = "Land_Bricks_V4_F" createVehicle (ASLtoATL _pos);
+    // _dirvec = _pos vectorFromTo ((ATLtoASL (player modelToWorldVisual (player selectionPosition "Spine3"))));
+    // _dirvec = _dirvec vectorMultiply 100;
+    // _can setVelocity _dirvec;
+    [DFUNC(doExplosions), 0, [_explosions, 0]] call cba_fnc_addPerFrameHandler;
+    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+};

addons/frag/functions/fnc_frago.sqf

@@ -106,8 +106,9 @@ _fragArcs set[360, 0];
     ACE_player sideChat format["_fragRange: %1", _fragRange];
     ACE_player sideChat format["_objects: %1", _objects];
 #endif
-_doRandom = false;
+_doRandom = true;
 if(_isArmed && (count _objects) > 0) then {
+    [_lastPos, _shellType] call FUNC(doReflections);
     {
         //if(random(1) > 0.5) then {
             _target = _x;
@@ -180,7 +181,7 @@ if(_isArmed && (count _objects) > 0) then {
         if(_fragCount > MAX_FRAG_COUNT) exitWith {};
     } forEach _objects;
     if(_fragCount > MAX_FRAG_COUNT) exitWith {};
-    _randomCount = (ceil((MAX_FRAG_COUNT-_fragCount)*0.1)) max 0;
+    _randomCount = ((ceil((MAX_FRAG_COUNT-_fragCount)*0.1)) max 0)+20;
     _sectorSize = 360 / (_randomCount max 1);
     // _doRandom = false;
     if(_doRandom) then {
@@ -209,6 +210,7 @@ if(_isArmed && (count _objects) > 0) then {
             _fragCount = _fragCount + 1;
         };
     };
+    
 };
 // #ifdef DEBUG_MODE_FULL
     // ACE_player sideChat format["total frags: %1", GVAR(TOTALFRAGS)];