Merge branch 'main' into feature/building-games-in-maui

games/Orbit/Orbit/Audio/AudioItem.cs

@@ -0,0 +1,8 @@
+namespace Orbit.Audio;
+
+public static class AudioItem
+{
+    public const string HomeBackgroundMusic = "magic-space.mp3";
+
+    public const string ThrusterSoundEffect = "engine-heavy-loop.mp3";
+}

games/Orbit/Orbit/Audio/AudioService.cs

@@ -0,0 +1,47 @@
+using System;
+using Plugin.Maui.Audio;
+
+namespace Orbit.Audio;
+
+public class AudioService
+{
+    readonly IDictionary<string, IAudioPlayer> players = new Dictionary<string, IAudioPlayer>();
+    private readonly IAudioManager audioManager;
+    private readonly IFileSystem fileSystem;
+
+    public AudioService(
+        IAudioManager audioManager,
+        IFileSystem fileSystem)
+    {
+        this.audioManager = audioManager;
+        this.fileSystem = fileSystem;
+    }
+
+    public async Task Play(string audioItem, bool loop)
+    {
+        if (!players.TryGetValue(audioItem, out var audioPlayer))
+        {
+            audioPlayer = audioManager.CreatePlayer(await fileSystem.OpenAppPackageFileAsync(audioItem));
+
+            players[audioItem] = audioPlayer;
+
+            audioPlayer.Loop = loop;
+        }
+
+        if (!audioPlayer.IsPlaying)
+        {
+            audioPlayer.Play();
+        }
+    }
+
+    public void Stop(string audioItem)
+    {
+        if (players.TryGetValue(audioItem, out var audioPlayer))
+        {
+            if (audioPlayer.IsPlaying)
+            {
+                audioPlayer.Stop();
+            }
+        }
+    }
+}

games/Orbit/Orbit/Audio/SoundEffect.cs

@@ -0,0 +1,6 @@
+namespace Orbit.Audio;
+
+public enum SoundEffect
+{
+    Thruster
+}

games/Orbit/Orbit/Audio/SoundEffectService.cs

@@ -0,0 +1,15 @@
+using Plugin.Maui.Audio;
+
+namespace Orbit.Audio;
+
+public class SoundEffectService
+{
+    static readonly IDictionary<SoundEffect, string> soundEffectToResourceMapping = new Dictionary<SoundEffect, string>()
+    {
+        [SoundEffect.Thruster] = "engine-heavy-loop.mp3"
+    };
+
+    public static string GetSoundEffectFile(SoundEffect soundEffect) =>
+        soundEffectToResourceMapping[soundEffect];
+
+}

games/Orbit/Orbit/GameObjects/Asteroid.cs

@@ -6,19 +6,22 @@ public class Asteroid : GameObject
 {
     private readonly IGameSceneManager gameSceneManager;
     private readonly IServiceProvider serviceProvider;
+    private readonly IVibration vibration;
     Microsoft.Maui.Graphics.IImage image;
     float x;
     float y;
     Movement movement;
 
     public Asteroid(
         IGameSceneManager gameSceneManager,
-        IServiceProvider serviceProvider)
+        IServiceProvider serviceProvider,
+        IVibration vibration)
     {
         image = LoadImage("asteroid.png");
 
         this.gameSceneManager = gameSceneManager;
         this.serviceProvider = serviceProvider;
+        this.vibration = vibration;
     }
 
     public void SetMovement(Movement movement)
@@ -80,6 +83,8 @@ public override void Render(ICanvas canvas, RectF dimensions)
             var remains = this.serviceProvider.GetRequiredService<AsteroidRemains>();
             remains.SetBounds(this.Bounds);
             CurrentScene.Add(remains);
+
+            this.vibration.Vibrate();
         }
 
         if (collision is Ship ship)

games/Orbit/Orbit/GameObjects/Ship.cs

@@ -32,6 +32,7 @@ public Ship(
         this.gameSceneManager = gameSceneManager;
         this.thruster = thruster;
         this.userInputManager = userInputManager;
+
         Add(gun);
         Add(thruster);
         Add(battery);
@@ -58,8 +59,6 @@ public override void Render(ICanvas canvas, RectF dimensions)
         var image = this.thruster.IsThrusting ? GetImage(userInputManager.TouchMode) : GetImage(TouchMode.None);
         canvas.DrawImage(image, orbitRadius, 0, Bounds.Width, Bounds.Height);
 
-        //Bounds = WHAT???? Needs to include rotation and translation details ;(
-
         if (MainPage.ShowBounds)
         {
             canvas.StrokeColor = Colors.OrangeRed;

games/Orbit/Orbit/GameObjects/Thruster.cs

@@ -1,19 +1,25 @@
-using Orbit.Engine;
+using AVFoundation;
+using Orbit.Audio;
+using Orbit.Engine;
+using Plugin.Maui.Audio;
 
 namespace Orbit.GameObjects;
 
 public class Thruster : GameObject
 {
     private readonly Battery battery;
     private readonly UserInputManager userInputManager;
+    private readonly AudioService audioService;
     private const float batteryDrain = 0.5f;
 
     public Thruster(
         Battery battery,
-        UserInputManager userInputManager)
+        UserInputManager userInputManager,
+        AudioService audioService)
 	{
         this.battery = battery;
         this.userInputManager = userInputManager;
+        this.audioService = audioService;
     }
 
     public float Thrust { get; private set; }
@@ -31,6 +37,15 @@ public override void Update(double millisecondsSinceLastUpdate)
             Thrust = -0.25f;
         }
 
+        if (this.IsThrusting)
+        {
+            _ = this.audioService.Play(AudioItem.ThrusterSoundEffect, false);
+        }
+        else
+        {
+            this.audioService.Stop(AudioItem.ThrusterSoundEffect);
+        }
+
         base.Update(millisecondsSinceLastUpdate);
     }
 

games/Orbit/Orbit/MainPage.xaml.cs

@@ -1,4 +1,5 @@
-using Orbit.Engine;
+using Orbit.Audio;
+using Orbit.Engine;
 using Orbit.Scenes;
 
 namespace Orbit;
@@ -7,17 +8,20 @@ public partial class MainPage : ContentPage
 {
     private readonly IGameSceneManager gameSceneManager;
     private readonly UserInputManager userInputManager;
+    private readonly AudioService audioService;
 
     public static bool ShowBounds { get; private set; } = false;
 
     public MainPage(
         IGameSceneManager gameSceneManager,
-        UserInputManager userInputManager)
+        UserInputManager userInputManager,
+        AudioService audioService)
     {
         InitializeComponent();
 
         this.gameSceneManager = gameSceneManager;
         this.userInputManager = userInputManager;
+        this.audioService = audioService;
         gameSceneManager.StateChanged += OnGameSceneManagerStateChanged;
         gameSceneManager.LoadScene<HomeScene>(GameView);
     }
@@ -31,6 +35,8 @@ private async void OnGameSceneManagerStateChanged(object sender, GameStateChange
                 PauseMenu.IsVisible = false;
                 Play.IsVisible = true;
                 TitleLabel.IsVisible = true;
+
+                await this.audioService.Play(AudioItem.HomeBackgroundMusic, true);
                 break;
 
             case GameState.Started:

games/Orbit/Orbit/MauiProgram.cs

@@ -1,6 +1,8 @@
-using Orbit.Engine;
+using Orbit.Audio;
+using Orbit.Engine;
 using Orbit.GameObjects;
 using Orbit.Scenes;
+using Plugin.Maui.Audio;
 
 namespace Orbit;
 
@@ -11,18 +13,29 @@ public static MauiApp CreateMauiApp()
         var builder = MauiApp.CreateBuilder();
         builder
             .UseMauiApp<App>()
-            .UseOrbitEngine()
+            .UseOrbitEngine() // Register the engine
             .ConfigureFonts(fonts =>
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                 fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
                 fonts.AddFont("SpaceMono-Bold.ttf", "SpaceMonoBold");
             })
             .Services
+                // Pages
                 .AddTransient<MainPage>()
+
+                // Essentials
                 .AddSingleton(HapticFeedback.Default)
                 .AddSingleton(Vibration.Default)
+                .AddSingleton(FileSystem.Current)
+
+                // Audio
+                .AddSingleton(AudioManager.Current)
+
+                // Internals
                 .AddSingleton<UserInputManager>()
+                .AddSingleton<AudioService>()
+
                 .RegisterGameObjects()
                 .RegisterScenes();
 

games/Orbit/Orbit/Orbit.csproj

@@ -56,10 +56,8 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\..\..\engine\Orbit.Engine\Orbit.Engine.csproj" />
 	</ItemGroup>
+
 	<ItemGroup>
-	  <None Remove="Resources\EmbeddedResources\pulse.png" />
-	</ItemGroup>
-	<ItemGroup>
-	  <BundleResource Include="Resources\EmbeddedResources\pulse.png" />
+	  <PackageReference Include="Plugin.Maui.Audio" Version="1.0.0" />
 	</ItemGroup>
 </Project>