alysbrooks-public/games/isometric-park-fna Commit - r581:36b2118dd380

alysbrooks-public » games » isometric-park-fna

Commit `r581:36b2118dd380` public

parent | child

Description:

Switch over to SoundEffectsEngine Replace inline calls to play sounds to a dedicated engine. Having an engine will also make it easier to have audio settings.

Commit status:

[Not Reviewed]

References:

m6-tiles-and-trees

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r581:36b2118dd380 - Sun, 15 May 2022 07:17:49

isometric-park-fna/Engines/SoundEffectsEngine.cs ¶ created 644 +56 0

@@ -0,0 +1,56
	1	using System.Collections.Generic;
	2
	3	using Microsoft.Xna.Framework;
	4	using Microsoft.Xna.Framework.Content;
	5	using Microsoft.Xna.Framework.Audio;
	6
	7	using Encompass;
	8
	9	using isometricparkfna.Messages;
	10
	11	namespace isometricparkfna.Engines
	12	{
	13
	14	[Receives(typeof(PlaySoundMessage))]
	15	public class SoundEffectEngine : Engine
	16	{
	17	public static Dictionary<string, SoundEffect> sounds = new Dictionary<string, SoundEffect>();
	18	public float volume = 1.0f;
	19	public float pitch = 0.0f;
	20	public float pan = 0.0f;
	21
	22
	23	public static SoundEffect LoadSound(ContentManager content, string path) {
	24	return LoadSound(content, path, path);
	25	}
	26
	27	public static SoundEffect LoadSound(ContentManager content,
	28	string path, string name) {
	29	var sfx = content.Load<SoundEffect>(path);
	30	sounds.Add(name, sfx);
	31	return sfx;
	32
	33	}
	34
	35	public static void DisposeSounds() {
	36
	37	foreach (KeyValuePair<string, SoundEffect> entry in sounds ) {
	38	entry.Value.Dispose();
	39	}
	40
	41	}
	42
	43	public override void Update(double dt) {
	44
	45	foreach(ref readonly var message
	46	in ReadMessages<PlaySoundMessage>()) {
	47	var sound = sounds[message.SoundName];
	48
	49	sound.Play(this.volume, this.pitch, this.pan);
	50
	51	}
	52
	53	}
	54
	55	}
	56	}

isometric-park-fna/Messages/PlaySoundMessage.cs ¶ created 644 +15 0

@@ -0,0 +1,15
	1	using Microsoft.Xna.Framework.Audio;
	2
	3
	4	using Encompass;
	5
	6
	7	namespace isometricparkfna.Messages
	8	{
	9
	10	public struct PlaySoundMessage : IMessage
	11	{
	12	public string SoundName;
	13
	14	}
	15	}

isometric-park-fna/Engines/InputEngine.cs ¶ +6 -8

                         typeof(GameStateMessage),
                         typeof(QuitGameMessage),
                         typeof(SpawnSelection),
-                        typeof(AdjustSelection)
+                        typeof(AdjustSelection),
-                        )]
+                        typeof(PlaySoundMessage))]
                 [Reads(typeof(WindowTypeComponent),
                        typeof(GameStateComponent),
                        typeof(VisibilityComponent),
                     private SoundEffect endSound;
                     public InputEngine(int menuBarHeight, Camera camera,
-                                       GraphicsDeviceManager gdm, int height, int width,
+                                       GraphicsDeviceManager gdm, int height, int width) {
-                                       SoundEffect sound, SoundEffect startSound,
-                                       SoundEffect endSound) {
                         //initialize to blank for now
                         this.keyboardPrev = new KeyboardState();
                         this.menuBarHeight = menuBarHeight;
             	    if (isPlaying && !io.WantCaptureMouse) {
             		    if (mouseCur.RightButton == ButtonState.Pressed && mousePrev.RightButton == ButtonState.Released)
             		    {
-                            this.sound.Play(1.0f, 0.0f, 0.0f);
+                            SendMessage(new PlaySoundMessage { SoundName = "Click" });
             			    SendMessage(new JumpCameraMessage {Movement = original_point});
             		    }
             	    }
                     else if (ImGui.IsAnyItemHovered()) {
                         if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Released) {
-                            this.startSound.Play(1.0f, 0.0f, 0.0f);
+                            SendMessage(new PlaySoundMessage { SoundName = "ClickPart1" });
                         }
                         else if (mouseCur.LeftButton == ButtonState.Released && mousePrev.LeftButton == ButtonState.Pressed) {
-                            this.endSound.Play(1.0f, 0.0f, 0.0f);
+                            SendMessage(new PlaySoundMessage { SoundName = "ClickPart2" });
                         }
                     }

isometric-park-fna/FNAGame.cs ¶ +8 -12

                 private SpriteBatch tileBatch;
             // #if DEBUG
                 private SoundEffect sound;
-                private SoundEffect clickSound;
-                private SoundEffect clickStartSound;
-                private SoundEffect clickEndSound;
             // #endif
                 private SpriteFont monoFont;
                 private SpriteFont largeMonoFont;
                     this.tileBatch = new SpriteBatch(GraphicsDevice);
             // #if DEBUG
-                    this.sound = Content.Load<SoundEffect>("FNASound");
+                    SoundEffectEngine.LoadSound(Content, "FNASound");
-                    this.clickSound = Content.Load<SoundEffect>("Click");
+                    SoundEffectEngine.LoadSound(Content, "Click");
-                    this.clickStartSound = Content.Load<SoundEffect>("ClickPart1");
+                    SoundEffectEngine.LoadSound(Content, "ClickPart1");
-                    this.clickEndSound = Content.Load<SoundEffect>("ClickPart2");
+                    SoundEffectEngine.LoadSound(Content, "ClickPart2");
             // #endif
                     Tile.TileSetTexture = Content.Load<Texture2D>(@"merged_tileset");
                     var texture = Content.Load<Texture2D>(@"solid_tileset");
                     Logging.Debug(this.Story.ContinueMaximally());
                     WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm,
-                                this.simulation.map.MapHeight, this.simulation.map.MapWidth,
+                                this.simulation.map.MapHeight, this.simulation.map.MapWidth));
-                                this.clickSound, this.clickStartSound, this.clickEndSound));
                     WorldBuilder.AddEngine(new UIEngine(this.Story));
                     WorldBuilder.AddEngine(new DialogEngine(this.Story, this.grammar));
                     WorldBuilder.AddEngine(new TraceryBridgeEngine(this.grammar));
                     WorldBuilder.AddEngine(new SimulationGameRateBridgeEngine(this.simulation));
                     WorldBuilder.AddEngine(new BuildToolEngine(this.simulation.map));
+                    WorldBuilder.AddEngine(new SoundEffectEngine());
                     WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.tileBatch, this.monoFont), 1);
                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(this, this.simulation, this.imGuiWindowBridgeEngine, this.gdm), 2);
                     batch.Dispose();
             // #if DEBUG
                     sound.Dispose();
-                    clickSound.Dispose();
+                    SoundEffectEngine.DisposeSounds();
-                    clickStartSound.Dispose();
-                    clickEndSound.Dispose();
             // #endif
                     Tile.TileSetTexture.Dispose();
                     Logging.Success("Disposed of Tile texture.");

isometric-park-fna/UI/OptionsWindow.cs ¶ +17 0

@@ -19,6 +19,8
19		19
20	public static bool newFullscreen;	20	public static bool newFullscreen;
21	public static Vector2 newResolution;	21	public static Vector2 newResolution;
		22	public static float newSoundEffects;
		23	public static bool newSoundEffectsMute;
22		24
23	private static string fontName = "Iosevka";	25	private static string fontName = "Iosevka";
24	private static int fontSize = 15;	26	private static int fontSize = 15;
@@ -135,6 +137,21
135		137
136	ImGui.Checkbox("Fullscreen", ref newFullscreen);	138	ImGui.Checkbox("Fullscreen", ref newFullscreen);
137		139
		140
		141
		142	ImGui.Separator();
		143
		144	ImGui.PushFont(italicFont);
		145	ImGui.Text("Audio");
		146	ImGui.PopFont();
		147	ImGui.Text("Sound Effects:\t");
		148
		149	ImGui.SameLine();
		150	ImGui.DragFloat("##Sfx", ref newSoundEffects, 0.005f, 0.0f, 1.0f, "%.2f");
		151	ImGui.SameLine();
		152	ImGui.Checkbox("Mute", ref newSoundEffectsMute);
		153
		154
138	ImGui.Separator();	155	ImGui.Separator();
139		156
140	ImGui.PushFont(italicFont);	157	ImGui.PushFont(italicFont);

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r581:36b2118dd380 - Sun, 15 May 2022 07:17:49

Sign in to your account

Commit r581:36b2118dd380 public

Author

r581:36b2118dd380 - Sun, 15 May 2022 07:17:49

Commit `r581:36b2118dd380` public