Skip to content

Fixing a weird issue... #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lisias wants to merge 1 commit into
base: continued
Choose a base branch
from
Open

Fixing a weird issue... #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NavUtilities continued/NavUtilLib/AnalogGauges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ private void OnHdgBtnClick()

rwyLabel.SetText(NavUtilLib.GlobalVariables.FlightData.currentBodyRunways[NavUtilLib.GlobalVariables.FlightData.rwyIdx].shortID);

NavUtilLib.GlobalVariables.Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(GlobalVariables.Settings.getAudioPath() + "click"));
NavUtilLib.GlobalVariables.Audio.PlayClick();
}

private void OnCrsBtnClick()
Expand All @@ -207,7 +207,7 @@ private void OnCrsBtnClick()

crsKnob.localRotation = crsKnobInit * Quaternion.AngleAxis(((float)NavUtilLib.GlobalVariables.FlightData.gsIdx / (float)NavUtilLib.GlobalVariables.FlightData.gsList.Count()) * 360, Vector3.forward);

NavUtilLib.GlobalVariables.Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(GlobalVariables.Settings.getAudioPath() + "click"));
NavUtilLib.GlobalVariables.Audio.PlayClick();
}

private void RunOnce()
Expand Down
8 changes: 4 additions & 4 deletions NavUtilities continued/NavUtilLib/GlobalV_DisplayData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,15 @@ public static void DrawHSI(RenderTexture screen, float aspectRatio) //DrawHSI
switch (bcnCode)
{
case 1:
var.Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(GlobalVariables.Settings.getAudioPath() + "outer"));
var.Audio.Instance.PlayOuter();
break;

case 2:
var.Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(GlobalVariables.Settings.getAudioPath() + "middle"));
var.Audio.Instance.PlayMiddle();
break;

case 3:
var.Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(GlobalVariables.Settings.getAudioPath() + "inner"));
var.Audio.Instance.PlayInner();
break;

default:
Expand Down Expand Up @@ -234,7 +234,7 @@ public static void DrawHSI(RenderTexture screen, float aspectRatio) //DrawHSI
break;

default:
var.Audio.markerAudio.Stop();
var.Audio.Instance.Stop();
break;
}

Expand Down
40 changes: 37 additions & 3 deletions NavUtilities continued/NavUtilLib/GlobalVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,11 @@ public static Audio Instance
public static bool isLoaded = false;

public static GameObject audioplayer;
public static AudioSource markerAudio;
private static AudioSource markerAudio;
//public static AudioSource playOnce;

private bool isPlaying = false;

public static void initializeAudio()
{
audioplayer = new GameObject();
Expand Down Expand Up @@ -440,9 +442,41 @@ public static void initializeAudio()
throw;
}


isLoaded = true;
}

public static void PlayClick()
{
Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(Settings.getAudioPath() + "click"));
}

public void PlayOuter()
{
Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(Settings.getAudioPath() + "outer"));
this.isPlaying = true;
}

public void PlayMiddle()
{
Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(Settings.getAudioPath() + "middle"));
this.isPlaying = true;
}

public void PlayInner()
{
Audio.markerAudio.PlayOneShot(GameDatabase.Instance.GetAudioClip(Settings.getAudioPath() + "inner"));
this.isPlaying = true;
}

public void Stop()
{
if (this.isPlaying)
{
Audio.markerAudio.Stop();
this.isPlaying = false;
}
}
}
}
}
}