Nightvision improvements (White Phosphor tubes support) #6190

JeuDeTarot · 2018-03-10T02:14:24Z

When merged this pull request will:

Adds possibility to set Color Correction Params (PP Effects) to classes.
Adds 'supporting' elements in fnc_RefreshGoggleType & minor changes in fnc_pfeh which do same ('support').
Adds example class in CfgWeapons & 2 classes for RHSUSAF compat. patch.

Description

Just added few improvements for fnc_pfeh & fnc_refreshGoggleType (ace_nightvision) to support different Color Correction presets (PP Effects). Now, you can set needed Params in class via CfgWeapons & it will be extracted to functions.

Added example class & 2 classes for RHSUSAF compatibility patch too (possible required "ace_nightvision" to be added in "requiredAddons[]" list via /compat_rhs_usf3/config.cpp).
I'd tested everything in a bit different form & it was required, so... Unfortunately, currently i'm not at home & can't check it right now.

Misc.

I also found & fix issues caused by A3_GPNVG18 mod, so will add compatibility patch ASAP.

Made by: JDT, AleM.
With Great Thanks to: BaerMitUmlaut

To Do

Add compatibility patch for A3_GPNVG18 (CANCELLED)

P.S. That's way totally work, but i will proceed my 'research'. Want to hide params & make selection with colorPreset[] = "White" or "Green". Try'd a lot, but still not found the right solution.

Added extraction of proper Color Correction Params from Config file (Post-Process Effects)

Minor changes for WP supporting

Sets needed ColorCorrection Params in Array

minor

JeuDeTarot · 2018-03-10T02:20:08Z

Last WP preset (made Params as close to original ACE3's as possible)

Original ACE3's green

Conditions: 10 JUN 2035, 03:00AM | Clear sky | Full Moon

bux · 2018-03-10T05:25:17Z

👍 nice

Neviothr · 2018-03-10T17:24:58Z

addons/nightvision/functions/fnc_refreshGoggleType.sqf

+            _offset = _preset select 0;
+            _blend = _preset select 1;
+            _colorize = _preset select 2;
+            _weight = _preset select 3;


Couldn't this be _preset params ["_offset", "_blend", "_colorize", "_weight"]?

I think that would cause a scope issue

Yes would cause a scope issue. But I don't even see the use of these variables. They are never used till line 115 and they are always the same as in the _preset variable.
Remove them all and use params on _preset on line 111

Ok, dedmen, will do.

Neviothr · 2018-03-10T17:25:12Z

addons/nightvision/functions/fnc_refreshGoggleType.sqf

+        _offset = _preset select 0;
+        _blend = _preset select 1;
+        _colorize = _preset select 2;
+        _weight = _preset select 3;


dedmen · 2018-03-10T19:35:17Z

addons/nightvision/CfgWeapons.hpp

@@ -5,6 +5,14 @@ class CfgWeapons {
        modelOptics = "";
        GVAR(border) = QPATHTOF(data\nvg_mask_binos_4096.paa);
        GVAR(bluRadius) = 0.15;
+        // It's should prevent from main classes incorrectly work (Set Color Correction Params) / Original ACE3's Green (JDT & AleM)


It's should prevent from main classes incorrectly work -> This prevents the main classes from working incorrectly
But might aswell leave that comment away. This is setting the NVG Color. No need for a comment besides maybe //Green color

Well, i try'd to be as informative as possible. Ofc, it would be changed & sorry my bad english.

dedmen · 2018-03-10T19:35:56Z

addons/nightvision/functions/fnc_pfeh.sqf

@@ -127,7 +127,8 @@ if (CBA_missionTime < GVAR(nextEffectsUpdate)) then {
    // ColorCorrections - Changes brightness, contrast and "green" color of nvg
    // Params: [brightness(0..2), contrast(0..inf), offset(-x..+x), blendArray, colorizeArray, weightArray]
    GVAR(ppeffectColorCorrect) = ppEffectCreate ["ColorCorrections", 2003];
-    GVAR(ppeffectColorCorrect) ppEffectAdjust [_brightFinal, _contrastFinal, 0, [0.0, 0.0, 0.0, 0.0], [1.3, 1.2, 0.0, 0.9], [6, 1, 1, 0.0]];
+    // 4 last Params now operated by Global variables / Watch fnc_refreshGoggleType.sqf fo more clarification / Required for WP supporting (JDT & AleM)


You don't need to add your (JDT & AleM) To every second line you change. We know who wrote that from the commit history.

Same here, just for clarification & easy search

Removed (JDT & AleM)

JeuDeTarot · 2018-03-11T04:33:11Z

Made corrections based on reviews.

Don't sure what i understood right that what would cause scope issue.
And isn't it would be fixed by adding "scope = 2" to classes?

dedmen · 2018-03-11T05:19:10Z

addons/nightvision/functions/fnc_refreshGoggleType.sqf

@@ -74,6 +85,8 @@ if (alive ACE_player) then {
            if (isNumber (_config >> QGVAR(bluRadius))) then {_blurRadius = getNumber (_config >> QGVAR(bluRadius));};
        };
        if (isNumber (_config >> QGVAR(generation))) then {_nvgGen = getNumber (_config >> QGVAR(generation));};
+        // Same as at line 72


useless comment :D But... as I look at that. Line 87 is also the same as 71.. Wait a second... That doesn't make any sense.
Oh no.. It does.. Ugh...
Maybe replace the confusing exitWith at line 68 with a then and a else?

@dedmen i'm not really sure, 'cause i try'd to not touch original stuff where that's not necessary.
If it still understandable (meant exitWith), i guess that's not important for replacing.

True. If you didn't do it then no need for you to fix it ^^

@dedmen Well, want to say what IMO exitWith more elegant way than then & else.

JeuDeTarot · 2018-03-11T19:26:40Z

Uhm... How BaerMitUmlaut said me, you're guys dont really want to add more compat pbos...
So, do i still need to post that then? Or better to contact with teeha?

jonpas · 2018-03-11T20:07:45Z

Ideally he would add that little line of config himself. We only maintain the compatibility PBOs we do because their authors refuse to and there are maintainers available.

JeuDeTarot · 2018-03-11T21:42:09Z

ok then, i'll try to find him.

JeuDeTarot · 2018-03-18T08:36:42Z

Well. teeha not answering, so.
Don't know what would be right to do.
Upload 'unofficial' compat. patch to GPNVG-18 to steam workshop or just forget that.

Max255PL · 2019-07-14T12:29:33Z

Been using this for over a year, no issues on our side except the bug with NVG overlay in FFV ( #6769 ) also reverts effects to default green. It's not compatible out of the box with the PRd fix.

Also the WPs are a bit dark compared to green, been using this color preset to improve the brightness:

colorPreset[] = {0.0, {0.0, 0.0, 0.0, 0.0}, {1.1, 0.8, 1.9, 0.9}, {1, 1, 6, 0.0}};

jonpas · 2019-12-07T21:05:52Z

optionals/compat_rhs_usf3/CfgWeapons.hpp

+    class rhsusf_ANPVS_14_WP: rhsusf_ANPVS_14 {
+        author = "JDT & AleM";
+        displayName = "AN/PVS-14 (Gen3, WP tube)";
+        descriptionShort = "AN/PVS-14 Monocular NVD /w White Phosphor tube";


Stringtable.

jonpas · 2019-12-07T21:05:54Z

optionals/compat_rhs_usf3/CfgWeapons.hpp

+    // White Phosphor version
+    class rhsusf_ANPVS_14_WP: rhsusf_ANPVS_14 {
+        author = "JDT & AleM";
+        displayName = "AN/PVS-14 (Gen3, WP tube)";


Stringtable.

jonpas · 2019-12-07T21:06:08Z

optionals/compat_rhs_usf3/CfgWeapons.hpp

@@ -6,11 +6,25 @@ class CfgWeapons {
        EGVAR(nightvision,border) = QPATHTOEF(nightvision,data\nvg_mask_4096.paa);
        EGVAR(nightvision,bluRadius) = 0.13;
    };
+    // White Phosphor version
+    class rhsusf_ANPVS_14_WP: rhsusf_ANPVS_14 {
+        author = "JDT & AleM";


You added a line to this config, doesn't make you the author, please remove.

jonpas · 2019-12-07T21:07:03Z

addons/nightvision/CfgWeapons.hpp

+    class NVGoggles_WP: NVGoggles { // White Phosphor version (example)
+        author = "JDT & AleM";
+        displayName = "NV Goggles (Gen3 WP tubes, Sand)";
+        descriptionShort = "3rd Generation NVD /w White Phosphor tubes";


Stringtable...

HateAndCaffeine · 2021-01-05T08:35:59Z

I'm a dev for the A3TI mod and I'm having some issues with the night vision in the ACE Dev version making some weird things happen with my mod.
https://steamcommunity.com/sharedfiles/filedetails/?id=2041057379

My mod uses custom ppEffects for night vision. For the release version of ACE my mod uses "oldIsCamera = true;" to circumvent the ACE night vision post processing effects.

That command does not work when using the ACE nightvision from this pull and results in the post processing color corrections doubling up and appearing either yellow or purple vs the black and white as intended by my mod's effect.

Any assistance in circumventing the ppEffects applied from this similar to "oldIsCamera = true;" would be appreciated.

HateAndCaffeine · 2021-01-05T08:37:28Z

For example:

vs

jonpas · 2021-04-20T10:56:33Z

@JeuDeTarot requirements for merge:

Nightvision improvements (White Phosphor tubes support) #6190 (comment)
Requested changes from me above
Nightvision improvements (White Phosphor tubes support) #6190 (comment)

JeuDeTarot added 6 commits March 10, 2018 03:54

Update fnc_RefreshGoggleType.sqf

3d09a88

Added extraction of proper Color Correction Params from Config file (Post-Process Effects)

Update fnc_refreshGoggleType.sqf

e8e4cfe

Update fnc_pfeh.sqf

22f4757

Minor changes for WP supporting

Added colorPreset[] = (Sets CC Params for class)

d23bd31

Sets needed ColorCorrection Params in Array

Update CfgWeapons.hpp

14665c2

minor

Add new classes of NVDs (WP tubes)

6c9ff59

Neviothr reviewed Mar 10, 2018

View reviewed changes

dedmen reviewed Mar 10, 2018

View reviewed changes

JeuDeTarot added 7 commits March 11, 2018 07:14

Comment shortness

fe42df2

Comment shortness

2a2627a

changes added base on reviews

d79bd8a

Update based on reviews

77bbceb

Update based on review

0a193b6

Comment changed

ac688bd

Removed (JDT & AleM)

Update (based on reviews)

9428127

dedmen reviewed Mar 11, 2018

View reviewed changes

jonpas added the kind/feature Release Notes: **ADDED:** label Mar 17, 2018

jonpas added this to the 3.13.0 milestone Mar 17, 2018

jonpas added the status/review-pending label Mar 17, 2018

small fix

6660387

dedmen approved these changes Jul 15, 2019

View reviewed changes

jonpas requested changes Dec 7, 2019

View reviewed changes

jonpas modified the milestones: 3.13.0, 3.13.1 Dec 7, 2019

jonpas removed the status/review-pending label Dec 7, 2019

jonpas modified the milestones: 3.13.1, 3.14.0 Feb 22, 2020

PabstMirror self-assigned this Feb 22, 2020

tbeswick96 mentioned this pull request Apr 18, 2021

ACE - WP NODs uksf/modpack#832

Closed

jonpas added the status/WIP label Apr 20, 2021

PabstMirror modified the milestones: 3.15.1, Ongoing May 24, 2022

Mike-MF mentioned this pull request Aug 12, 2023

Night Vision - Add White Phosphor NVGs #9321

Merged

3 tasks

jonpas closed this in #9321 Aug 16, 2023

LinkIsGrim removed this from the Ongoing milestone Sep 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nightvision improvements (White Phosphor tubes support) #6190

Nightvision improvements (White Phosphor tubes support) #6190

JeuDeTarot commented Mar 10, 2018 •

edited

Loading

JeuDeTarot commented Mar 10, 2018 •

edited

Loading

bux commented Mar 10, 2018

Neviothr Mar 10, 2018

PabstMirror Mar 10, 2018

dedmen Mar 10, 2018

JeuDeTarot Mar 11, 2018

Neviothr Mar 10, 2018

dedmen Mar 10, 2018

JeuDeTarot Mar 11, 2018 •

edited

Loading

dedmen Mar 10, 2018

JeuDeTarot Mar 11, 2018 •

edited

Loading

JeuDeTarot commented Mar 11, 2018 •

edited

Loading

dedmen Mar 11, 2018

JeuDeTarot Mar 11, 2018 •

edited

Loading

dedmen Mar 11, 2018

JeuDeTarot Mar 11, 2018 •

edited

Loading

JeuDeTarot commented Mar 11, 2018

jonpas commented Mar 11, 2018

JeuDeTarot commented Mar 11, 2018

JeuDeTarot commented Mar 18, 2018

Max255PL commented Jul 14, 2019

jonpas Dec 7, 2019

jonpas Dec 7, 2019

jonpas Dec 7, 2019

jonpas Dec 7, 2019

HateAndCaffeine commented Jan 5, 2021

HateAndCaffeine commented Jan 5, 2021 •

edited

Loading

jonpas commented Apr 20, 2021

Nightvision improvements (White Phosphor tubes support) #6190

Nightvision improvements (White Phosphor tubes support) #6190

Conversation

JeuDeTarot commented Mar 10, 2018 • edited Loading

JeuDeTarot commented Mar 10, 2018 • edited Loading

bux commented Mar 10, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JeuDeTarot Mar 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JeuDeTarot Mar 11, 2018 • edited Loading

Choose a reason for hiding this comment

JeuDeTarot commented Mar 11, 2018 • edited Loading

Choose a reason for hiding this comment

JeuDeTarot Mar 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JeuDeTarot Mar 11, 2018 • edited Loading

Choose a reason for hiding this comment

JeuDeTarot commented Mar 11, 2018

jonpas commented Mar 11, 2018

JeuDeTarot commented Mar 11, 2018

JeuDeTarot commented Mar 18, 2018

Max255PL commented Jul 14, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HateAndCaffeine commented Jan 5, 2021

HateAndCaffeine commented Jan 5, 2021 • edited Loading

jonpas commented Apr 20, 2021

JeuDeTarot commented Mar 10, 2018 •

edited

Loading

JeuDeTarot commented Mar 10, 2018 •

edited

Loading

JeuDeTarot Mar 11, 2018 •

edited

Loading

JeuDeTarot Mar 11, 2018 •

edited

Loading

JeuDeTarot commented Mar 11, 2018 •

edited

Loading

JeuDeTarot Mar 11, 2018 •

edited

Loading

JeuDeTarot Mar 11, 2018 •

edited

Loading

HateAndCaffeine commented Jan 5, 2021 •

edited

Loading