Skip to content

zEntPlayerBungeeState: Add cb_cache_collisions struct and additional function matches #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbruv merged 1 commit into from
May 16, 2025
Merged

zEntPlayerBungeeState: Add cb_cache_collisions struct and additional function matches #549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions src/SB/Game/zEntPlayerBungeeState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,15 @@ namespace bungee_state
class hanging_state_type : public state_type
{
public:
struct cb_cache_collisions
{
xSphere& o;
ent_info* ent_cache;
S32& ent_cache_size;

S32 operator()(xEnt&, xGridBound&);
};

xVec3 loc;
xVec3 vel;
xVec3 last_loc;
Expand Down Expand Up @@ -431,6 +440,9 @@ namespace bungee_state
F32 kinetic_energy(F32 v) const;
F32 find_spring_min(F32 min_dist, F32 max_dist, F32 gravity, F32 damp) const;

void start_detaching();
void calc_drop_off_velocity(xVec3& v, const xVec3& from, const xVec3& to, F32 g, F32 t);
void render();
F32 spring_energy(F32 x, F32 v, F32 k, F32 g, F32 xc) const;
};
void hanging_state_type::on_tweak_collision(const tweak_info& ti)
Expand Down Expand Up @@ -820,6 +832,51 @@ namespace bungee_state
zEntPlayerCollTrigger(&globals.player.ent, &sc);
}

void hanging_state_type::calc_drop_off_velocity(xVec3& v, const xVec3& from,
const xVec3& to, F32 g, F32 t)
{
v = (to - from) * (1.0f / t);
v.y = 0.5f * g * t + v.y;
}

void hanging_state_type::render()
{
render_player(TRUE);
}

S32 hanging_state_type::cb_cache_collisions::operator()(xEnt& ent, xGridBound& bound)
{
xCollis coll;

if (!(ent.chkby & 0x10) || !(ent.penby & 0x10))
{
return 1;
}

coll.flags = 0x0;
xSphereHitsBound(&o, &ent.bound, &coll);

if (!(coll.flags & 0x1))
{
return 1;
}

if (ent.collLev == 0x5)
{
xSphereHitsModel(&o, ent.model, &coll);
if (!(coll.flags & 0x1))
{
return 1;
}
}

ent_info& cache_item = ent_cache[ent_cache_size];
cache_item.ent = &ent;
cache_item.hits = 0;
ent_cache_size++;

return 1;
}
} // namespace

void load(class xBase& data, class xDynAsset& asset, unsigned long)
Expand Down