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.

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

Cleanup Frag Component #4581

Merged
merged 9 commits into from
Oct 26, 2016
Merged

Cleanup Frag Component #4581

merged 9 commits into from
Oct 26, 2016

Conversation

654wak654
Copy link
Contributor

@654wak654 654wak654 commented Oct 21, 2016

When merged this pull request will:

  • Do some minor cleanup in ace_frag (not so minor anymore with all the commits).
  • The PR looks bigger than it is because of simple whitespace changes. It is as big as it looks please review carefully, earlier on I broke spalling with one of my "optimizations".
  • Not much has been tested since the first commit, not sure if this can make it to 3.8.1 without proper testing. Will try to test with people from my unit this monday. Update: Had a lot of fun with explosions, found & fixed some script errors,

@jonpas jonpas added the kind/cleanup Release Notes: **CHANGED:** label Oct 21, 2016
@jonpas jonpas added this to the 3.8.1 milestone Oct 21, 2016
@PabstMirror
Copy link
Contributor

Looks good.
Need to fix merge conflicts.

private _data = [_origin, typeOf _origin, typeOf _obj, _objSpd, _positions, _color];

GVAR(traces) set[_index, _data];
GVAR(traces) pushBack _data;
Copy link
Member

Choose a reason for hiding this comment

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

private _index = GVAR(traces) pushBack _data;

Saves using count earlier in the function

Copy link
Contributor Author

@654wak654 654wak654 Oct 22, 2016

Choose a reason for hiding this comment

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

Smart catch, will do

@thojkooi thojkooi changed the base branch from master to release-v3.8.1 October 22, 2016 11:50
@thojkooi thojkooi changed the base branch from release-v3.8.1 to master October 22, 2016 11:50
…pdate

# Conflicts:
#	addons/frag/functions/fnc_doSpall.sqf
#	addons/frag/functions/fnc_findReflections.sqf
#	addons/frag/functions/fnc_frago.sqf
@654wak654
Copy link
Contributor Author

Updated PR body to reflect current state.

@thojkooi thojkooi modified the milestones: 3.8.1, 3.8.2 Oct 25, 2016
ADD(_index,2);

if (_index >= count _explosions) then {
[_pfhID] call CBA_fnc_removePerFrameHandler;
};
Copy link
Contributor

@PabstMirror PabstMirror Oct 26, 2016

Choose a reason for hiding this comment

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

Needs to be set in the array
This will fix #4590 (in old code _params was undefined)

if (_index >= count _explosions) then {
    [_pfhID] call CBA_fnc_removePerFrameHandler;
} else {
    _args set[1, _index];
};

@@ -19,10 +19,9 @@ if(isServer) then {
["ace_firedPlayerVehicle", DFUNC(fired)] call CBA_fnc_addEventHandler;
["ace_firedNonPlayerVehicle", DFUNC(fired)] call CBA_fnc_addEventHandler;

[FUNC(masterPFH), 0, []] call CBA_fnc_addPerFrameHandler;

[FUNC(masterPFH)] call CBA_fnc_addPerFrameHandler;
Copy link
Contributor

Choose a reason for hiding this comment

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

Leave this as [FUNC(masterPFH), 0, []] call CBA_fnc_addPerFrameHandler;
ENABLE_PERFORMANCE_COUNTERS has a macro that expects 3 args.

@thojkooi thojkooi merged commit 49b5a0e into acemod:master Oct 26, 2016
thojkooi pushed a commit that referenced this pull request Oct 26, 2016
* Cleanup frag component

* Optimize fnc_addTrack

* Add additional cleanup

* Please work?

* Add more cleanup

* Fix script errors

* Fix/optimize spalling

* Add missing changes
@KingZogg
Copy link

The cookoff problem is still ongoing.
Running 3.8.1
Why was the other issue closed ?

@PabstMirror
Copy link
Contributor

It will be fixed in next release (which should be 3.8.2)
for now you should be able to prevent issue if you disable frag relfections

@bux
Copy link
Member

bux commented Oct 27, 2016

:picard:

@654wak654 654wak654 deleted the frag-update branch October 27, 2016 07:44
@654wak654 654wak654 mentioned this pull request Jan 4, 2017
@PabstMirror PabstMirror mentioned this pull request Feb 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup Release Notes: **CHANGED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants