merged with branch main_menu

.github/workflows/macos_clang.yaml

@@ -24,11 +24,15 @@ jobs:
       - name: Checkout LFS objects
         run: git lfs checkout
 
+      - name: Install OpenAl audio
+        run: |
+          brew install openal-soft
+
       - name: Install vcpkg packages
         # vcpkg binary can only be compiled using gcc for now (bootstrap step)
         run: |
          ./vcpkg/bootstrap-vcpkg.sh
-         
+
       - name: Create Build Environment
         run: |
           cmake -E make_directory ${{runner.workspace}}/build
@@ -46,4 +50,4 @@ jobs:
         working-directory: ${{runner.workspace}}/build
         shell: bash
         run: |
-          cmake --build . --config $BUILD_TYPE
+          cmake --build . --config $BUILD_TYPE -- -j $(sysctl -n hw.logicalcpu)

.github/workflows/ubuntu_gcc.yaml

@@ -70,7 +70,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE
+      run: cmake --build . --config $BUILD_TYPE -- -j $(nproc)
 
     - name: Test
       working-directory: ${{runner.workspace}}/build

CMakeLists.txt

@@ -34,14 +34,15 @@ add_library(
   src/background/Ground.cpp
   src/background/RoadGenerator.cpp
   src/background/SurfaceGenerator.cpp
+  src/Animation.cpp
   src/Board.cpp
   src/Controllers/KeyboardController.cpp
   src/Controllers/DummyController.cpp
   src/Missle.cpp
   src/Tank/Tank.cpp
   src/Tank/TankFactory.cpp
   src/Tank/TankPart.cpp
-  src/Tank/TankTower.cpp
+  src/Tank/TankTurret.cpp
   src/Tank/TankHealthBar.cpp
   src/TextureStore.cpp
   src/Random.cpp
@@ -78,9 +79,14 @@ find_package(
   REQUIRED)
 find_package(range-v3 REQUIRED)
 find_package(Microsoft.GSL CONFIG REQUIRED)
+if (APPLE)
+  find_package(OpenAL REQUIRED)
+  target_link_libraries(tank_bot_fight PRIVATE OpenAL::OpenAL)
+endif()
 
 target_link_libraries(tank_bot_fight_lib PUBLIC sfml-graphics ${EXTRA_LIBS}
                                                 Microsoft.GSL::GSL)
 target_link_libraries(tank_bot_fight PRIVATE tank_bot_fight_lib sfml-graphics sfml-audio)
 
+
 add_subdirectory(test)

Readme.md

@@ -29,8 +29,6 @@ You have to remember about two things:
 - Dependencies are installed via vcpkg
 
 
-
-
 ## Downloading the repo
 
 So, before you start, you must first download checkout git-lfs (https://git-lfs.github.com/)

res/License.txt

@@ -1,21 +1,21 @@
-	
-
-	Top-down Tanks Redux
-
-	by  Kenney Vleugels (Kenney.nl)
-
-			------------------------------
-
-	License (Creative Commons Zero, CC0)
-	http://creativecommons.org/publicdomain/zero/1.0/
-
-	You may use these assets in personal and commercial projects.
-	Credit (Kenney or www.kenney.nl) would be nice but is not mandatory.
-
-			------------------------------
-
-	Donate:   http://support.kenney.nl
-	Request:  http://request.kenney.nl
-
-	Follow on Twitter for updates:
+
+
+	Top-down Tanks Redux
+
+	by  Kenney Vleugels (Kenney.nl)
+
+			------------------------------
+
+	License (Creative Commons Zero, CC0)
+	http://creativecommons.org/publicdomain/zero/1.0/
+
+	You may use these assets in personal and commercial projects.
+	Credit (Kenney or www.kenney.nl) would be nice but is not mandatory.
+
+			------------------------------
+
+	Donate:   http://support.kenney.nl
+	Request:  http://request.kenney.nl
+
+	Follow on Twitter for updates:
 	@KenneyNL

src/Animation.cpp

@@ -0,0 +1,29 @@
+#include "Animation.hpp"
+
+#include <SFML/Graphics/Sprite.hpp>
+
+Animation::Animation(const std::string& file_name, int frame_count, double animation_time,
+                     sf::Vector2f position, TextureStore& store)
+    : mPosition(position), mStore(store) {
+  for (int i = 1; i <= frame_count; ++i) {
+    mAnimationFiles.push_back(file_name + std::to_string(i) + ".png");
+  }
+  mDeltaTime = animation_time / frame_count;
+}
+void Animation::draw(sf::RenderWindow& render_window) {
+  auto elapsed_time = mClock.getElapsedTime();
+
+  if (elapsed_time.asMilliseconds() > mDeltaTime) {
+    mClock.restart();
+    mCurrentFrame++;
+    if (mCurrentFrame >= mAnimationFiles.size()) {
+      mIsDrawingFinished = true;
+      return;
+    }
+  }
+  sf::Sprite sprite;
+  sprite.setTexture(mStore.get().get_texture(mAnimationFiles[mCurrentFrame]));
+  sprite.setPosition(mPosition - sf::Vector2f{sprite.getGlobalBounds().width / 2,
+                                              sprite.getGlobalBounds().height / 2});
+  render_window.draw(sprite);
+}

src/Animation.hpp

@@ -0,0 +1,28 @@
+#pragma once
+#include <SFML/Graphics/RenderWindow.hpp>
+#include <string>
+#include <vector>
+
+#include "TextureStore.hpp"
+
+class Animation {
+ public:
+  Animation(const std::string& file_name, int frame_count, double animation_time,
+            sf::Vector2f position, TextureStore& store);
+  void draw(sf::RenderWindow& render_window);
+  bool is_finished() const { return mIsDrawingFinished; }
+
+  Animation(const Animation&) = delete;
+  Animation& operator=(const Animation&) = delete;
+  Animation(Animation&&) = default;
+  Animation& operator=(Animation&&) = default;
+
+ private:
+  std::vector<std::string> mAnimationFiles;
+  int mCurrentFrame = 0;
+  bool mIsDrawingFinished = false;
+  double mDeltaTime = 0;
+  sf::Clock mClock;
+  sf::Vector2f mPosition;
+  std::reference_wrapper<TextureStore> mStore;
+};

src/Board.cpp

@@ -11,17 +11,17 @@
 #include "Tank/TankFactory.hpp"
 #include "TracesHandler.hpp"
 
-Board::Board(sf::RenderWindow& window) : mWindow{window}, mBackground(mStore) {
+Board::Board(sf::RenderWindow& window)
+    : mWindow{window}, mBackground(mStore), mTankExplodeSound{"explosion.flac"} {
   constexpr float TANK_X = WIDTH / 2.0f;
   constexpr float TANK_Y = 50.f;
   constexpr float TANK2_X = WIDTH / 2.0f;
   constexpr float TANK2_Y = 400.0f;
-  Sound tank_shot_sound("tank_shot.flac");
   mWindow.setFramerateLimit(30);
   mKeyboardPlayer = std::make_unique<KeyboardPlayer>(
-      *this, TankFactory::Random(mStore, TANK_X, TANK_Y, tank_shot_sound));
+      *this, TankFactory::Random(mStore, TANK_X, TANK_Y, Sound("tank_shot.flac")));
   mDummyPlayer = std::make_unique<DummyPlayer>(
-      *this, TankFactory::Random(mStore, TANK2_X, TANK2_Y, tank_shot_sound));
+      *this, TankFactory::Random(mStore, TANK2_X, TANK2_Y, Sound("tank_shot.flac")));
   mFont.loadFromFile(files::asset_path() + "DejaVuSans.ttf");
   mText.setFont(mFont);
 }
@@ -39,6 +39,9 @@ void Board::draw() {
   for (auto& missle : mMissles) {
     missle.draw(mWindow);
   }
+  for (auto& animation : mAnimations) {
+    animation.draw(mWindow);
+  };
   display_speed();
 }
 
@@ -88,11 +91,16 @@ void Board::update_players() {
     }
     player->get_tank().take_damage((*it).get_damage());
     if (!player->get_tank().is_alive()) {
+      mTankExplodeSound.play();
+      mAnimations.push_back(
+          Animation("explosion", 5, 500, player->get_tank().get_position(), mStore));
       player.reset();
     }
     missiles_collided.push_back(*it);
   };
 
+  std::erase_if(mAnimations, [](const auto& animation) { return animation.is_finished(); });
+
   update_player_if_hit(mKeyboardPlayer);
   update_player_if_hit(mDummyPlayer);
 

src/Board.hpp

@@ -3,16 +3,17 @@
 #include <SFML/Graphics.hpp>
 #include <memory>
 
+#include "Animation.hpp"
 #include "Missle.hpp"
 #include "Players/DummyPlayer.hpp"
 #include "Players/KeyboardPlayer.hpp"
 #include "background/Background.hpp"
-
 class Board {
  public:
   Board(sf::RenderWindow& window);
 
   void register_missile(const Missle& missile);
+  void register_animation(const Animation& animation);
   void play(const sf::Event& event);
 
  private:
@@ -29,4 +30,6 @@ class Board {
   std::vector<Missle> mMissles;
   sf::Font mFont;
   sf::Text mText;
+  Sound mTankExplodeSound;
+  std::vector<Animation> mAnimations;
 };

src/Controllers/DummyController.cpp

@@ -31,11 +31,11 @@ void DummyController::update() {
       break;
     case DummyMove::TurnLeft:
       mTank.rotate_body(Rotation::Clockwise);
-      mTank.rotate_tower(Rotation::Clockwise);
+      mTank.rotate_turret(Rotation::Clockwise);
       break;
     case DummyMove::TurnRight:
       mTank.rotate_body(Rotation::Counterclockwise);
-      mTank.rotate_tower(Rotation::Counterclockwise);
+      mTank.rotate_turret(Rotation::Counterclockwise);
       break;
     case DummyMove::Idle:
       mTank.set_gear(Gear::Neutral);

src/Controllers/KeyboardController.cpp

@@ -12,17 +12,17 @@ void KeyboardController::update(const sf::Event& event) {
     switch (event.key.code) {
       case sf::Keyboard::A:
         mTank.rotate_body(Rotation::Counterclockwise);
-        mTank.rotate_tower(Rotation::Counterclockwise);
+        mTank.rotate_turret(Rotation::Counterclockwise);
         break;
       case sf::Keyboard::D:
         mTank.rotate_body(Rotation::Clockwise);
-        mTank.rotate_tower(Rotation::Clockwise);
+        mTank.rotate_turret(Rotation::Clockwise);
         break;
       case sf::Keyboard::Left:
-        mTank.rotate_tower(Rotation::Counterclockwise);
+        mTank.rotate_turret(Rotation::Counterclockwise);
         break;
       case sf::Keyboard::Right:
-        mTank.rotate_tower(Rotation::Clockwise);
+        mTank.rotate_turret(Rotation::Clockwise);
         break;
       case sf::Keyboard::W:
         mTank.set_gear(Gear::Drive);
@@ -44,11 +44,11 @@ void KeyboardController::update(const sf::Event& event) {
       case sf::Keyboard::A:
       case sf::Keyboard::D:
         mTank.rotate_body(Rotation::None);
-        mTank.rotate_tower(Rotation::None);
+        mTank.rotate_turret(Rotation::None);
         break;
       case sf::Keyboard::Left:
       case sf::Keyboard::Right:
-        mTank.rotate_tower(Rotation::None);
+        mTank.rotate_turret(Rotation::None);
         break;
       case sf::Keyboard::W:
       case sf::Keyboard::S:

src/Missle.hpp

@@ -2,6 +2,7 @@
 #include <SFML/Graphics.hpp>
 
 #include "MovementState.hpp"
+
 class Missle {
  public:
   Missle(sf::Texture& texture, const MovementState& state, unsigned int damage);

src/Sound.cpp

@@ -1,23 +1,15 @@
 #include "Sound.hpp"
 
-Sound::Sound(const Sound& sound) {
-  mBuffer = sound.mBuffer;
-  mSound = sound.mSound;
-  mSound.setBuffer(mBuffer);
-}
+#include <iostream>
 
 Sound::Sound(const std::string& file_name) {
-  if (load_from_file(file_name)) {
-    mSound.setBuffer(mBuffer);
-  } else {
+  std::string path_to_file = files::asset_path() + "Sounds/" + file_name;
+  if (!mBuffer.loadFromFile(path_to_file)) {
     throw std::runtime_error("couldn't load sound");
   }
 }
 
-void Sound::play() { mSound.play(); }
-
-bool Sound::load_from_file(std::string file_name) {
-  std::string path_to_file = files::asset_path() + "Sounds/" + file_name;
-
-  return mBuffer.loadFromFile(path_to_file);
-}
+void Sound::play() {
+  mSound.setBuffer(mBuffer);
+  mSound.play();
+}

src/Sound.hpp

@@ -6,18 +6,16 @@
 
 class Sound {
  private:
-  // sound data is not stored directly in sf::Sound, it is stored in sf::SoundBuffer
   sf::SoundBuffer mBuffer;
-
-  // to play a sound, sf::Sound instance is needed.
   sf::Sound mSound;
 
  public:
-  // default constructor is needed for testing
-  Sound() = default;
-  Sound(const Sound& sound);
+  Sound(Sound&&) noexcept = default;
+  Sound& operator=(Sound&&) noexcept = default;
+
+  Sound(const Sound& sound) = delete;
+  Sound& operator=(const Sound& sound) = delete;
 
-  Sound(const std::string& file_name);
+  explicit Sound(const std::string& file_name);
   void play();
-  bool load_from_file(std::string file_name);
 };