Implemented Audio

Author: CosminPerRam

Blockodu.vcxproj

@@ -58,12 +58,14 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(SolutionDir)\libraries\SFML-2.5.1\include\;$(SolutionDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LanguageStandard>stdcpp14</LanguageStandard>
+      <LanguageStandard_C>Default</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)\libraries\SFML-2.5.1\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>winmm.lib;sfml-system-s-d.lib;opengl32.lib;gdi32.lib;sfml-window-s-d.lib;freetype.lib;sfml-graphics-s-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;sfml-system-s-d.lib;ws2_32.lib;sfml-network-s-d.lib;openal32.lib;flac.lib;vorbisenc.lib;vorbisfile.lib;vorbis.lib;ogg.lib;sfml-audio-s-d.lib;opengl32.lib;gdi32.lib;sfml-window-s-d.lib;freetype.lib;sfml-graphics-s-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -78,6 +80,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FloatingPointModel>Fast</FloatingPointModel>
+      <LanguageStandard>stdcpp14</LanguageStandard>
+      <LanguageStandard_C>Default</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -89,6 +93,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="include\audio.cpp" />
     <ClCompile Include="src\block.cpp" />
     <ClCompile Include="src\game.cpp" />
     <ClCompile Include="src\main.cpp" />
@@ -108,6 +113,7 @@
     <ClInclude Include="include\impl.h" />
     <ClInclude Include="include\pickupBoard.h" />
     <ClInclude Include="include\score.h" />
+    <ClInclude Include="include\audio.h" />
     <ClInclude Include="include\spacing.h" />
     <ClInclude Include="include\table.h" />
     <ClInclude Include="include\utilities.h" />

Blockodu.vcxproj.filters

@@ -36,6 +36,9 @@
     <ClCompile Include="src\score.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="include\audio.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include=".gitignore" />
@@ -69,5 +72,8 @@
     <ClInclude Include="include\score.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\audio.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

include/audio.cpp

@@ -0,0 +1,36 @@
+
+#include "audio.h"
+
+#include <SFML/Audio/SoundBuffer.hpp>
+#include <SFML/Audio/Sound.hpp>
+
+bool Audio::initialized = false;
+sf::SoundBuffer Audio::goodPlacement, Audio::badPlacement, Audio::completetion;
+sf::Sound Audio::playingSound;
+
+void Audio::initialize() {
+	goodPlacement.loadFromFile("resources/goodPlacement.ogg");
+	badPlacement.loadFromFile("resources/badPlacement.ogg");
+	completetion.loadFromFile("resources/completetion.ogg");
+
+	initialized = true;
+}
+
+void Audio::play(effect theEffect) {
+	if (!initialized)
+		return;
+
+	switch (theEffect) {
+	case effect::BadPlacement:
+		playingSound.setBuffer(badPlacement);
+		break;
+	case effect::GoodPlacement:
+		playingSound.setBuffer(goodPlacement);
+		break;
+	case effect::Completetion:
+		playingSound.setBuffer(completetion);
+		break;
+	}
+
+	playingSound.play();
+}

include/audio.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <SFML/Audio/SoundBuffer.hpp>
+#include <SFML/Audio/Sound.hpp>
+
+class Audio
+{
+private:
+	static bool initialized;
+	static sf::SoundBuffer goodPlacement, badPlacement, completetion;
+	static sf::Sound playingSound;
+
+public:
+	enum class effect { GoodPlacement, BadPlacement, Completetion };
+
+	static void initialize();
+
+	static void play(effect theEffect);
+};

include/block.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <vector>
-
 #include "impl.h"
 
+#include <vector>
+
 class Block : Drawable
 {
 private:

include/game.h

@@ -1,11 +1,11 @@
 
-#include <SFML/Window/Event.hpp>
-#include <SFML/Graphics/RenderWindow.hpp>
-
 #include "table.h"
 #include "pickupBoard.h"
 #include "score.h"
 
+#include <SFML/Window/Event.hpp>
+#include <SFML/Graphics/RenderWindow.hpp>
+
 class Game
 {
 private:
@@ -18,5 +18,7 @@ class Game
 	void pollEvent(sf::RenderWindow& window, sf::Event& theEvent);
 
 public:
+	Game();
+
 	void start();
 };

include/table.h

@@ -18,7 +18,7 @@ class Table : Drawable
 
 	sf::Vector2i mousePositionToCellPosition(const sf::Vector2f& mousePosition);
 
-	void verifyCompletetion();
+	bool checkCompletetion();
 
 public:
 	Table(Score& theScore);

resources/badPlacement.ogg

@@ -1,12 +1,11 @@
 
 #include "block.h"
-
-#include <SFML/Graphics/RectangleShape.hpp>
-
 #include "spacing.h"
 #include "colors.h"
 #include "utilities.h"
 
+#include <SFML/Graphics/RectangleShape.hpp>
+
 const sf::Vector2u Block::getStructureSize() {
 	return this->structureSize;
 }

resources/completetion.ogg

@@ -1,10 +1,14 @@
 
 #include "game.h"
-
 #include "spacing.h"
+#include "audio.h"
 
 #include <SFML/Graphics/RenderWindow.hpp>
 
+Game::Game() {
+    Audio::initialize();
+}
+
 void Game::draw(sf::RenderWindow& window) {
     theScore.draw(window);
 

resources/goodPlacement.ogg

@@ -1,7 +1,7 @@
 
 #include "pickupBoard.h"
-
 #include "colors.h"
+#include "audio.h"
 
 #include <SFML/Graphics/VertexArray.hpp>
 #include <SFML/Window/Event.hpp>
@@ -128,6 +128,8 @@ void PickupBoard::pollEvent(sf::RenderWindow& window, sf::Event& theEvent)
 
                 pickedUpPreviewCoords = { -1, -1 };
             }
+            else
+                Audio::play(Audio::effect::BadPlacement);
 
             pickedUpIndex = -1;
         }

src/block.cpp

@@ -1,6 +1,5 @@
 
 #include "score.h"
-
 #include "spacing.h"
 #include "colors.h"
 #include "utilities.h"

src/game.cpp

@@ -1,12 +1,12 @@
 
 #include "table.h"
+#include "colors.h"
+#include "spacing.h"
+#include "audio.h"
 
 #include <SFML/Graphics/RectangleShape.hpp>
 #include <SFML/Graphics/Rect.hpp>
 
-#include "colors.h"
-#include "spacing.h"
-
 Table::Table(Score& theScore) : theScore(theScore)
 {
 
@@ -28,7 +28,7 @@ sf::Vector2i Table::mousePositionToCellPosition(const sf::Vector2f& mousePositio
     return { -1, -1 };
 }
 
-void Table::verifyCompletetion() {
+bool Table::checkCompletetion() {
     std::vector<sf::Vector2u> completedBoxes;
     std::vector<unsigned> completedHorizontalLines;
     std::vector<unsigned> completedVerticalLines;
@@ -102,6 +102,14 @@ void Table::verifyCompletetion() {
 
         theScore.addCompletionLine();
     }
+
+    if (!completedBoxes.empty() || !completedVerticalLines.empty() || !completedHorizontalLines.empty())
+    {
+        Audio::play(Audio::effect::Completetion);
+        return true;
+    }
+
+    return false;
 }
 
 void Table::applyBlock(Block& theBlock, const sf::Vector2i& tableCellCoords)
@@ -117,7 +125,8 @@ void Table::applyBlock(Block& theBlock, const sf::Vector2i& tableCellCoords)
         }
     }
 
-    verifyCompletetion();
+    if (!checkCompletetion())
+        Audio::play(Audio::effect::GoodPlacement);
 }
 
 sf::Vector2i Table::previewBlock(Block& theHoldingBlock, const sf::Vector2f& mousePosition)
@@ -265,55 +274,3 @@ void Table::draw(sf::RenderWindow& window)
 
     //DRAW GRID END
 }
-
-/*
-//blocks
-    for (unsigned i = 0; i < 3; i++) {
-        for (unsigned j = 0; j < 3; j++) {
-            bool isBlockFull = true;
-            for (unsigned m = 0; m < 3; m++) {
-                for (unsigned n = 0; n < 3; n++) {
-                    if (cellTable[i * 3 + m][j * 3 + n] == cell::empty)
-                        isBlockFull = false;
-                }
-            }
-
-            if (isBlockFull) {
-                for (unsigned m = 0; m < 3; m++) {
-                    for (unsigned n = 0; n < 3; n++)
-                        cellTable[i * 3 + m][j * 3 + n] = cell::empty;
-                }
-
-                theScore.addCompletionSquare();
-            }
-        }
-    }
-
-    //lines
-    for (unsigned i = 0; i < 9; i++) {
-        for (unsigned j = 0; j < 9; j++) {
-            bool isVerticalLineFull = true, isHorizontalLineFull = true;
-            for (unsigned m = 0; m < 9; m++) {
-                if (cellTable[i][m] == cell::empty)
-                    isHorizontalLineFull = false;
-
-                if (cellTable[m][j] == cell::empty)
-                    isVerticalLineFull = false;
-            }
-
-            if (isVerticalLineFull) {
-                for (unsigned m = 0; m < 9; m++)
-                    cellTable[m][j] = cell::empty;
-
-                theScore.addCompletionLine();
-            }
-
-            if (isHorizontalLineFull) {
-                for (unsigned m = 0; m < 9; m++)
-                    cellTable[i][m] = cell::empty;
-
-                theScore.addCompletionLine();
-            }
-        }
-    }
-*/