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

Refuel - change nozzle position calc #5279

Merged
merged 1 commit into from
Jun 23, 2017
Merged

Refuel - change nozzle position calc #5279

merged 1 commit into from
Jun 23, 2017

Conversation

PabstMirror
Copy link
Contributor

Fix #5143

Removes the old binary search and now uses lineIntersectsSurfaces
Default is to aim at player's viewing angle (what you see is what you get) instead of using model center

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Jun 14, 2017
@PabstMirror PabstMirror added this to the 3.11.0 milestone Jun 14, 2017
@@ -21,7 +21,7 @@ params [["_unit", objNull, [objNull]], ["_target", objNull, [objNull]]];
private _fuel = [_target] call FUNC(getFuel);

[
REFUEL_PROGRESS_DURATION * 2.5,
TIME_PROGRESSBAR(REFUEL_PROGRESS_DURATION * 2),
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't REFUEL_PROGRESS_DURATION be a GVAR()?

Copy link
Member

Choose a reason for hiding this comment

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

No, this is not flow rate, it's how long it takes to check current fuel level of a vehicle. Macro is 2s, so this makes it 4s.

#define TIME_PROGRESSBAR(X) ((X) * 0.075)
#else
#define TIME_PROGRESSBAR(X) (X)
#endif
Copy link
Member

Choose a reason for hiding this comment

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

We could do that globally, and just set it to 0 or 0.5 (so it's visible that it happens at least) when defined?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

TIME_PROGRESSBAR is already in rearm
Rearm, Refuel are the main ones with some long progress bars that make testing tedious.

Might actually cause problems on some things like repacking and medical surgery, not sure.

Copy link
Member

Choose a reason for hiding this comment

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

I see. Would be done separate of this PR anyways.

@PabstMirror PabstMirror merged commit d02dacf into master Jun 23, 2017
@PabstMirror PabstMirror deleted the refuelStuff branch June 23, 2017 03:59
@PabstMirror PabstMirror modified the milestones: 3.11.0, 3.10.2 Jul 8, 2017
jonpas pushed a commit that referenced this pull request Jul 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants