Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

make use of config based snap points

Browse Source
This commit is contained in:
vbawol 2017-10-20 10:08:52 -05:00
parent ec756c3134
commit 27ef146313
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/epoch_code/compile/building/EPOCH_simulSwap.sqf
View File

@ -22,7 +22,7 @@
NOTHING
*/
//[[[cog import generate_private_arrays ]]]
private ["_allowedSnapObjects","_allowedSnapPoints","_cfgBaseBuilding","_class","_create","_currentTarget","_dir2","_direction","_disallowed","_distance","_distanceMod","_distanceNear","_energyCost","_isSnap","_lastCheckTime","_maxHeight","_nearestObject","_nearestObjectRaw","_newObj","_objSlot","_objType","_object","_oemType","_offset","_onContactEH","_pOffset","_playerEnergy","_playerEnergyKeyFinal","_playerdistance","_pos2","_prevSnapDistance","_previousDistanceNear","_rejectMove","_return","_simulClassConfig","_snapArrayPara","_snapArrayPerp","_snapDistance","_snapObjects","_snapPointsPara","_snapPointsPerp","_snapPos","_snapPosition","_snapType","_textureSlot","_up2","_vel2","_velocityTransformation","_worldspace"];
private ["_allowedSnapObjects","_allowedSnapPoints","_cfgBaseBuilding","_class","_create","_currentTarget","_dir2","_direction","_disallowed","_distance","_distanceMod","_distanceNear","_energyCost","_isSnap","_lastCheckTime","_maxHeight","_nearestObject","_nearestObjectRaw","_newObj","_objSlot","_objType","_object","_oemType","_offset","_onContactEH","_pOffset","_playerEnergy","_playerEnergyKeyFinal","_playerdistance","_pos2","_prevSnapDistance","_previousDistanceNear","_rejectMove","_return","_simulClassConfig","_snapArrayPara","_snapArrayPerp","_snapConfig","_snapDistance","_snapObjects","_snapPointsPara","_snapPointsPerp","_snapPos","_snapPosition","_snapType","_textureSlot","_up2","_vel2","_velocityTransformation","_worldspace"];
//[[[end]]]
if !(isNil "EPOCH_simulSwap_Lock") exitWith{};
@ -147,12 +147,13 @@ if (isText(_simulClassConfig)) then {
} forEach _allowedSnapObjects;
};
if (!isNull _nearestObject) then {
_snapPointsPara = getArray(_cfgBaseBuilding >> (typeOf _nearestObject) >> "snapPointsPara");
_snapPointsPerp = getArray(_cfgBaseBuilding >> (typeOf _nearestObject) >> "snapPointsPerp");
_snapConfig = _cfgBaseBuilding >> (typeOf _nearestObject);
_snapPointsPara = getArray(_snapConfig >> "snapPointsPara");
_snapPointsPerp = getArray(_snapConfig >> "snapPointsPerp");
_snapArrayPara = [];
{
if (_x in _allowedSnapPoints) then {
_pOffset = _nearestObject selectionPosition _x;
_pOffset = getArray (_snapConfig >> _x);
_snapPos = _nearestObject modelToWorld _pOffset;
if ((_pos2 distance _snapPos) < 3) then {
_snapArrayPara pushBackUnique _snapPos;
@ -162,7 +163,7 @@ if (isText(_simulClassConfig)) then {
_snapArrayPerp = [];
{
if (_x in _allowedSnapPoints) then {
_pOffset = _nearestObject selectionPosition _x;
_pOffset = getArray (_snapConfig >> _x);
_snapPos = _nearestObject modelToWorld _pOffset;
if ((_pos2 distance _snapPos) < 3) then {
_snapArrayPerp pushBackUnique _snapPos;

6
Sources/epoch_code/compile/building/EPOCH_staticMove.sqf
View File

@ -246,7 +246,7 @@ if (_class != "") then {
_x params ["_snapPoints","_type"];
{
if (_x in _allowedSnapPoints) then {
_pOffset = _nearestObject selectionPosition _x;
_pOffset = getArray (_snapConfig >> _x);
_snapPos = _nearestObject modelToWorldVisual _pOffset;
if (surfaceIsWater _snapPos) then {
_snapPos set[2, ((getPosASL _nearestObject) select 2) + (_pOffset select 2)];
@ -334,12 +334,12 @@ if (_class != "") then {
_currentTarget setVectorDirAndUp [_vectorDir,_vectorUP];
};
};
if(_dirLock)then{
_currentTarget setVectorDirAndUp [_dir2,_vectorUP];
_currentTarget setposATL _snapPosition;
};
_snapped = true;
_arr_snapPoints = [];
EPOCH_arr_snapPoints = [];