Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2025-07-25 04:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 3DEN sphere and grid, set helper center dir properly

Browse Source
This commit is contained in:
Josuan Albin
2017-11-03 15:57:19 +01:00
parent 59d47ee1cf
commit 86c0a44837
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/arsenal/functions/fnc_onArsenalClose.sqf
View File

@ -11,16 +11,15 @@ deleteVehicle GVAR(cameraHelper);
if (is3DEN) then {
GVAR(centerOrigin) hideObject false;
GVAR(centerOrigin) setUnitLoadout (getUnitLoadout GVAR(center));
GVAR(centerOrigin) setFace GVAR(currentFace);
GVAR(centerOrigin) setSpeaker GVAR(currentVoice);
deleteVehicle GVAR(sphere);
deleteVehicle GVAR(light);
deleteVehicle GVAR(center);
GVAR(centerOrigin) = nil;
GVAR(sphere) = nil;
GVAR(light) = nil;
get3DENCamera cameraEffect ["internal","back"];

13
addons/arsenal/functions/fnc_onArsenalOpen.sqf
View File

@ -258,17 +258,12 @@ ctrlSetFocus _mouseAreaCtrl;
if (is3DEN) then {
GVAR(centerOrigin) = GVAR(center);
GVAR(centerOrigin) hideObject true;
private _centerPos = position GVAR(centerOrigin);
_centerPos set [2,500];
GVAR(sphere) = createVehicle ["Sphere_3DEN", _centerPos, [], 0, "none"];
GVAR(sphere) setPosAtl _centerPos;
GVAR(sphere) setDir 0;
GVAR(sphere) setObjectTexture [0,"#(argb,8,8,3)color(0.93,1.0,0.98,0.028,co)"];
GVAR(sphere) setObjectTexture [1,"#(argb,8,8,3)color(0.93,1.0,0.98,0.01,co)"];
GVAR(center) = createAgent [typeOf GVAR(centerOrigin), position GVAR(centerOrigin), [], 0, "none"];
GVAR(center) setPosAtl getPosAtl GVAR(sphere);
GVAR(center) setDir 0;
GVAR(center) setPosAtl getPosAtl GVAR(centerOrigin);
GVAR(center) setDir (getDir GVAR(centerOrigin));
GVAR(center) switchMove animationState GVAR(centerOrigin);
GVAR(center) switchAction "playerstand";
GVAR(center) enableSimulation false;
@ -283,7 +278,7 @@ if (is3DEN) then {
GVAR(light) setLightBrightness _intensity;
GVAR(light) setLightAmbient [1,1,1];
GVAR(light) setLightColor [0,0,0];
GVAR(light) lightAttachObject [GVAR(sphere), [0, 0, -_intensity * 7]];
GVAR(light) lightAttachObject [GVAR(centerOrigin), [0, 0, -_intensity * 7]];
//--- Use the same vision mode as in Eden
GVAR(visionMode)= -2 call bis_fnc_3DENVisionMode;

17
addons/arsenal/functions/fnc_updateCamPos.sqf
View File

@ -12,21 +12,4 @@ GVAR(camera) setVectorDirAndUp [vectorDir GVAR(cameraHelper), vectorUp GVAR(came
if ((getPosAsl GVAR(camera) select 2) < (getPosAsl GVAR(center) select 2)) then {
private _disCoef = ((getPosAsl GVAR(cameraHelper) select 2) - (getPosAsl GVAR(center) select 2)) / ((getPosAsl GVAR(cameraHelper) select 2) - (getPosAsl GVAR(camera) select 2) + 0.001);
GVAR(camera) setPos (GVAR(cameraHelper) modelToWorldVisual [0, -_distance * _disCoef, 0]);
};
if (is3DEN) then {
for "_x" from -5 to 5 step 1 do {
drawLine3D [
GVAR(sphere) modelToWorld [_x, -5, 0],
GVAR(sphere) modelToWorld [_x, +5, 0],
[0.03, 0.03, 0.03, 1]
];
};
for "_y" from -5 to 5 step 1 do {
drawLine3D [
GVAR(sphere) modelToWorld [-5, _y, 0],
GVAR(sphere) modelToWorld [+5, _y, 0],
[0.03, 0.03, 0.03, 1]
];
};
};