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

onZoomMarkerScaling upgrade

Browse Source 
use better mapScale value management and calculation
This commit is contained in:
DirtySanchez 2017-10-20 11:15:09 -05:00
parent f202217f46
commit 9297fa539e
1 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -383,56 +383,32 @@ if(_markerName in allMapMarkers)then{
}; };
if(getNumber(('CfgEpochClient' call EPOCH_returnConfig) >> 'mapOnZoomSetMarkerSize') isEqualTo 1)then{ if(getNumber(('CfgEpochClient' call EPOCH_returnConfig) >> 'mapOnZoomSetMarkerSize') isEqualTo 1)then{
if(visibleMap)then{ if(visibleMap)then{
_mapControl = (findDisplay 12) displayCtrl 51; _mapScale = ctrlMapScale ((findDisplay 12) displayCtrl 51);
_mapScale = ctrlMapScale _mapControl; _mapMarkers = allMapMarkers;
_zoomMarkers = allMapMarkers; {
if((uiNamespace getVariable[_x,[]]) isEqualTo [])then {uiNamespace setVariable[_x,[(getMarkerSize _x) select 0,(getMarkerSize _x) select 1]]};
}forEach _mapMarkers;
if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0}; if(isNil {EPOCH_lastMapScale})then{EPOCH_lastMapScale = 0};
for "_i" from 0 to ((count _zoomMarkers) - 1) do {
_zoomMarker = _zoomMarkers select _i; //if( (_mapScale != EPOCH_lastMapScale) && ((_mapScale >=0.15) && (_mapScale <=0.95)) )then{
if(_mapScale != EPOCH_lastMapScale)then{
EPOCH_lastMapScale = _mapScale;
for "_i" from 0 to ((count _mapMarkers) - 1) do {
_zoomMarker = _mapMarkers select _i;
private "_markerString"; private "_markerString";
_markerString = toArray _zoomMarker; _markerString = toArray _zoomMarker;
_markerString resize 6; _markerString resize 6;
if (toString _markerString == "EPOCH_") then { if (toString _markerString == "EPOCH_") then {
switch(true)do{ _var = uiNamespace getVariable[_zoomMarker,[0.8,0.8]];
case ( (_mapScale >= 0.95) && (_mapScale <= 1) ): { _sizeX = (((_var select 0) / _mapScale) min 2.5) max 0.666;
_zoomMarker setMarkerSizeLocal [0.666,0.666]; _sizeY = (((_var select 1) / _mapScale) min 2.5) max 0.666;
//_zoomMarker setMarkerAlphaLocal 0; _zoomMarker setMarkerSizeLocal [_sizeX,_sizeY];
};
case ( (_mapScale >= 0.75) && (_mapScale < 0.95) ): {
_zoomMarker setMarkerSizeLocal [0.8,0.8];
};
case ( (_mapScale >= 0.55) && (_mapScale < 0.75) ): {
_zoomMarker setMarkerSizeLocal [0.9,0.9];
};
case ( (_mapScale >= 0.5) && (_mapScale < 0.55) ): {
_zoomMarker setMarkerSizeLocal [1.0,1.0];
};
case ( (_mapScale >= 0.45) && (_mapScale < 0.5) ): {
_zoomMarker setMarkerSizeLocal [1.1,1.1];
};
case ( (_mapScale >= 0.35) && (_mapScale < 0.45) ): {
_zoomMarker setMarkerSizeLocal [1.2,1.2];
};
case ( (_mapScale >= 0.25) && (_mapScale < 0.35) ): {
_zoomMarker setMarkerSizeLocal [1.3,1.3];
};
case ( (_mapScale >= 0.15) && (_mapScale < 0.25) ): {
_zoomMarker setMarkerSizeLocal [1.4,1.4];
};
case ( (_mapScale >= 0.1) && (_mapScale < 0.15) ): {
_zoomMarker setMarkerSizeLocal [1.5,1.5];
};
case ( (_mapScale >= 0.0666) && (_mapScale < 0.1) ): {
_zoomMarker setMarkerSizeLocal [1.6,1.6];
};
case ( (_mapScale >= 0) && (_mapScale < 0.0666) ): {
_zoomMarker setMarkerSizeLocal [1.7,1.7];
}; };
}; };
// EPOCH_lastMapScale = _mapScale;
}; };
}; };
EPOCH_lastMapScale = _mapScale;
};
}; };
// force update // force update