tovjemam/fekalnigtacko
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use vehicle position for use target query and bigger radius when in vehicle

Browse Source
This commit is contained in:
tovjemam 2026-05-26 17:14:37 +02:00
parent 2df4ba3297
commit b7411d4611
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/world.cpp
View File

@ -108,8 +108,17 @@ struct UseTargetAabbCallback : public btBroadphaseAabbCallback
const game::UseTarget* best_target = nullptr; const game::UseTarget* best_target = nullptr;
float best_dist = std::numeric_limits<float>::max(); float best_dist = std::numeric_limits<float>::max();
game::UseTargetQueryResult& best_res; game::UseTargetQueryResult& best_res;
float radius = 2.0f;
UseTargetAabbCallback(game::PlayerCharacter& character, game::UseTargetQueryResult& res) : character(character), pos(character.GetRoot().GetGlobalPosition()), best_res(res) {} UseTargetAabbCallback(game::PlayerCharacter& character, game::UseTargetQueryResult& res) : character(character), pos(character.GetRoot().GetGlobalPosition()), best_res(res)
{
auto vehicle = character.GetVehicle();
if (vehicle)
{
radius = 5.0f;
pos = vehicle->GetRoot().GetGlobalPosition();
}
}
virtual bool process(const btBroadphaseProxy* proxy) virtual bool process(const btBroadphaseProxy* proxy)
{ {
@ -134,7 +143,7 @@ struct UseTargetAabbCallback : public btBroadphaseAabbCallback
glm::vec3 pos_world = matrix * glm::vec4(target.position, 1.0f); glm::vec3 pos_world = matrix * glm::vec4(target.position, 1.0f);
float dist = glm::distance(pos, pos_world); float dist = glm::distance(pos, pos_world);
if (dist < 2.0f && dist < best_dist) if (dist < radius && dist < best_dist)
{ {
game::UseTargetQueryResult res{}; game::UseTargetQueryResult res{};
if (!usable->QueryUseTarget(character, target.id, res)) if (!usable->QueryUseTarget(character, target.id, res))