-
Notifications
You must be signed in to change notification settings - Fork 740
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
Cache Nametags onDraw3D flags. #4847
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2180a11
Cache Nametag flags
dedmen ffbac90
Remove unused privates
dedmen 1d2e332
Merge branch 'NametagsCaching' of https://github.com/dedmen/ACE3 into…
PabstMirror a0cd0fa
Fix fading, cursorOnly mode, improve cache reset
PabstMirror 7d10125
Fix header
PabstMirror File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* Author: <N/A> | ||
* Get's flags used for onDraw3D that can be cached | ||
* | ||
* Arguments: | ||
* None | ||
* | ||
* Return Value: | ||
* [_drawName,_drawRank,_enabledTagsNearby,_enabledTagsCursor,_onKeyPressAlphaMax,_maxDistance] | ||
* | ||
* Example: | ||
* call ace_nametags_fnc_getCachedFlags | ||
* | ||
* Public: No | ||
*/ | ||
#include "script_component.hpp" | ||
|
||
|
||
// Determine flags from current settings | ||
private _drawName = true; | ||
private _enabledTagsNearby = false; | ||
private _enabledTagsCursor = false; | ||
private _onKeyPressAlphaMax = 1; | ||
|
||
switch (GVAR(showPlayerNames)) do { | ||
case 0: { | ||
// Player names Disabled | ||
_drawName = false; | ||
_enabledTagsNearby = (GVAR(showSoundWaves) == 2); | ||
_enabledTagsCursor = false; | ||
}; | ||
case 1: { | ||
// Player names Enabled | ||
_enabledTagsNearby = true; | ||
_enabledTagsCursor = false; | ||
}; | ||
case 2: { | ||
// Player names Only cursor | ||
_enabledTagsNearby = (GVAR(showSoundWaves) == 2); | ||
_enabledTagsCursor = true; | ||
}; | ||
case 3: { | ||
// Player names Only Keypress | ||
_onKeyPressAlphaMax = 2 + (GVAR(showNamesTime) - CBA_missionTime); | ||
_enabledTagsNearby = (_onKeyPressAlphaMax) > 0 || (GVAR(showSoundWaves) == 2); | ||
_enabledTagsCursor = false; | ||
}; | ||
case 4: { | ||
// Player names Only Cursor and Keypress | ||
_onKeyPressAlphaMax = 2 + (GVAR(showNamesTime) - CBA_missionTime); | ||
_enabledTagsNearby = (GVAR(showSoundWaves) == 2); | ||
_enabledTagsCursor = _onKeyPressAlphaMax > 0; | ||
}; | ||
case 5: { | ||
// Fade on border | ||
_enabledTagsNearby = true; | ||
_enabledTagsCursor = false; | ||
}; | ||
}; | ||
|
||
private _ambientBrightness = ((([] call EFUNC(common,ambientBrightness)) + ([0, 0.4] select ((currentVisionMode ace_player) != 0))) min 1) max 0; | ||
private _maxDistance = _ambientBrightness * GVAR(PlayerNamesViewDistance); | ||
|
||
[_drawName, GVAR(showPlayerRanks),_enabledTagsNearby,_enabledTagsCursor,_onKeyPressAlphaMax,_maxDistance] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
who's that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/acemod/ACE3/blob/master/addons/nametags/functions/fnc_onDraw3d.sqf#L2 That guy