src/assets/item.cpp

@@ -154,20 +154,6 @@ std::shared_ptr<assets::Item> assets::Item::LoadFromFile(const std::string& path
         {
             iss >> item->damage;
         }
-        else if (command == "aimtype")
-        {
-            std::string aimtype_str;
-            iss >> aimtype_str;
-
-            if (aimtype_str == "none")
-                item->aim_type = AIMTYPE_NONE;
-            else if (aimtype_str == "crosshair")
-                item->aim_type = AIMTYPE_CROSSHAIR;
-            else if (aimtype_str == "scope")
-                item->aim_type = AIMTYPE_SCOPE;
-            else
-                throw std::runtime_error("Invalid aim type: " + aimtype_str);
-        }
         else
         {
             throw std::runtime_error("Unknown item command: " + command);

src/assets/item.hpp

@@ -17,7 +17,7 @@ enum ItemType
 enum ItemAimType
 {
     AIMTYPE_NONE,
-    AIMTYPE_CROSSHAIR,
+    AIMTYPE_AIM,
     AIMTYPE_SCOPE,
 
 };
@@ -59,8 +59,6 @@ struct Item
     std::string idle_anim;
     std::string use_anim; // use or fire
     
-    ItemAimType aim_type = AIMTYPE_NONE;
-
     // consumable
     std::string action;
 

src/audio/sound.cpp

@@ -50,18 +50,6 @@ std::shared_ptr<const audio::Sound> audio::Sound::LoadFromFile(const std::string
         {
             iss >> sound->pitch_;
         }
-        else if (cmd == "refdistance")
-        {
-            iss >> sound->ref_distance_;
-        }
-        else if (cmd == "rolloff")
-        {
-            iss >> sound->rolloff_ractor_;
-        }
-        else if (cmd == "maxdistance")
-        {
-            iss >> sound->max_distance_;
-        }
     });
 
     if (sound->category_name_.empty())

src/audio/sound.hpp

@@ -20,10 +20,6 @@ public:
     float GetVolume() const { return volume_; }
     float GetPitch() const { return pitch_; }
 
-    float GetRefDistance() const { return ref_distance_; }
-    float GetRolloffFactor() const { return rolloff_ractor_; }
-    float GetMaxDistance() const { return max_distance_; }
-
     ~Sound();
 
 private:
@@ -33,10 +29,6 @@ private:
 
     float volume_ = 1.0f;
     float pitch_ = 1.0f;
-
-    float ref_distance_ = 1.0f;
-    float rolloff_ractor_= 1.0f;
-    float max_distance_ = 200.0f;
 };
 
 } // namespace audio

src/audio/sound_source.cpp

@@ -12,11 +12,6 @@ audio::SoundSource::SoundSource(Player* player, std::shared_ptr<const Sound> sou
     SetPitch(1.0f);
 
     alSourcei(source_, AL_BUFFER, sound_->GetBufferId());
-    
-    // params
-    alSourcef(source_, AL_REFERENCE_DISTANCE, sound_->GetRefDistance());
-    alSourcef(source_, AL_ROLLOFF_FACTOR, sound_->GetRolloffFactor());
-    alSourcef(source_, AL_MAX_DISTANCE, sound_->GetMaxDistance());
 }
 
 void audio::SoundSource::SetLooping(bool looping)

src/game/camera_controller.cpp

@@ -36,42 +36,28 @@ void game::CameraController::Recalculate(collision::DynamicsWorld* world)
 
     glm::vec3 start_noaim(0.0f);
     glm::vec3 start_aim(0.0f);
-    bool scope = ShouldDrawScope();
 
     float distance_noaim = 5.0f;
-    glm::vec3 aim_end_offset = right * 0.4f - forward_ * 1.8f;
+    auto aim_end_offset = right * 0.4f - forward_ * 1.8f;
 
     if (character_transform_)
     {
         auto up = UpFromMatrix(*character_transform_);
-        start_noaim = TranslationFromMatrix(*character_transform_) + up * (scope ? 1.8f : 2.0f);
+        start_noaim = TranslationFromMatrix(*character_transform_) + up * 2.0f;
-
+        start_aim = start_noaim - up * 0.3f;
-        if (!scope)
-        {
-            start_aim = start_noaim - up * 0.3f;
-        }
-        else
-        {
-            start_aim = start_noaim;
-            aim_end_offset = glm::vec3(0.0f);
-        }
     }
 
     if (rideable_transform_)
     {
         start_noaim = TranslationFromMatrix(*rideable_transform_) + glm::vec3(0.0f, 0.0f, 2.0f);
         distance_noaim = 8.0f;
-
+        aim_end_offset = right * 0.3f - forward_ * 4.5f + glm::vec3(0.0f, 0.0f, 0.8f);
-        if (!scope)
-        {
-            aim_end_offset = right * 0.3f - forward_ * 4.5f + glm::vec3(0.0f, 0.0f, 0.8f);
-        }
     }
 
     glm::vec3 end_noaim = start_noaim - forward_ * distance_noaim; 
     glm::vec3 end_aim = start_aim + aim_end_offset;
 
-    auto aim_factor_smooth = scope ? 1.0f : glm::smoothstep(0.0f, 1.0f, aim_factor_);
+    auto aim_factor_smooth = glm::smoothstep(0.0f, 1.0f, aim_factor_);
     auto start = glm::mix(start_noaim, start_aim, aim_factor_smooth);
     auto end = glm::mix(end_noaim, end_aim, aim_factor_smooth);
 
@@ -88,24 +74,3 @@ glm::mat4 game::CameraController::GetViewMatrix() const
 {
     return glm::lookAt(eye_, eye_ + forward_, glm::vec3(0.0f, 0.0f, 1.0f));
 }
-
-bool game::CameraController::ShouldDrawCrosshair() const
-{
-    return aim_crosshair_ && !aim_scope_ && aim_factor_ > 0.5f;
-}
-
-bool game::CameraController::ShouldDrawScope() const
-{
-    return aim_crosshair_ && aim_scope_ && aim_factor_ > 0.7f;
-}
-
-float game::CameraController::GetFov() const
-{
-    if (ShouldDrawScope())
-    {
-        return glm::mix(25.0f, 20.0f, glm::smoothstep(0.0f, 1.0f, (aim_factor_ - 0.7f) / 0.3f));
-    }
-
-    // return glm::mix(90.0f, 80.0f, aim_factor_);
-    return 90.0f;
-}

src/game/camera_controller.hpp

@@ -18,7 +18,6 @@ public:
     float GetPitch() const { return pitch_; }
 
     void SetAiming(bool aiming) { aiming_ = aiming; }
-    void SetAimType(bool crosshair, bool scope) { aim_crosshair_ = crosshair; aim_scope_ = scope; }
 
     void Update(float time);
     void Recalculate(collision::DynamicsWorld* world);
@@ -28,11 +27,6 @@ public:
     glm::mat4 GetViewMatrix() const;
     float GetAimFactor() const { return aim_factor_; }
 
-    bool ShouldDrawCrosshair() const;
-    bool ShouldDrawScope() const;
-
-    float GetFov() const;
-
 private:
     const glm::mat4* character_transform_ = nullptr;
     const glm::mat4* rideable_transform_ = nullptr;
@@ -43,9 +37,6 @@ private:
     bool aiming_ = false;
     float aim_factor_ = 0.0f;
 
-    bool aim_crosshair_ = false;
-    bool aim_scope_ = false;
-
     glm::vec3 eye_;
     glm::vec3 forward_;
 

src/game/camera_info.hpp

@@ -9,8 +9,6 @@ using CameraFlags = uint8_t;
 enum CameraFlag : CameraFlags
 {
     CAM_AIMING = 1,
-    CAM_AIM_CROSSHAIR = 2,
-    CAM_AIM_SCOPE = 4,
 };
 
 struct CameraInfo

src/game/player.cpp

@@ -486,6 +486,5 @@ void game::Player::SendMenuMsgs()
 void game::Player::UpdateCamera()
 {
     camera_controller_.SetAiming(camera_info_.flags & CAM_AIMING);
-    camera_controller_.SetAimType(camera_info_.flags & CAM_AIM_CROSSHAIR, camera_info_.flags & CAM_AIM_SCOPE);
     camera_controller_.Update(1.0f / 25.0f);
 }

src/game/player_character.cpp

@@ -171,8 +171,6 @@ void game::PlayerCharacter::OnHeldItemChanged()
 {
     const auto& item = GetHeldItem();
     hud_data_.held_item = item ? item->def->name : "";
-
-    // UpdatePlayerCamera(); // might be required?
 }
 
 bool game::PlayerCharacter::HaveAmmo(const std::string& ammo_name)
@@ -232,22 +230,6 @@ void game::PlayerCharacter::UpdatePlayerCamera()
     if (GetAiming())
         camera_info.flags |= CAM_AIMING;
 
-    assets::ItemAimType aim_type = assets::AIMTYPE_NONE;
-    const auto& held_item = GetHeldItem();
-    if (held_item)
-    {
-        aim_type = held_item->def->aim_type;
-    }
-
-    if (aim_type != assets::AIMTYPE_NONE)
-    {
-        camera_info.flags |= CAM_AIM_CROSSHAIR;
-        if (aim_type == assets::AIMTYPE_SCOPE)
-        {
-            camera_info.flags |= CAM_AIM_SCOPE;
-        }
-    }
-
     player_->SetCamera(camera_info);
 }
 

src/game/tuning_world.cpp

@@ -128,9 +128,6 @@ void game::TuningWorld::OpenGroupMenu(const VehicleTuningGroup& group)
             btn.SetSelection(state_text);
 
             mounted_part_menu_item_ = &btn;
-
-            // play vrtačka sound
-            vehicle_->PlaySound("tuning");
         });
 
         if (GetPartState(group.id, part_id, &state_text))

src/game/vehicle.cpp

@@ -189,7 +189,7 @@ void game::Vehicle::ProcessInput()
 
     float steeringClamp = std::max(minsc, (1.f - (std::abs(speed) / sl)) * maxsc);
     // steeringClamp = .5f;
-    float steeringSpeed = steeringClamp * steering_speed_;
+    float steeringSpeed = steeringClamp * 5.0f;
     if (steering_analog_)
         steeringSpeed *= 3.0f;
 
@@ -641,7 +641,6 @@ void game::Vehicle::ApplyTuning(const VehicleTuning& tuning)
     }
 
     health_ = tuning_ctx_.health;
-    steering_speed_ = tuning_ctx_.steering;
 
     // (re)create physics
     physics_.reset();

src/game/vehicle.hpp

@@ -136,7 +136,6 @@ private:
     float steering_ = 0.0f;
     bool steering_analog_ = false;
     float target_steering_ = 0.0f;
-    float steering_speed_ = 5.0f;
 
     std::vector<VehicleWheelState> wheels_;
 

src/game/vehicle_tuning.cpp

@@ -14,8 +14,6 @@ static float game::VehicleTuningContext::* GetCtxVariablePointer(const std::stri
         return &game::VehicleTuningContext::braking_force;
     if (name == "health")
         return &game::VehicleTuningContext::health;
-    if (name == "steering")
-        return &game::VehicleTuningContext::steering;
 
     throw std::runtime_error("tuning list: invalid variable " + name);
 }

src/game/vehicle_tuning.hpp

@@ -35,7 +35,6 @@ struct VehicleTuningContext
     float engine_force;
     float braking_force;
     float health;
-    float steering;
     std::vector<VehicleWheelTuningContext> wheels;
 };
 

src/gameview/characterview.cpp

@@ -112,7 +112,6 @@ void game::view::CharacterView::Update(const UpdateInfo& info)
     if (item_)
     {
         item_node_.UpdateMatrix();
-        fire_snd_node_.UpdateMatrix();
     }
 }
 
@@ -374,9 +373,6 @@ void game::view::CharacterView::SetItem(const std::string& item_name)
     item_node_.parent = bone_node ? bone_node : &root_;
     item_node_.local = item_->bone_offset;
 
-    fire_snd_node_.parent = &item_node_;
-    fire_snd_node_.local.position = glm::vec3(0.0f, 0.1f, 0.0f);
-
     // snd
     if (!item_->fire_snd.empty())
     {
@@ -390,6 +386,7 @@ void game::view::CharacterView::SetItem(const std::string& item_name)
         auto loc = item_->model->GetLocation(item_->fire_fx_loc);
         fire_fx_offset_ = loc ? loc->position : glm::vec3(0.0f);
     }
+
 }
 
 void game::view::CharacterView::DrawItem(const DrawArgs& args)
@@ -414,7 +411,7 @@ void game::view::CharacterView::FireItem()
 
     if (fire_snd_)
     {
-        auto snd = audioplayer_.PlaySound(fire_snd_, &fire_snd_node_);
+        auto snd = audioplayer_.PlaySound(fire_snd_, &item_node_);
         // snd->SetPosition(item_node_.GetGlobalPosition());
     }
 

src/gameview/characterview.hpp

@@ -84,7 +84,6 @@ private:
 
     std::string item_name_;
     TransformNode item_node_;
-    TransformNode fire_snd_node_;
     std::shared_ptr<const assets::Item> item_;
     std::shared_ptr<const audio::Sound> fire_snd_;
     std::shared_ptr<const assets::Effect> fire_fx_;

src/gameview/client_session.cpp

@@ -84,10 +84,6 @@ void game::view::ClientSession::Input(game::PlayerInputType in, bool pressed, bo
 void game::view::ClientSession::ProcessMouseMove(float delta_yaw, float delta_pitch)
 {
     auto sens_mult = glm::mix(1.0f, 0.3f, camera_controller_.GetAimFactor());
-    if (camera_controller_.ShouldDrawScope())
-    {
-        sens_mult = 0.1f;
-    }
 
     float yaw = glm::mod(camera_controller_.GetYaw() + delta_yaw * sens_mult, glm::two_pi<float>());
 
@@ -307,19 +303,10 @@ void game::view::ClientSession::UpdateCamera(const UpdateInfo& info)
     camera_controller_.SetRideableTransform(rideable ? &rideable->GetRoot().matrix : nullptr);
     
     camera_controller_.SetAiming(camera_info_.flags & CAM_AIMING);
-    camera_controller_.SetAimType(camera_info_.flags & CAM_AIM_CROSSHAIR, camera_info_.flags & CAM_AIM_SCOPE);
-
     camera_controller_.Update(info.delta_time);
     camera_controller_.Recalculate(world_.get());
 
-    hud_.SetDisplayCrosshair(camera_controller_.ShouldDrawCrosshair());
+    hud_.SetDisplayCrosshair(camera_controller_.GetAimFactor() >= 0.5f);
-    hud_.SetDisplayScope(camera_controller_.ShouldDrawScope());
-
-    // hide character if scope
-    if (character)
-    {
-        character->SetVisible(!camera_controller_.ShouldDrawScope());
-    }
 }
 
 void game::view::ClientSession::DrawWorld(gfx::DrawList& dlist, gfx::DrawListParams& params, gui::Context& gui)
@@ -330,7 +317,7 @@ void game::view::ClientSession::DrawWorld(gfx::DrawList& dlist, gfx::DrawListPar
 
     const float farplane = 3000.0f;
 
-    glm::mat4 proj = glm::perspective(glm::radians(camera_controller_.GetFov() * 0.5f), aspect, 0.1f, farplane);
+    glm::mat4 proj = glm::perspective(glm::radians(45.0f), aspect, 0.1f, farplane);
     glm::mat4 view = camera_controller_.GetViewMatrix();
 
     params.view_proj = proj * view;

src/gameview/entityview.hpp

@@ -45,9 +45,6 @@ public:
     Sphere GetBoundingSphere() const { return Sphere{root_.GetGlobalPosition(), radius_}; }
     const TransformNode& GetRoot() const { return root_; }
 
-    void SetVisible(bool visible) { visible_ = visible; }
-    bool IsVisible() const { return visible_; }
-
     virtual ~EntityView() = default;
 
 protected:
@@ -69,7 +66,6 @@ protected:
     EntityView* parent_ = nullptr;
 
     float radius_ = 1.0f;
-    bool visible_ = true;
 
     audio::Player audioplayer_;
 

src/gameview/worldenv.cpp

@@ -22,7 +22,7 @@ static const game::view::WorldEnvKeyframe env_kfs[] = {
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.1f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.00002f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
@@ -35,7 +35,7 @@ static const game::view::WorldEnvKeyframe env_kfs[] = {
         glm::vec4(1.0f, 0.8f, 0.6f, 0.2f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.00001f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
@@ -48,72 +48,72 @@ static const game::view::WorldEnvKeyframe env_kfs[] = {
         glm::vec4(1.0f, 1.0f, 1.0f, 0.4f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.00001f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
         12.0f, // time
-        glm::vec3(0.6f, 0.8f, 1.0f) * 1.2f, // clear color
+        glm::vec3(0.6f, 0.8f, 1.0f), // clear color
-        glm::vec3(0.5f, 0.5f, 0.45f) * 1.1f, // ambient color
+        glm::vec3(0.5f, 0.5f, 0.5f) * 0.9f, // ambient color
         glm::vec3(1.0f, 0.95f, 0.7f) * 0.9f, // sun color
         1.0f, // sun light source
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // sun disc color
-        glm::vec4(1.0f, 0.9f, 0.9f, 0.5f), // sun halfsphere color
+        glm::vec4(1.0f, 1.0f, 1.0f, 0.7f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.000001f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
         17.0f, // time
-        glm::vec3(0.6f, 0.8f, 1.0f) * 1.2f, // clear color
+        glm::vec3(0.5f, 0.7f, 1.0f) * 0.9f, // clear color
-        glm::vec3(0.5f, 0.5f, 0.4f) * 1.4f, // ambient color
+        glm::vec3(0.5f, 0.5f, 0.5f) * 1.1f, // ambient color
         glm::vec3(1.0f, 0.95f, 0.7f) * 0.9f, // sun color
         1.0f, // sun light source
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // sun disc color
-        glm::vec4(1.0f, 0.85f, 0.6f, 0.7f), // sun halfsphere color
+        glm::vec4(1.0f, 1.0f, 1.0f, 0.5f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.0f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.000001f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
         17.5f, // time
-        glm::vec3(0.6f, 0.8f, 1.0f) * 1.1f, // clear color
+        glm::vec3(0.5f, 0.7f, 1.0f) * 0.8f, // clear color
-        glm::vec3(0.8f, 0.6f, 0.4f) * 1.1f, // ambient color
+        glm::vec3(0.8f, 0.6f, 0.5f) * 0.8f, // ambient color
         glm::vec3(1.0f, 0.8f, 0.6f) * 0.8f, // sun color
         1.0f, // sun light source
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // sun disc color
         glm::vec4(1.0f, 0.7f, 0.5f, 1.0f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.2f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.1f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.000002f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
         18.0f, // time
         glm::vec3(0.5f, 0.7f, 1.0f) * 0.7f, // clear color
-        glm::vec3(0.8f, 0.6f, 0.4f) * 0.8f, // ambient color
+        glm::vec3(0.8f, 0.6f, 0.5f) * 0.8f, // ambient color
-        glm::vec3(1.0f, 0.7f, 0.6f) * 0.2f, // sun color
+        glm::vec3(1.0f, 0.8f, 0.6f) * 0.8f, // sun color
-        1.0f, // sun light source
+        0.0f, // sun light source
         glm::vec4(1.0f, 0.8f, 0.7f, 1.0f), // sun disc color
         glm::vec4(1.0f, 0.7f, 0.5f, 1.0f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.2f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.1f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.000005f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
         19.0f, // time
         glm::vec3(0.1f, 0.15f, 0.3f), // clear color
         glm::vec3(0.4f, 0.4f, 0.4f), // ambient color
-        glm::vec3(1.0f, 0.7f, 0.6f) * 0.2f, // sun color
+        glm::vec3(0.5f, 0.8f, 1.0f) * 0.4f, // sun color
-        0.0f, // sun light source
+        -1.0f, // sun light source
         glm::vec4(1.0f, 0.5f, 0.3f, 1.0f), // sun disc color
         glm::vec4(1.0f, 0.5f, 0.2f, 0.8f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.1f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.00001f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
     game::view::WorldEnvKeyframe{
@@ -126,7 +126,7 @@ static const game::view::WorldEnvKeyframe env_kfs[] = {
         glm::vec4(1.0f, 0.5f, 0.2f, 0.0f), // sun halfsphere color
         glm::vec4(1.0f, 1.0f, 1.0f, 1.0f), // moon disc color
         glm::vec4(1.0f, 1.0f, 1.0f, 0.1f), // moon halfsphere color
-        glm::vec4(1.0f, 1.0f, 1.0f, 0.00003f), // fog
+        glm::vec4(1.0f, 1.0f, 1.0f, 10000.0f), // fog
     },
 
 
@@ -165,7 +165,7 @@ void game::view::WorldEnv::Draw(const DrawArgs& args)
     args.env.ambient_light = glm::mix(kf1->ambient_color, kf2->ambient_color, t);
     args.env.sun_color = glm::mix(kf1->sun_color, kf2->sun_color, t);
     // args.env.fog = glm::mix(kf1->fog, kf2->fog, t);
-    args.env.fog = glm::vec4(args.env.clear_color, glm::mix(kf1->fog.a, kf2->fog.a, t));
+    args.env.fog = glm::vec4(args.env.clear_color, 0.00001f);
 
     float dist = args.farplane * 0.5f;
 

src/gameview/worldview.cpp

@@ -106,13 +106,8 @@ void game::view::WorldView::Draw(const DrawArgs& args)
 
     for (const auto& [entnum, ent] : ents_)
     {
-        if (!ent->IsVisible())
+        if (args.frustum.IsSphereVisible(ent->GetBoundingSphere()))
-            continue;
+            ent->Draw(args);
-
-        if (!args.frustum.IsSphereVisible(ent->GetBoundingSphere()))
-            continue;    
-        
-        ent->Draw(args);
     }
 
     DrawBeams(args);

src/gui/context.cpp

@@ -25,13 +25,6 @@ void gui::Context::DrawRect(const glm::vec2& p0, const glm::vec2& p1, uint32_t c
     PushRect(p0, glm::vec2(0.0f), p1, glm::vec2(1.0f), color);
 }
 
-void gui::Context::DrawRectUV(const glm::vec2& p0, const glm::vec2& p1, const glm::vec2& uv0, const glm::vec2& uv1,
-                              uint32_t color, const gfx::Texture* texture)
-{
-    BeginTexture(texture ? texture : white_tex_.get());
-    PushRect(p0, uv0, p1, uv1, color);
-}
-
 static uint32_t DecodeUTF8Codepoint(const char*& p, const char* end)
 {
     if (p == end)

src/gui/context.hpp

@@ -35,7 +35,6 @@ public:
     void Begin(const glm::vec2& viewport_size);
 
     void DrawRect(const glm::vec2& p0, const glm::vec2& p1, uint32_t color, const gfx::Texture* texture = nullptr);
-    void DrawRectUV(const glm::vec2& p0, const glm::vec2& p1, const glm::vec2& uv0, const glm::vec2& uv1, uint32_t color, const gfx::Texture* texture);
 
     glm::vec2 MeasureText(std::string_view text);
     void DrawText(std::string_view text, const glm::vec2& pos, uint32_t color = 0xFFFFFFFF, float scale = 1.0f);

src/gui/player_hud.cpp

@@ -23,7 +23,6 @@ static uint32_t COLOR_ERROR = 0xFF7777FF;
 gui::PlayerHud::PlayerHud(const float& time) : time_(time)
 {
     crosshair_texture_ = assets::CacheManager::GetTexture("data/crosshair.png");
-    scope_texture_ = assets::CacheManager::GetTexture("data/scope.png");
 
     UpdateWeaponSlotsText();
 }
@@ -74,9 +73,8 @@ void gui::PlayerHud::Update(float delta_time)
 
 void gui::PlayerHud::Draw(Context& ctx) const
 {
-    DrawCrosshair(ctx);
-    DrawScope(ctx);
     DrawPain(ctx);
+    DrawCrosshair(ctx);
     DrawHealthBar(ctx);
     DrawItemInfo(ctx);
     DrawUseTarget(ctx);
@@ -104,22 +102,6 @@ void gui::PlayerHud::UpdateWeaponSlotsText()
     }
 }
 
-uint32_t gui::PlayerHud::GetCrosshairColor() const
-{
-    glm::vec3 color(1.0f);
-    if (damage_dealt_factor_ > 0.01f)
-    {
-        color = glm::mix(color, glm::vec3(0.3f), damage_dealt_factor_);
-    }
-
-    if (damage_dealt_kill_factor_ > 0.01f)
-    {
-        color = glm::mix(color, glm::vec3(1.0f, 0.1f, 0.1f), damage_dealt_kill_factor_);
-    }
-
-    return glm::packUnorm4x8(glm::vec4(color, 1.0f));
-}
-
 void gui::PlayerHud::DrawPain(Context& ctx) const
 {
     if (damage_received_factor_ <= 0.01f)
@@ -134,6 +116,17 @@ void gui::PlayerHud::DrawCrosshair(Context& ctx) const
     if (!display_crosshair_)
         return;
 
+    glm::vec3 color(1.0f);
+    if (damage_dealt_factor_ > 0.01f)
+    {
+        color = glm::mix(color, glm::vec3(0.3f), damage_dealt_factor_);
+    }
+
+    if (damage_dealt_kill_factor_ > 0.01f)
+    {
+        color = glm::mix(color, glm::vec3(1.0f, 0.1f, 0.1f), damage_dealt_kill_factor_);
+    }
+
     const float crosshair_size = 32.0f;
 
     auto& viewport_size = ctx.GetViewportSize();
@@ -141,41 +134,7 @@ void gui::PlayerHud::DrawCrosshair(Context& ctx) const
     auto p0 = viewport_size * 0.5f - crosshair_size * 0.5f;
     auto p1 = p0 + crosshair_size;
 
-    ctx.DrawRect(p0, p1, GetCrosshairColor(), crosshair_texture_.get());
+    ctx.DrawRect(p0, p1, glm::packUnorm4x8(glm::vec4(color, 1.0f)), crosshair_texture_.get());
-}
-
-void gui::PlayerHud::DrawScope(Context& ctx) const
-{
-    if (!display_scope_)
-        return;
-
-    glm::vec2 p0(0.0f);
-    glm::vec2 size = ctx.GetViewportSize();
-
-    if (size.x < size.y)
-    {
-        p0.y += (size.y - size.x) * 0.5f;
-        size.y = size.x;
-        ctx.DrawRect(glm::vec2(0.0f), glm::vec2(p0.x + size.x, p0.y + 2.0f), 0xFF000000);
-        ctx.DrawRect(glm::vec2(p0.x, p0.y + size.y - 2.0f), ctx.GetViewportSize(), 0xFF000000);
-    }
-    else
-    {
-        p0.x += (size.x - size.y) * 0.5f;
-        size.x = size.y;
-        ctx.DrawRect(glm::vec2(0.0f), glm::vec2(p0.x + 2.0f, p0.y + size.y), 0xFF000000);
-        ctx.DrawRect(glm::vec2(p0.x + size.x - 2.0f, p0.y), ctx.GetViewportSize(), 0xFF000000);
-    }
-
-    p0 = glm::floor(p0);
-    size = glm::floor(size);
-
-    // glm::vec2 p1 = p0 + size * 0.5f;
-    glm::vec2 p2 = p0 + size;
-
-    auto color = GetCrosshairColor();
-    ctx.DrawRect(p0, p2, color, scope_texture_.get());
-    
 }
 
 void gui::PlayerHud::DrawHealthBar(Context& ctx) const

src/gui/player_hud.hpp

@@ -21,7 +21,6 @@ public:
     void SetUseTargetData(std::string text, std::string error_text, float delay);
 
     void SetDisplayCrosshair(bool show) { display_crosshair_ = show; }
-    void SetDisplayScope(bool show) { display_scope_ = show; }
     void ShowDamageReceived();
     void ShowDamageDealt(bool kill);
 
@@ -33,11 +32,8 @@ public:
 private:
     void UpdateWeaponSlotsText();
 
-    uint32_t GetCrosshairColor() const;
-
     void DrawPain(Context& ctx) const;
     void DrawCrosshair(Context& ctx) const;
-    void DrawScope(Context& ctx) const;
     void DrawHealthBar(Context& ctx) const;
     void DrawItemInfo(Context& ctx) const;
     void DrawUseTarget(Context& ctx) const;
@@ -48,7 +44,6 @@ private:
     
     // resources
     std::shared_ptr<const gfx::Texture> crosshair_texture_;
-    std::shared_ptr<const gfx::Texture> scope_texture_;
 
     // general
     float health_ = 0.0f;
@@ -72,7 +67,6 @@ private:
 
     // crosshair & events
     bool display_crosshair_ = false;
-    bool display_scope_ = false;
     float damage_received_factor_ = 0.0f;
     float damage_dealt_factor_ = 0.0f;
     float damage_dealt_kill_factor_ = 0.0f;