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

Merge pull request #377 from KoffeinFlummi/142light

Browse Source 
142 directional light for map effects
This commit is contained in:
commy2 2015-04-08 21:46:48 +02:00
commit 1ae69d56ff
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/functions/fnc_lightIntensityFromObject.sqf
View File

@ -63,7 +63,7 @@ if (_lightSource isKindOf "CAManBase") then {
_lightLevel = (linearConversion [0, 30, _distance, 1, 0, true]) * (linearConversion [_innerAngle, _outerAngle, _angle, 1, 0, true]); _lightLevel = (linearConversion [0, 30, _distance, 1, 0, true]) * (linearConversion [_innerAngle, _outerAngle, _angle, 1, 0, true]);
} else { } else {
// handle any object, strcutures, cars, tanks, etc. // handle any object, strcutures, cars, tanks, etc. @todo campfires, burning vehicles
private "_lights"; private "_lights";
_lights = [_lightSource] call FUNC(getTurnedOnLights); _lights = [_lightSource] call FUNC(getTurnedOnLights);

37
addons/map/functions/fnc_determineMapLight.sqf
View File

@ -66,10 +66,13 @@ if (_lightLevel > 0.95) exitWith {
[false, [0.5,0.5,0.5,0]] [false, [0.5,0.5,0.5,0]]
}; };
private "_vehicle";
_vehicle = vehicle _unit;
// Do not obscure the map if the player is on a enclosed vehicle (assume internal illumination) // Do not obscure the map if the player is on a enclosed vehicle (assume internal illumination)
if (vehicle _unit != _unit) then { if (_vehicle != _unit) then {
// Player is in a vehicle // Player is in a vehicle
if ((vehicle _unit) isKindOf "Tank") then { if (isTurnedOut _unit && {_vehicle isKindOf "Tank" || {_vehicle isKindOf "Wheeled_APC"}}) then {
_isEnclosed = true; _isEnclosed = true;
}; };
}; };
@ -81,32 +84,10 @@ if (_isEnclosed) exitWith {
// Player is not in a vehicle // Player is not in a vehicle
TRACE_1("Player is on foot or in an open vehicle",""); TRACE_1("Player is on foot or in an open vehicle","");
// Check if player is near a campfires, lights or vehicles with lights on - 15m // Check if player is near a campfires, streetlamps, units with flashlights, vehicles with lights on, etc. - 40m
_nearObjects = [nearestObjects [_unit, ["All"], 15], {(inflamed _this) || (isLightOn _this)}] call EFUNC(common,filter); {
if (count (_nearObjects) > 0) then { _lightLevel = _lightLevel max ([_unit, _x] call EFUNC(common,lightIntensityFromObject));
_light = _nearObjects select 0; } forEach nearestObjects [_unit, ["All"], 40];
_ll = (1 - (((((_unit distance _light) - 5)/10) max 0) min 1));
if (_ll > _lightLevel) then {
_lightLevel = _ll;
TRACE_1("player near campfire","");
};
};
// Gun with light
_nearObjects = [nearestObjects [_unit, ["CAManBase"], 10], { _this isFlashlightOn (currentWeapon _this)}] call EFUNC(common,filter);
if (count (_nearObjects) > 0) then {
_light = (_nearObjects select 0);
_flashlight = (_light weaponAccessories currentMuzzle _light) select 1;
// Check if it's a day laser
if (_flashlight == "ACE_acc_pointer_red") exitWith {};
if (_flashlight == "ACE_acc_pointer_green") exitWith {};
_lightLevel = _lightLevel max (1 - (((((_unit distance _light) - 2)/8) max 0) min 1));
TRACE_1("Using gun light","");
};
// @todo: Illumination flares (timed) // @todo: Illumination flares (timed)