TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Combine gameseg vm_dist_to_plane calls

Browse source
This commit is contained in:
Kp 2015-10-18 21:01:20 +00:00
parent 6f94cc933c
commit f5abe5bc5e
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
similar/main/gameseg.cpp
View file

@ -284,12 +284,11 @@ segmasks get_seg_masks(const vms_vector &checkp, const vcsegptr_t segnum, fix ra
int side_count,center_count;
vertnum = min(vertex_list[0],vertex_list[2]);
if (vertex_list[4] < vertex_list[1])
dist = vm_dist_to_plane(Vertices[vertex_list[4]],s->normals[0],Vertices[vertnum]);
else
dist = vm_dist_to_plane(Vertices[vertex_list[1]],s->normals[1],Vertices[vertnum]);
auto a = vertex_list[4] < vertex_list[1]
? std::make_pair(vertex_list[4], &s->normals[0])
: std::make_pair(vertex_list[1], &s->normals[1]);
dist = vm_dist_to_plane(Vertices[a.first], *a.second, Vertices[vertnum]);
side_pokes_out = (dist > PLANE_DIST_TOLERANCE);
@ -393,10 +392,10 @@ static ubyte get_side_dists(const vms_vector &checkp,const vsegptridx_t segnum,a
vertnum = min(vertex_list[0],vertex_list[2]);
if (vertex_list[4] < vertex_list[1])
dist = vm_dist_to_plane(Vertices[vertex_list[4]],s->normals[0],Vertices[vertnum]);
else
dist = vm_dist_to_plane(Vertices[vertex_list[1]],s->normals[1],Vertices[vertnum]);
auto a = vertex_list[4] < vertex_list[1]
? std::make_pair(vertex_list[4], &s->normals[0])
: std::make_pair(vertex_list[1], &s->normals[1]);
dist = vm_dist_to_plane(Vertices[a.first], *a.second, Vertices[vertnum]);
side_pokes_out = (dist > PLANE_DIST_TOLERANCE);