more refactoring

Author: codenamecpp

src/AiCharacterController.cpp

@@ -97,17 +97,11 @@ inline const glm::ivec3& GetVectorFromMapDirection(eMapDirection direction)
 //////////////////////////////////////////////////////////////////////////
 
 AiCharacterController::AiCharacterController(Pedestrian* character)
+    : CharacterController(character)
 {
-    mCharacter = character;
     mFollowNearDistance = gGameParams.mPedestrianBoundsSphereRadius * 2.0f;
     mFollowFarDistance = Convert::MapUnitsToMeters(0.5f);
     mDefaultNearDistance = gGameParams.mPedestrianBoundsSphereRadius;
-
-    if (mCharacter)
-    {
-        debug_assert(mCharacter->mController == nullptr);
-        mCharacter->mController = this;
-    }
 }
 
 void AiCharacterController::DebugDraw(DebugRenderer& debugRender)
@@ -167,7 +161,7 @@ bool AiCharacterController::ScanForGunshots()
     return false;
 }
 
-void AiCharacterController::UpdateFrame()
+void AiCharacterController::OnCharacterUpdateFrame()
 {
     // choose current activity
     if (mAiMode == ePedestrianAiMode_None)
@@ -271,7 +265,7 @@ void AiCharacterController::StartPanic()
 
     mRunToTarget = true;
 
-    mCharacter->mCtlState.Clear();
+    mCtlState.Clear();
     if (!ChooseWalkWaypoint(true) || !ContinueWalkToWaypoint(mDefaultNearDistance))
     {
         mAiMode = ePedestrianAiMode_Disabled; // disable ai
@@ -283,7 +277,7 @@ void AiCharacterController::StartWandering()
     mAiMode = ePedestrianAiMode_Wandering;
     mFollowPedestrian.reset();
 
-    mCharacter->mCtlState.Clear();
+    mCtlState.Clear();
     if (!ChooseWalkWaypoint(false) || !ContinueWalkToWaypoint(mDefaultNearDistance))
     {
         StartPanic();
@@ -357,7 +351,7 @@ bool AiCharacterController::ContinueWalkToWaypoint(float distance)
     glm::vec2 currentPos2 = mCharacter->mTransform.GetPosition2();
     if (glm::distance2(currentPos2, mDestinationPoint) <= tolerance2)
     {
-        mCharacter->mCtlState.Clear();
+        mCtlState.Clear();
         return false;
     }
 
@@ -366,8 +360,8 @@ bool AiCharacterController::ContinueWalkToWaypoint(float distance)
     mCharacter->SetOrientation(toTarget);
 
     // set control
-    mCharacter->mCtlState.mWalkForward = true;
-    mCharacter->mCtlState.mRun = mRunToTarget;
+    mCtlState.mWalkForward = true;
+    mCtlState.mRun = mRunToTarget;
     return true;
 }
 
@@ -376,7 +370,7 @@ void AiCharacterController::StartDrivingCar()
     mAiMode = ePedestrianAiMode_DrivingCar;
     mFollowPedestrian.reset();
 
-    mCharacter->mCtlState.Clear();
+    mCtlState.Clear();
     if (!ChooseDriveWaypoint() || !ContinueDriveToWaypoint())
     {
         StopDriving();
@@ -388,12 +382,12 @@ void AiCharacterController::StopDriving()
     if (!mCharacter->IsCarDriver())
         return;
 
-    mCharacter->mCtlState.Clear();
+    mCtlState.Clear();
 
     float currentSpeed = mCharacter->mCurrentCar->GetCurrentSpeed();
     if (currentSpeed > gGameParams.mCarSpeedPassengerCanEnter)
     {
-        mCharacter->mCtlState.mAcceleration = -1.0f;
+        mCtlState.mAcceleration = -1.0f;
     }
     else
     {
@@ -458,7 +452,7 @@ void AiCharacterController::StartFollowTarget()
         return;
     }
 
-    mCharacter->mCtlState.Clear();
+    mCtlState.Clear();
     mAiMode = ePedestrianAiMode_FollowTarget;
 
     mDestinationPoint = mFollowPedestrian->mTransform.GetPosition2();
@@ -487,7 +481,7 @@ void AiCharacterController::UpdateFollowTarget()
     float distanceToTarget2 = glm::distance2(characterPosition2, targetPosition2);
     if (distanceToTarget2 < glm::pow(mFollowNearDistance, 2.0f))
     {
-        mCharacter->mCtlState.Clear();
+        mCtlState.Clear();
         return;
     }
 

src/AiCharacterController.h

@@ -3,6 +3,8 @@
 #include "CharacterController.h"
 #include "Pedestrian.h"
 
+//////////////////////////////////////////////////////////////////////////
+
 enum ePedestrianAiMode
 {
     ePedestrianAiMode_None,
@@ -27,17 +29,20 @@ enum PedestrianAiFlags
     PedestrianAiFlags_LemmingBehavior = BIT(0), // can suicide
     PedestrianAiFlags_FollowHumanCharacter = BIT(1),
 };
+
 decl_enum_as_flags(PedestrianAiFlags);
 
+//////////////////////////////////////////////////////////////////////////
+
 // defines ai character controller
 class AiCharacterController final: public CharacterController
 {
 public:
     AiCharacterController(Pedestrian* character);
 
     // process controller logic
-    void UpdateFrame() override;
     void DebugDraw(DebugRenderer& debugRender) override;
+    void OnCharacterUpdateFrame() override;
 
     void EnableAiFlags(PedestrianAiFlags aiFlags);
     void DisableAiFlags(PedestrianAiFlags aiFlags);

src/AiManager.cpp

@@ -16,11 +16,7 @@ void AiManager::UpdateFrame()
     for (size_t iController = 0, Count = mCharacterControllers.size(); iController < Count; ++iController)
     {
         AiCharacterController* currController = mCharacterControllers[iController];
-        if (currController->IsControllerActive())
-        {
-            currController->UpdateFrame();
-        }
-        else
+        if (!currController->IsControllerActive())
         {
             SafeDelete(mCharacterControllers[iController]);
             hasInactiveControllers = true;

src/AudioManager.cpp

@@ -12,10 +12,14 @@ AudioManager gAudioManager;
 
 CvarEnum<eGameMusicMode> gCvarGameMusicMode("g_musicMode", eGameMusicMode_Radio, "Game music mode", CvarFlags_Archive);
 
+CvarInt gCvarMusicVolume("g_musicVolume", 3, "Game music volume in range 0-7", CvarFlags_Archive | CvarFlags_RequiresAppRestart);
+CvarInt gCvarSoundsVolume("g_soundsVolume", 3, "Audio effects volume in range 0-7", CvarFlags_Archive | CvarFlags_RequiresAppRestart);
+
 //////////////////////////////////////////////////////////////////////////
 
 bool AudioManager::Initialize()
 {
+    InitSoundsAndMusicGainValue();
     if (!PrepareAudioResources())
     {
         gConsole.LogMessage(eLogMessage_Warning, "Cannot allocate audio resources");
@@ -141,8 +145,7 @@ bool AudioManager::PrepareAudioResources()
 
     if (mMusicAudioSource)
     {
-        // todo: move to settings
-        mMusicAudioSource->SetGain(0.3f);
+        mMusicAudioSource->SetGain(mMusicGain);
     }
 
     // allocate music sample buffers
@@ -477,3 +480,25 @@ bool AudioManager::QueueMusicSampleBuffers()
 
     return totalSamplesProcessed > 0;
 }
+
+void AudioManager::InitSoundsAndMusicGainValue()
+{
+    int musicVolume = glm::clamp(gCvarMusicVolume.mValue, AudioMinVolume, AudioMaxVolume);
+    if (gCvarMusicVolume.mValue != musicVolume)
+    {
+        gConsole.LogMessage(eLogMessage_Warning, "Music volume is '%d', must be in range [%d-%d]", gCvarMusicVolume.mValue, AudioMinVolume, AudioMaxVolume);
+        gCvarMusicVolume.mValue = musicVolume;
+        gCvarMusicVolume.ClearModified();
+    }
+    
+    int soundsVolume = glm::clamp(gCvarSoundsVolume.mValue, AudioMinVolume, AudioMaxVolume);
+    if (gCvarSoundsVolume.mValue != soundsVolume)
+    {
+        gConsole.LogMessage(eLogMessage_Warning, "Sounds volume is '%d', must be in range [%d-%d]", gCvarSoundsVolume.mValue, AudioMinVolume, AudioMaxVolume);
+        gCvarSoundsVolume.mValue = soundsVolume;
+        gCvarSoundsVolume.ClearModified();
+    }
+
+    mMusicGain = (1.0f * musicVolume) / (1.0f * AudioMaxVolume);
+    mSoundsGain = (1.0f * soundsVolume) / (1.0f * AudioMaxVolume);
+}

src/AudioManager.h

@@ -44,6 +44,7 @@ class AudioManager final: public cxx::noncopyable
 private:
     AudioSource* GetFreeAudioSource() const;
 
+    void InitSoundsAndMusicGainValue();
     bool PrepareAudioResources();
     void ShutdownAudioResources();
 
@@ -90,6 +91,9 @@ class AudioManager final: public cxx::noncopyable
 
     unsigned char mMusicSampleData[MusicSampleBufferSize];
 
+    float mMusicGain = 1.0f;
+    float mSoundsGain = 1.0f;
+
     // object pools
     cxx::object_pool<SfxEmitter> mEmittersPool;
 };

src/CarnageGame.cpp

@@ -142,15 +142,6 @@ void CarnageGame::UpdateFrame()
         gGameObjectsManager.UpdateFrame();
         gWeatherManager.UpdateFrame();
         gParticleManager.UpdateFrame();
-
-        for (int ihuman = 0; ihuman < GAME_MAX_PLAYERS; ++ihuman)
-        {
-            if (mHumanPlayers[ihuman] == nullptr)
-                continue;
-
-            mHumanPlayers[ihuman]->UpdateFrame();
-        }
-
         gTrafficManager.UpdateFrame();
         gAiManager.UpdateFrame();
         gBroadcastEvents.UpdateFrame();

src/CharacterController.cpp

@@ -4,12 +4,36 @@
 #include "Vehicle.h"
 #include "DebugRenderer.h"
 
+CharacterController::CharacterController(Pedestrian* character)
+{
+    AssignCharacter(character);
+}
+
 CharacterController::~CharacterController()
 {
-    DeactivateController();
+    AssignCharacter(nullptr);
 }
 
-void CharacterController::UpdateFrame()
+void CharacterController::AssignCharacter(Pedestrian* character)
+{
+    if (mCharacter == character)
+        return;
+
+    if (mCharacter)
+    {
+        debug_assert(mCharacter->mController == this);
+        mCharacter->mController = nullptr;
+    }
+    mCharacter = character;
+    if (mCharacter)
+    {
+        debug_assert(mCharacter->mController == nullptr);
+        mCharacter->mController = this;
+    }
+    mCtlState.Clear();
+}
+
+void CharacterController::OnCharacterUpdateFrame()
 {
     // do nothing
 }
@@ -24,26 +48,12 @@ bool CharacterController::IsHumanPlayer() const
     return false;
 }
 
-void CharacterController::DeactivateController()
+void CharacterController::OnCharacterChangeState(ePedestrianState prevState, ePedestrianState newState)
 {
-    if (mCharacter)
-    {
-        debug_assert(mCharacter->mController == this);
-        mCharacter->mController = nullptr;
-        mCharacter->mCtlState.Clear();
-        mCharacter = nullptr;
-    }
+    // do nothing
 }
 
 bool CharacterController::IsControllerActive() const
 {
     return mCharacter != nullptr;
-}
-
-void CharacterController::OnCharacterStartCarDrive()
-{
-}
-
-void CharacterController::OnCharacterStopCarDrive()
-{
 }

src/CharacterController.h

@@ -11,24 +11,22 @@ class CharacterController: public cxx::noncopyable
 public:
     // readonly
     Pedestrian* mCharacter = nullptr; // controllable character
+    PedestrianCtlState mCtlState;
 
 public:
-    CharacterController() = default;
+    CharacterController(Pedestrian* character);
     virtual ~CharacterController();
 
+    void AssignCharacter(Pedestrian* character);
+    bool IsControllerActive() const;
+
     // Process controller logic
-    virtual void UpdateFrame();
     virtual void DebugDraw(DebugRenderer& debugRender);
 
     // Whether character is under human player control
     virtual bool IsHumanPlayer() const;
 
-    // Inactive ai controllers will be automatically destroyed on next frame
-    virtual void DeactivateController();
-
-    bool IsControllerActive() const;
-
-    // Process character events
-    virtual void OnCharacterStartCarDrive();
-    virtual void OnCharacterStopCarDrive();
+    // Events
+    virtual void OnCharacterUpdateFrame();
+    virtual void OnCharacterChangeState(ePedestrianState prevState, ePedestrianState newState);
 };

src/GameCheatsWindow.cpp

@@ -62,9 +62,10 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
             {
                 Pedestrian* character = gTrafficManager.GenerateRandomTrafficPedestrian(characterLogPos.x, characterLogPos.y, characterLogPos.z);
                 debug_assert(character);
-                if (character)
+                if (character && character->mController)
                 {
-                    character->mController->DeactivateController();
+                    // disable controller
+                    character->mController->AssignCharacter(nullptr);
                 }
             }
             if (ImGui::MenuItem("Wandering"))