Skip to content

Supply normals for edge hits #7039

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
BMagnu merged 3 commits into from
Sep 16, 2025
Merged

Supply normals for edge hits #7039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
498a30d
Pass out normals for edge hits
BMagnu Sep 16, 2025
9ce0458
Remove now-obsolete comments
BMagnu Sep 16, 2025
7a00485
Also add third instance of disabled particle normal
BMagnu Sep 16, 2025
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
1 change: 1 addition & 0 deletions code/model/modelcollide.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ static void mc_check_sphereline_face( int nv, vec3d ** verts, vec3d * plane_pnt,
// This is closer than best so far
Mc->hit_dist = sphere_time;
Mc->hit_point = hit_point;
Mc->hit_normal = *plane_norm;
Mc->hit_submodel = Mc_submodel;
Mc->edge_hit = true;

Expand Down
10 changes: 3 additions & 7 deletions code/weapon/beam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3962,18 +3962,15 @@ void beam_handle_collisions(beam *b)
if (wi->flash_impact_weapon_expl_effect.isValid()) {
auto particleSource = particle::ParticleManager::get()->createSource(wi->flash_impact_weapon_expl_effect);
particleSource->setHost(beam_hit_make_effect_host(b, &Objects[target], b->f_collisions[idx].cinfo.hit_submodel, &b->f_collisions[idx].cinfo.hit_point_world, &b->f_collisions[idx].cinfo.hit_point));
// TODO: Commenting out until the collision code can be enhanced to return a valid normal when a beam collides with an edge.
// (This can happen when a slash beam moves off the edge of a model; edge_hit will be true and hit_normal will be 0,0,0.)
// particleSource->setNormal(worldNormal);
particleSource->setNormal(worldNormal);
particleSource->setTriggerRadius(width);
particleSource->finishCreation();
}

if(do_expl){
auto particleSource = particle::ParticleManager::get()->createSource(wi->impact_weapon_expl_effect);
particleSource->setHost(beam_hit_make_effect_host(b, &Objects[target], b->f_collisions[idx].cinfo.hit_submodel, &b->f_collisions[idx].cinfo.hit_point_world, &b->f_collisions[idx].cinfo.hit_point));
// TODO: see comment above
// particleSource->setNormal(worldNormal);
particleSource->setNormal(worldNormal);
particleSource->setTriggerRadius(width);
particleSource->finishCreation();
}
Expand Down Expand Up @@ -4029,8 +4026,7 @@ void beam_handle_collisions(beam *b)
auto particleSource = particle::ParticleManager::get()->createSource(wi->piercing_impact_effect);

particleSource->setHost(beam_hit_make_effect_host(b, &Objects[target], b->f_collisions[idx].cinfo.hit_submodel, &b->f_collisions[idx].cinfo.hit_point_world, &b->f_collisions[idx].cinfo.hit_point));
// TODO: see comment above
// particleSource->setNormal(worldNormal);
particleSource->setNormal(worldNormal);
particleSource->setTriggerRadius(width);
particleSource->finishCreation();
}
Expand Down
Loading