alysbrooks-public/games/isometric-park-fna Commit - r578:7f1b7ee713b3

alysbrooks-public » games » isometric-park-fna

Commit `r578:7f1b7ee713b3` public

parent | child

Description:

Add basic sound.

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

r578:7f1b7ee713b3 - Mon, 09 May 2022 07:59:15

isometric-park-fna/Content/Click.wav ¶ created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

isometric-park-fna/Engines/InputEngine.cs ¶ +11 -5

              using System;
              using Microsoft.Xna.Framework;
+             using Microsoft.Xna.Framework.Audio;
              using Microsoft.Xna.Framework.Graphics;
              using Microsoft.Xna.Framework.Input;
                      private int height;
                      private int width;
+                     private SoundEffect sound;
                      public InputEngine(int menuBarHeight, Camera camera,
-                                        GraphicsDeviceManager gdm, int height, int width) {
+                                        GraphicsDeviceManager gdm, int height, int width, SoundEffect sound) {
                          //initialize to blank for now
                          this.keyboardPrev = new KeyboardState();
                          this.menuBarHeight = menuBarHeight;
                          this.graphicsDevice = gdm.GraphicsDevice;
                          this.height = height;
                          this.width = width;
+                         this.sound = sound;
                      }
              		    if ( mouseCur.LeftButton == ButtonState.Released && mousePrev.LeftButton == ButtonState.Pressed)
              		    {
              			    SendMessage(new AdjustSelection {Type = AdjustmentType.Complete });
+                             // SendMessage(new
              		    }
              		    if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Pressed)
                                  && MathUtils.Between(gridPosition.Y, 0, this.height))
                          {
                              foreach (ref readonly var entity in ReadEntities<CursorComponent>()) {
                                  var cursorComponent = GetComponent<CursorComponent>(entity);
                                  SetComponent(entity, new CursorComponent { position = gridPosition,
                                          size = 1 });
                              }
                          }
              	    }
+                     else if (ImGui.IsAnyItemHovered()) {
+                         if (mouseCur.LeftButton == ButtonState.Pressed && mousePrev.LeftButton == ButtonState.Released) {
+                             this.sound.Play(1.0f, 0.0f, 0.0f);
+                         }
+                     }
                          #endregion
                          this.keyboardPrev = keyboardCur;

isometric-park-fna/FNAGame.cs ¶ +16 -13

                  private SpriteBatch batch;
                  private SpriteBatch tileBatch;
-             #if DEBUG
+             // #if DEBUG
                  private SoundEffect sound;
-             #endif
+                 private SoundEffect clickSound;
+             // #endif
                  private SpriteFont monoFont;
                  private SpriteFont largeMonoFont;
                      this.batch = new SpriteBatch(GraphicsDevice);
                      this.tileBatch = new SpriteBatch(GraphicsDevice);
-             #if DEBUG
-                     sound = Content.Load<SoundEffect>("FNASound");
-             #endif
+             // #if DEBUG
+                     this.sound = Content.Load<SoundEffect>("FNASound");
+                     this.clickSound = Content.Load<SoundEffect>("Click");
+             // #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));
+                     WorldBuilder.AddEngine(new InputEngine(Menu.MENU_BAR_HEIGHT, this.camera, gdm,
+                                 this.simulation.map.MapHeight, this.simulation.map.MapWidth, this.clickSound));
                      WorldBuilder.AddEngine(new UIEngine(this.Story));
                      WorldBuilder.AddEngine(new DialogEngine(this.Story, this.grammar));
                  protected override void UnloadContent()
                  {
                      batch.Dispose();
-             #if DEBUG
+             // #if DEBUG
                      sound.Dispose();
-             #endif
+                     clickSound.Dispose();
+             // #endif
                      Tile.TileSetTexture.Dispose();
                      Logging.Success("Disposed of Tile texture.");
                      if (Quad.PixelTexture != null)
                      Stopwatch stopWatch = new Stopwatch();
                      stopWatch.Start();
-             #if DEBUG
+             // #if DEBUG
                      float volume = 1.0f;
                      float pitch = 0.0f;
                      float pan = 0.0f;
-             #endif
+             // #endif
                      KeyboardState keyboardCur = Keyboard.GetState();
                      MouseState mouseCur = Mouse.GetState();
                      #region input
                      #region misc_keys
-             #if DEBUG
+             // #if DEBUG
                      if (keyboardCur.IsKeyDown(Keys.OemBackslash)
                              && keyboardPrev.IsKeyUp(Keys.OemBackslash)
                              && keyboardCur.IsKeyDown(Keys.LeftShift))
                      {
                          sound.Play(volume, pitch, pan);
                      }
-             #endif
+             // #endif
                      #endregion misc_keys
                      #endregion input

isometric-park-fna/Tile.cs ¶ +4 -4

                                        new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2,
                                        //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                        new Vector2(((x - y + size) * Tile.TileSpriteWidth / 2), (x + y + size) * Tile.TileSpriteHeight / 2) + adjust2,
-                                       color, 0.79f);
+                                       color, 0.77f);
                          //Bottom right
                          Line.drawLine(batch,
                                        new Vector2(((x + size - y) * Tile.TileSpriteWidth / 2), (x + size + y) * Tile.TileSpriteHeight / 2) + adjust2,
                                        //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                        new Vector2(((x + size - (y + size)) * Tile.TileSpriteWidth / 2), (x + size + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2,
-                                       color, 0.79f);
+                                       color, 0.77f);
                          //Bottom left
                          Line.drawLine(batch,
                                        new Vector2(((x - (y + size)) * Tile.TileSpriteWidth / 2), (x + y + size) * Tile.TileSpriteHeight / 2) + adjust2,
                                        //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                        new Vector2(((x + size - (y + size)) * Tile.TileSpriteWidth / 2), (x + size + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2,
-                                       color, 0.79f);
+                                       color, 0.77f);
                          //Upper left
                          Line.drawLine(batch,
                                        new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2,
                                        //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight),
                                        new Vector2(((x - (y + size)) * Tile.TileSpriteWidth / 2), (x + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2,
-                                       color, 0.79f);
+                                       color, 0.77f);
                      }

isometric-park-fna/isometric-park-fna.csproj ¶ +3 0

                  <None Include="Content\FNASound.wav">
                     <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                  </None>
+                 <None Include="Content\Click.wav">
+                    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+                 </None>
                  <None Include="packages.config" />
                  <!-- <None Include="Content\part4_tileset.png"> -->
                  <!--   <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> -->

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

r578:7f1b7ee713b3 - Mon, 09 May 2022 07:59:15

Sign in to your account

Commit r578:7f1b7ee713b3 public

Author

r578:7f1b7ee713b3 - Mon, 09 May 2022 07:59:15

Commit `r578:7f1b7ee713b3` public