Move minimap zoom through daemon render settings
This commit is contained in:
parent
c624982215
commit
756ffa72ad
4 changed files with 108 additions and 7 deletions
|
|
@ -586,7 +586,9 @@ public class ActionGameManager : MonoBehaviour
|
|||
Settings.HeatstrokePhasingFloor,
|
||||
Settings.HeatstrokePhasingFrequency,
|
||||
TargetSpottedBlinkFrequency,
|
||||
TargetSpottedBlinkOffset);
|
||||
TargetSpottedBlinkOffset,
|
||||
Settings.MinimapZoomLevels?.Select(level => (double)level).ToArray(),
|
||||
Settings.DefaultMinimapZoom);
|
||||
}
|
||||
|
||||
private readonly (float2 direction, string name)[] _directions = {
|
||||
|
|
@ -2020,6 +2022,8 @@ public class ActionGameManager : MonoBehaviour
|
|||
Debug.Log);
|
||||
LoadRuntimeLoadoutTemplates(stateBoot.StateFilePath);
|
||||
ZoneRenderer.RenderSettings = ObservedDaemonRenderSettings();
|
||||
_zoomLevelIndex = ZoneRenderer.RenderSettings.ResolveDefaultMinimapZoomIndex();
|
||||
ZoneRenderer.MinimapDistance = (float)ZoneRenderer.RenderSettings.ResolveMinimapDistance(_zoomLevelIndex);
|
||||
|
||||
// If hiding minimap asteroids, turn them off to start with
|
||||
if (!RuntimePlayerSettings.GraphicsSettings.ShowAsteroidsInMinimap)
|
||||
|
|
@ -2035,11 +2039,10 @@ public class ActionGameManager : MonoBehaviour
|
|||
InputDisplayLayout.Input = Input.asset;
|
||||
Input.Global.Enable();
|
||||
|
||||
_zoomLevelIndex = Settings.DefaultMinimapZoom;
|
||||
Input.Player.MinimapZoom.performed += context =>
|
||||
{
|
||||
_zoomLevelIndex = (_zoomLevelIndex + 1) % Settings.MinimapZoomLevels.Length;
|
||||
ZoneRenderer.MinimapDistance = Settings.MinimapZoomLevels[_zoomLevelIndex];
|
||||
_zoomLevelIndex = ZoneRenderer.RenderSettings.ResolveNextMinimapZoomIndex(_zoomLevelIndex);
|
||||
ZoneRenderer.MinimapDistance = (float)ZoneRenderer.RenderSettings.ResolveMinimapDistance(_zoomLevelIndex);
|
||||
};
|
||||
|
||||
Input.Global.ZoneMap.performed += context =>
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ public class ZoneRenderer : MonoBehaviour
|
|||
var bigBounds = new Bounds(Vector3.zero, Vector3.one * 1024);
|
||||
foreach (var mesh in AsteroidMeshes) mesh.Mesh.bounds = bigBounds;
|
||||
ViewDistance = Settings.DefaultViewDistance;
|
||||
MinimapDistance = Settings.MinimapZoomLevels[Settings.DefaultMinimapZoom];
|
||||
MinimapDistance = (float)RenderSettings.ResolveDefaultMinimapDistance();
|
||||
|
||||
_tourTimer = TourSwitchTime;
|
||||
_transposer = SceneCamera.GetCinemachineComponent<CinemachineTransposer>();
|
||||
|
|
|
|||
Loading…
Reference in a new issue