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.

Sign up for GitHub

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

Update rain each frame #1526

Merged
merged 2 commits into from
Jun 13, 2015
Merged

Update rain each frame #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
833335d
Call setRain each frame
ulteq Jun 6, 2015
b2221b6
Introduced ACE_Rain
ulteq Jun 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion addons/weather/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ GVAR(humidityShift) = (5 - random 10) / 100;
GVAR(wind_period_start_time) = ACE_time;
GVAR(rain_period_start_time) = ACE_time;

GVAR(ACE_rain) = rain;

"ACE_WIND_PARAMS" addPublicVariableEventHandler { GVAR(wind_period_start_time) = ACE_time; };
"ACE_RAIN_PARAMS" addPublicVariableEventHandler { GVAR(rain_period_start_time) = ACE_time; };
"ACE_MISC_PARAMS" addPublicVariableEventHandler {
Expand Down Expand Up @@ -41,4 +43,9 @@ simulWeatherSync;
[FUNC(updateTemperature), 20, []] call CBA_fnc_addPerFrameHandler;
[FUNC(updateHumidity), 20, []] call CBA_fnc_addPerFrameHandler;
[FUNC(updateWind), 1, []] call CBA_fnc_addPerFrameHandler;
[FUNC(updateRain), 2, []] call CBA_fnc_addPerFrameHandler;
[FUNC(updateRain), 2, []] call CBA_fnc_addPerFrameHandler;
[{
if (GVAR(syncRain)) then {
0 setRain GVAR(ACE_rain);
};
}, 0, []] call CBA_fnc_addPerFrameHandler;
3 changes: 1 addition & 2 deletions addons/weather/functions/fnc_updateRain.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
if (!GVAR(syncRain)) exitWith {};

if (!isNil "ACE_RAIN_PARAMS") then {

EXPLODE_3_PVT(ACE_RAIN_PARAMS,_oldRain,_newRain,_period);

private ["_periodPosition", "_periodPercent"];
_periodPosition = (ACE_time - GVAR(rain_period_start_time)) min _period;
_periodPercent = (_periodPosition / _period) min 1;

0 setRain (_oldRain + (_newRain - _oldRain) * _periodPercent);
GVAR(ACE_Rain) = (_oldRain + (_newRain - _oldRain) * _periodPercent);
};