Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

NVG - Fix grain and color effects (#6018)

Browse Source
This commit is contained in:
PabstMirror 2018-01-05 18:23:56 -06:00 committed by GitHub
parent a881e5e2d3
commit 4eb7868f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/nightvision/CfgEventHandlers.hpp
View File

@ -13,3 +13,10 @@ class Extended_PostInit_EventHandlers {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
};
};
// In SP-Editor, opening escape menu will break nvg grain effect
class Extended_DisplayLoad_EventHandlers {
class RscDisplayInterrupt {
GVAR(resetGrain) = QUOTE(if (GVAR(ppeffectGrain) > -1) then {ppEffectDestroy GVAR(ppeffectGrain);};);
};
};

1
addons/nightvision/XEH_postInit.sqf
View File

@ -20,7 +20,6 @@ GVAR(ppeffectGrain) = -1;
GVAR(ppeffectRadialBlur) = -1;
GVAR(ppeffectColorCorrect) = -1;
GVAR(ppeffectBlur) = -1;
GVAR(ppEffectCCMuzzleFlash) = -1;
["ace_settingsInitialized", {

13
addons/nightvision/functions/fnc_onFiredPlayer.sqf
View File

@ -55,12 +55,7 @@ TRACE_1("final", _visibleFire);
if (_visibleFire <= 1.5) exitWith {};
if ((random (linearConversion [1, 4, GVAR(nvgGeneration), 10, 20])) > _visibleFire) exitWith {};
GVAR(ppEffectCCMuzzleFlash) = ppEffectCreate ["ColorCorrections", 1237];
GVAR(ppEffectCCMuzzleFlash) ppEffectEnable true;
GVAR(ppEffectCCMuzzleFlash) ppEffectForceInNVG true;
GVAR(ppEffectCCMuzzleFlash) ppEffectAdjust [1, 1, -1, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]];
GVAR(ppEffectCCMuzzleFlash) ppEffectCommit 0;
GVAR(ppEffectCCMuzzleFlash) ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]];
GVAR(ppEffectCCMuzzleFlash) ppEffectCommit 0.07;
QGVAR(cutoff) cutText ["", "BLACK", .1];
[{
QGVAR(cutoff) cutText ["", "PLAIN", 0];
}, [], 0.07] call CBA_fnc_waitAndExecute;

4
addons/nightvision/functions/fnc_setupDisplayEffects.sqf
View File

@ -71,7 +71,3 @@ if (GVAR(ppeffectColorCorrect) != -1) then {
ppEffectDestroy GVAR(ppeffectColorCorrect);
GVAR(ppeffectColorCorrect) = -1;
};
if (GVAR(ppEffectCCMuzzleFlash) != -1) then {
ppEffectDestroy GVAR(ppEffectCCMuzzleFlash);
GVAR(ppEffectCCMuzzleFlash) = -1;
};