Skip to content

xLaserBolt: Near 100% match on collide_update #660

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
JoshSanch merged 1 commit into from
Nov 23, 2025
Merged

xLaserBolt: Near 100% match on collide_update #660

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
48 changes: 48 additions & 0 deletions src/SB/Core/x/xLaserBolt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,54 @@ void xLaserBoltEmitter::pre_collide(bolt& b)
log_collide_statics(coll.flags & 0x1);
}

void xLaserBoltEmitter::collide_update(bolt& b)
{
xScene& scene = *globals.sceneCur;

// TODO: Investigate float regalloc mismatch
xRay3 ray;
ray.origin = b.origin;
ray.dir = b.dir;
ray.min_t = b.prev_check_dist - this->cfg.length;
ray.max_t = b.dist;
ray.flags = 0xC00;

if (ray.max_t < this->cfg.safe_dist)
{
ray.min_t = ray.max_t;
}

xCollis player_coll;
player_coll.flags = 0x300;
xRayHitsBound(&ray, &globals.player.ent.bound, &player_coll);

if (player_coll.flags & 0x1)
{
ray.max_t = player_coll.dist;
}

xCollis scene_coll;
scene_coll.flags = 0x300;
xRayHitsSceneFlags(&scene, &ray, &scene_coll, XENT_COLLTYPE_PLYR, 0xC);

if (scene_coll.flags & 0x1)
{
b.hit_dist = scene_coll.dist;
b.hit_norm = scene_coll.norm;
b.hit_ent = (xEnt*)scene_coll.optr;
}
else if (player_coll.flags & 0x1)
{
b.hit_dist = player_coll.dist;
b.hit_norm = player_coll.norm;
b.hit_ent = &globals.player.ent;
}

b.prev_check_dist = b.dist;

log_collide_dynamics(scene_coll.flags & 0x1 || player_coll.flags & 0x1);
}

RxObjSpace3DVertex* xLaserBoltEmitter::render(bolt& b, RxObjSpace3DVertex *vert)
{
F32 dist0 = b.prev_dist - this->cfg.length;
Expand Down