implement day/night backgrounds

gruppe-adler · May 10, 2017 · bff8828 · bff8828
1 parent 027cb8f
commit bff8828
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 17 deletions.
diff --git a/cfgFunctions.hpp b/cfgFunctions.hpp
@@ -15,6 +15,7 @@ class grad_gpsTracker {
         class openTitle {};
         class setTarget {};
         class updateArrow {};
+        class updateBackground {};
         class updateReception {};
     };
 };
diff --git a/data/tracker_bg.paa → data/tracker_bg_day.paa b/data/tracker_bg.paa → data/tracker_bg_day.paa
diff --git a/data/tracker_bg_night.paa b/data/tracker_bg_night.paa
diff --git a/functions/fn_addPFH.sqf b/functions/fn_addPFH.sqf
@@ -4,11 +4,16 @@ params ["_updateInterval"];
 
 [{
     params ["_args","_handle"];
-    _args params ["_updateInterval","_display","_arrowCtrl","_receptionCtrl","_receptionCode"];
+    _args params ["_updateInterval","_display","_arrowCtrl","_receptionCtrl","_bgDayCtrl","_receptionCode"];
 
     if (isNull _display) exitWith {[_handle] call CBA_fnc_removePerFrameHandler};
 
     _reception = [player,grad_gpsTracker_currentTarget,_updateInterval,_receptionCtrl,_receptionCode] call grad_gpsTracker_fnc_updateReception;
     [player,grad_gpsTracker_currentTarget,_arrowCtrl,_reception] call grad_gpsTracker_fnc_updateArrow;
 
+
+    if (CBA_missionTime - grad_gpsTracker_lastBgUpdateTime > 10) then {
+        [_bgDayCtrl] call grad_gpsTracker_fnc_updateBackground;
+        grad_gpsTracker_lastBgUpdateTime = CBA_missionTime;
+    };
 } , _updateInterval, _this] call CBA_fnc_addPerFrameHandler;
diff --git a/functions/fn_createGPS.sqf b/functions/fn_createGPS.sqf
@@ -10,24 +10,31 @@ _ctrlGroup ctrlSetPosition [_offsetX * SZW(120) - _totalW,_offsetY * SZH(80) - _
 _ctrlGroup ctrlSetFade 1;
 _ctrlGroup ctrlCommit 0;
 
-[{ctrlCommitted _this}, {
-    _this ctrlSetFade 0;
-    _this ctrlCommit 0.5;
-}, _ctrlGroup] call CBA_fnc_waitUntilAndExecute;
+private _backgroundNight = _display ctrlCreate ["RscPicture",-1,_ctrlGroup];
+_backgroundNight ctrlSetText (grad_gpsTracker_moduleRoot + "\data\tracker_bg_night.paa");
+_backgroundNight ctrlSetPosition [0,0,_totalW,_totalH];
+_backgroundNight ctrlCommit 0;
 
-private _background = _display ctrlCreate ["RscPicture",-1,_ctrlGroup];
-_background ctrlSetText (grad_gpsTracker_moduleRoot + "\data\tracker_bg.paa");
-_background ctrlSetPosition [0,0,_totalW,_totalH];
-_background ctrlCommit 0;
+private _backgroundDay = _display ctrlCreate ["RscPicture",-1,_ctrlGroup];
+_backgroundDay ctrlSetTextColor [1,1,1,1];
+_backgroundDay ctrlSetText (grad_gpsTracker_moduleRoot + "\data\tracker_bg_day.paa");
+_backgroundDay ctrlSetPosition [0,0,_totalW,_totalH];
+_backgroundDay ctrlCommit 0;
 
 private _receptionCtrl = _display ctrlCreate ["RscPicture",-1,_ctrlGroup];
 _receptionCtrl ctrlSetText (grad_gpsTracker_moduleRoot + "\data\tracker_0.paa");
-_receptionCtrl ctrlSetPosition [_size * SZW(14),_size * SZH(10.4),_size * SZW(4),_size * SZH(4)];
+_receptionCtrl ctrlSetPosition [_size * SZW(12.6),_size * SZH(10.4),_size * SZW(4),_size * SZH(4)];
 _receptionCtrl ctrlCommit 0;
 
 private _arrowCtrl = _display ctrlCreate ["RscPicture",-1,_ctrlGroup];
 _arrowCtrl ctrlSetText (grad_gpsTracker_moduleRoot + "\data\tracker_arrow.paa");
 _arrowCtrl ctrlSetPosition [_size * SZW(14.5),_size * SZH(15),_size * SZW(11),_size * SZH(11)];
 _arrowCtrl ctrlCommit 0;
 
-[_ctrlGroup,_arrowCtrl,_receptionCtrl]
+[{ctrlCommitted (_this select 0)}, {
+    params ["_arrowCtrl","_ctrlGroup"];
+    _ctrlGroup ctrlSetFade 0;
+    _ctrlGroup ctrlCommit 0.5;
+}, [_arrowCtrl,_ctrlGroup]] call CBA_fnc_waitUntilAndExecute;
+
+[_ctrlGroup,_arrowCtrl,_receptionCtrl,_backgroundDay]
diff --git a/functions/fn_initModule.sqf b/functions/fn_initModule.sqf
@@ -1,4 +1,6 @@
 #include "..\component.hpp"
 
+grad_gpsTracker_lastBgUpdateTime = 0;
+
 grad_gpsTracker_moduleRoot = [] call grad_gpsTracker_fnc_getModuleRoot;
 [] call grad_gpsTracker_fnc_setTarget;
diff --git a/functions/fn_openDialog.sqf b/functions/fn_openDialog.sqf
@@ -7,8 +7,8 @@ if (!isNil "_target") then {[_target] call grad_gpsTracker_fnc_setTarget};
 _display = (findDisplay 46) createDisplay "RscDisplayEmpty";
 
 _components = [_display,_size,_offsetX,_offsetY] call grad_gpsTracker_fnc_createGPS;
-_components params ["_ctrlGroup","_arrowCtrl","_receptionCtrl"];
+_components params ["_ctrlGroup","_arrowCtrl","_receptionCtrl","_bgDayCtrl"];
 
-[_updateInterval,_display,_arrowCtrl,_receptionCtrl,_receptionCode] call grad_gpsTracker_fnc_addPFH;
+[_updateInterval,_display,_arrowCtrl,_receptionCtrl,_bgDayCtrl,_receptionCode] call grad_gpsTracker_fnc_addPFH;
 
 _display
diff --git a/functions/fn_openTitle.sqf b/functions/fn_openTitle.sqf
@@ -10,9 +10,9 @@
     _display = uiNamespace getVariable ["RscTitleDisplayEmpty",displayNull];
 
     _components = [_display,_size,_offsetX,_offsetY] call grad_gpsTracker_fnc_createGPS;
-    _components params ["_ctrlGroup","_arrowCtrl","_receptionCtrl"];
+    _components params ["_ctrlGroup","_arrowCtrl","_receptionCtrl","_bgDayCtrl"];
 
-    [_updateInterval,_display,_arrowCtrl,_receptionCtrl,_receptionCode] call grad_gpsTracker_fnc_addPFH;
+    [_updateInterval,_display,_arrowCtrl,_receptionCtrl,_bgDayCtrl,_receptionCode] call grad_gpsTracker_fnc_addPFH;
 
     if (_duration > 0) then {
         [grad_gpsTracker_fnc_closeTitle,[],_duration] call CBA_fnc_waitAndExecute;

diff --git a/functions/fn_updateBackground.sqf b/functions/fn_updateBackground.sqf
@@ -0,0 +1,5 @@
+#include "..\component.hpp"
+
+params ["_bg"];
+
+_bg ctrlSetTextColor [1,1,1,-0.8 + 1.8 * sunOrMoon];
diff --git a/package.json b/package.json
@@ -1,6 +1,13 @@
 {
     "name": "grad-gpstracker",
     "description": "GPS Tracker dialog with a basic API.",
-    "version": "0.0.4",
-    "author": "McDiod"
+    "version": "0.1.0",
+    "contributors": [
+        {
+            "name": "nomisum"
+        },
+        {
+            "name": "McDiod"
+        }
+    ]
 }