Replace currently used Ray with the new one

The rifle used the old implementation of the ray all the time. Now it is removed and the new implementation of the drawable ray is used instead.
Notiooo · Dec 14, 2023 · 23f8d26 · 23f8d26
1 parent 2e215cb
commit 23f8d26
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 83 deletions.
diff --git a/AimGL/src/Player/Player.cpp b/AimGL/src/Player/Player.cpp
@@ -2,11 +2,11 @@
 #include "Utils/Lerp.h"
 #include "pch.h"
 
-Player::Player(WindowToRender& window)
+Player::Player(WindowToRender& window, ColliderRegister& colliderRegister)
     : mCamera(window)
     , mCrosshairTexture("resources/Textures/crosshair.png")
     , mCrosshair(mCrosshairTexture)
-    , mRifle(mCamera)
+    , mRifle(mCamera, colliderRegister)
 {
     mCrosshair.setPosition({window.getSize().x / 2.f, window.getSize().y / 2.f},
                            Sprite2D::Origin::Center);

diff --git a/AimGL/src/Player/Player.h b/AimGL/src/Player/Player.h
@@ -20,8 +20,9 @@ class Player
     /**
      * \brief Player class constructor
      * \param window The window into which the player's eye view is rendered
+     * \param colliderRegister Register in which all collisions on the scene should be located
      */
-    explicit Player(WindowToRender& window);
+    Player(WindowToRender& window, ColliderRegister& colliderRegister);
 
     static constexpr auto PLAYER_HEGIHT = 0.8f;
     static constexpr auto PLAYER_MAX_HORIZONTAL_SPEED = 5.f;

diff --git a/AimGL/src/States/CustomStates/GameState.cpp b/AimGL/src/States/CustomStates/GameState.cpp
@@ -9,7 +9,7 @@
 GameState::GameState(StateStack& stack, WindowToRender& window)
     : State(stack)
     , mWindow(window)
-    , mPlayer(window)
+    , mPlayer(window, mColliderRegister)
     , mRenderer(mWindow)
     , mLogoTexture("resources/Textures/logo_background.png")
     , mLogo(mLogoTexture)
@@ -45,6 +45,7 @@ bool GameState::fixedUpdate(const float& deltaTime)
 {
     MTR_SCOPE("GameState", "GameState::fixedUpdate");
     mPlayer.fixedUpdate(deltaTime);
+    mColliderRegister.updateAllCollisions();
     return true;
 }
 

diff --git a/AimGL/src/States/CustomStates/GameState.h b/AimGL/src/States/CustomStates/GameState.h
@@ -9,6 +9,7 @@
 
 #include <Player/Player.h>
 #include <Renderer/Graphics/3D/Model.h>
+#include <World/Physics/ColliderRegister.h>
 
 class StateStack;
 
@@ -53,6 +54,7 @@ class GameState : public State
 
 private:
     WindowToRender& mWindow;
+    ColliderRegister mColliderRegister;
     Player mPlayer;
     Renderer mRenderer;
     Texture mLogoTexture;

diff --git a/AimGL/src/World/Physics/Ray.cpp b/AimGL/src/World/Physics/Ray.cpp
diff --git a/AimGL/src/World/Physics/Ray.h b/AimGL/src/World/Physics/Ray.h
diff --git a/AimGL/src/World/Scene/GameObjects/Rifle.cpp b/AimGL/src/World/Scene/GameObjects/Rifle.cpp
@@ -4,11 +4,12 @@
 #include <Utils/Lerp.h>
 #include <World/Camera.h>
 
-Rifle::Rifle(Camera& camera)
+Rifle::Rifle(Camera& camera, ColliderRegister& colliderRegister)
     : mCamera(camera)
     , mGun("resources/Models/ak47/ak47.obj",
            {{"resources/Models/ak47/ak47-alternative.png", Texture::Type::Diffuse},
             {"resources/Models/ak47/ak47-alternative-specular.png", Texture::Type::Specular}})
+    , mColliderRegister(colliderRegister)
 {
     mSoundBuffer.loadFromFile("resources/Sounds/gunshot.wav");
     mGunShotSound.setBuffer(mSoundBuffer);
@@ -64,6 +65,7 @@ void Rifle::handleEvent(const sf::Event& event)
         mCurrentRecoil = std::min(mCurrentRecoil, RECOIL_OFFSET_MAX);
         mCamera.shake();
         mGunShotSound.play();
-        mLatelyShotRay.emplace(mCamera.cameraPosition(), mCamera.direction());
+        mLatelyShotRay.emplace(mColliderRegister, mCamera.cameraPosition(), mCamera.direction());
+        mLatelyShotRay.value().colliderTag(ColliderTag::GunShot);
     }
 }
diff --git a/AimGL/src/World/Scene/GameObjects/Rifle.h b/AimGL/src/World/Scene/GameObjects/Rifle.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "World/Physics/Ray.h"
-#include <Renderer/Graphics/3D/Model.h>
+#include "Renderer/Graphics/3D/Model.h"
+#include "World/Physics/Drawable/Ray.h"
 #include <SFML/Audio/Sound.hpp>
 #include <SFML/Audio/SoundBuffer.hpp>
 
@@ -16,8 +16,9 @@ class Rifle
     /**
      * \brief Constructor of Rifle class
      * \param camera The camera to which the weapon should be attached
+     * \param colliderRegister Register in which all collisions on the scene should be located
      */
-    explicit Rifle(Camera& camera);
+    Rifle(Camera& camera, ColliderRegister& colliderRegister);
 
     /**
      * \brief Draws a Rifle to a given target
@@ -55,4 +56,5 @@ class Rifle
     sf::Sound mGunShotSound;
     std::optional<Ray> mLatelyShotRay;
     std::vector<std::function<void(Ray)>> mRaySubscribers;
+    ColliderRegister& mColliderRegister;
 };