Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-23 04:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove some unneeded variables

Browse source
This commit is contained in:
in0finite 2020-05-01 20:02:31 +02:00
parent 1eb6dbadda
commit 91f9c55540
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Assets/Scripts/Behaviours/MiniMap.cs
View file

@ -37,7 +37,6 @@ namespace SanAndreasUnity.Behaviours
private Canvas _canvas; private Canvas _canvas;
public float zoom = 1.3f; public float zoom = 1.3f;
private const float scaleConst = 1f;
public const float maxVelocity = 300f; public const float maxVelocity = 300f;
public static float[] zooms = new float[10] { .5f, .75f, 1f, 1.2f, 1.4f, 1.6f, 2f, 2.5f, 3f, 5f }; public static float[] zooms = new float[10] { .5f, .75f, 1f, 1.2f, 1.4f, 1.6f, 2f, 2.5f, 3f, 5f };
@ -61,11 +60,11 @@ namespace SanAndreasUnity.Behaviours
{ {
get get
{ {
return zoom * scaleConst; return zoom;
} }
set set
{ {
zoom = value / scaleConst; zoom = value;
} }
} }
@ -98,7 +97,6 @@ namespace SanAndreasUnity.Behaviours
public Texture2D SeaPixel { get { return this.seaPixel; } } public Texture2D SeaPixel { get { return this.seaPixel; } }
private Ped m_ped => Ped.Instance; private Ped m_ped => Ped.Instance;
private PlayerController m_playerController => PlayerController.Instance; private PlayerController m_playerController => PlayerController.Instance;
private TextureDictionary huds; private TextureDictionary huds;
@ -110,18 +108,11 @@ namespace SanAndreasUnity.Behaviours
// Zoom vars // Zoom vars
public float curZoomPercentage; public float curZoomPercentage;
private float lastZoom;
private int zoomSelector = 2; private int zoomSelector = 2;
private Coroutine zoomCoroutine; private Coroutine zoomCoroutine;
// GUI Elements
private Texture2D blackPixel, seaPixel; private Texture2D blackPixel, seaPixel;
private float fAlpha = 1;
private bool showZoomPanel;
private float curZoom = 1;
public void Load() public void Load()
@ -249,7 +240,7 @@ namespace SanAndreasUnity.Behaviours
var playerController = m_playerController; var playerController = m_playerController;
if (playerController != null) if (playerController != null)
realZoom = Mathf.Lerp(.9f * scaleConst, 1.3f * scaleConst, 1 - Mathf.Clamp(playerController.CurVelocity, 0, maxVelocity) / maxVelocity) * curZoomPercentage; realZoom = Mathf.Lerp(.9f, 1.3f, 1 - Mathf.Clamp(playerController.CurVelocity, 0, maxVelocity) / maxVelocity) * curZoomPercentage;
// read input // read input
@ -272,7 +263,6 @@ namespace SanAndreasUnity.Behaviours
mapContainer.localRotation = Quaternion.Euler(0, 0, relAngle); mapContainer.localRotation = Quaternion.Euler(0, 0, relAngle);
mapContainer.localScale = new Vector3(realZoom, realZoom, 1); mapContainer.localScale = new Vector3(realZoom, realZoom, 1);
lastZoom = realZoom;
if (northPivot != null) if (northPivot != null)
northPivot.localRotation = Quaternion.Euler(0, 0, relAngle); northPivot.localRotation = Quaternion.Euler(0, 0, relAngle);
@ -290,8 +280,7 @@ namespace SanAndreasUnity.Behaviours
private IEnumerator ChangeZoom(bool isIncreasing) private IEnumerator ChangeZoom(bool isIncreasing)
{ {
showZoomPanel = true; float fAlpha = 1;
fAlpha = 1;
zoomSelector = GetClampedZoomSelector(zoomSelector); zoomSelector = GetClampedZoomSelector(zoomSelector);
float curZoom = zooms[zoomSelector % zooms.Length], float curZoom = zooms[zoomSelector % zooms.Length],
@ -306,7 +295,6 @@ namespace SanAndreasUnity.Behaviours
fAlpha -= Time.fixedDeltaTime / zoomDuration; fAlpha -= Time.fixedDeltaTime / zoomDuration;
} }
showZoomPanel = false;
zoomCoroutine = null; zoomCoroutine = null;
} }