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

Pass clip_line arg by *&, not **

Browse source
This commit is contained in:
Kp 2014-11-13 03:19:45 +00:00
parent c5fd8cb859
commit c49880c8c6
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/3d/clipper.cpp
View file

@ -10,6 +10,8 @@
#include "clipper.h"
#include "dxxerror.h"
#include "compiler-exchange.h"
int free_point_num=0;
g3s_point temp_points[MAX_POINTS_IN_POLY];
@ -116,30 +118,27 @@ static g3s_point *clip_edge(int plane_flag,g3s_point *on_pnt,g3s_point *off_pnt)
return tmp;
}
#ifndef OGL
//clips a line to the viewing pyramid.
void clip_line(g3s_point **p0,g3s_point **p1,ubyte codes_or)
void clip_line(g3s_point *&p0,g3s_point *&p1,ubyte codes_or)
{
g3s_point *old_p1;
//might have these left over
(*p0)->p3_flags &= ~(PF_UVS|PF_LS);
(*p1)->p3_flags &= ~(PF_UVS|PF_LS);
p0->p3_flags &= ~(PF_UVS|PF_LS);
p1->p3_flags &= ~(PF_UVS|PF_LS);
for (int plane_flag=1;plane_flag<16;plane_flag<<=1)
if (codes_or & plane_flag) {
if ((*p0)->p3_codes & plane_flag)
std::swap(*p0, *p1);
old_p1 = *p1;
*p1 = clip_edge(plane_flag,*p0,*p1);
if (p0->p3_codes & plane_flag)
std::swap(p0, p1);
const auto old_p1 = exchange(p1, clip_edge(plane_flag,p0,p1));
if (old_p1->p3_flags & PF_TEMP_POINT)
free_temp_point(old_p1);
}
}
#endif
static int clip_plane(int plane_flag,g3s_point **src,g3s_point **dest,int *nv,g3s_codes *cc)

2
common/3d/clipper.h
View file

@ -23,7 +23,7 @@ struct g3s_point;
extern void free_temp_point(g3s_point *p);
extern g3s_point **clip_polygon(g3s_point **src,g3s_point **dest,int *nv,g3s_codes *cc);
extern void init_free_points(void);
extern void clip_line(g3s_point **p0,g3s_point **p1,ubyte codes_or);
void clip_line(g3s_point *&p0,g3s_point *&p1,ubyte codes_or);
#endif

2
common/3d/draw.cpp
View file

@ -42,7 +42,7 @@ static bool must_clip_line(g3s_point *p0,g3s_point *p1,ubyte codes_or)
else {
clip_line(&p0,&p1,codes_or);
clip_line(p0,p1,codes_or);
ret = g3_draw_line(p0,p1);
}