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

Move 3d/clipper.cpp to SDL-only build

Browse source
This commit is contained in:
Kp 2014-11-16 19:14:51 +00:00
parent cec58664ed
commit 177c935b9d
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -1351,7 +1351,6 @@ class DXXArchive(DXXCommon):
'2d/rect.cpp',
'2d/rle.cpp',
'2d/scalec.cpp',
'3d/clipper.cpp',
'3d/draw.cpp',
'3d/globvars.cpp',
'3d/instance.cpp',
@ -1399,6 +1398,7 @@ class DXXArchive(DXXCommon):
])
# for non-ogl
objects_arch_sdl = DXXCommon.create_lazy_object_property([os.path.join(srcdir, f) for f in [
'3d/clipper.cpp',
'texmap/tmapflat.cpp'
]
])

7
common/3d/clipper.h
View file

@ -20,13 +20,18 @@
struct g3s_codes;
struct g3s_point;
#ifdef OGL
static inline void init_free_points() {}
#else
#include "compiler-array.h"
struct polygon_clip_points : array<g3s_point *, MAX_POINTS_IN_POLY> {};
extern int free_point_num;
void init_free_points();
extern void free_temp_point(g3s_point *p);
const polygon_clip_points &clip_polygon(polygon_clip_points &src,polygon_clip_points &dest,int *nv,g3s_codes *cc);
extern void init_free_points(void);
void clip_line(g3s_point *&p0,g3s_point *&p1,ubyte codes_or);
#endif
#endif

1
common/3d/globvars.h
View file

@ -29,7 +29,6 @@ extern double fCanv_w2, fCanv_h2;
#endif
extern vms_vector Window_scale;
extern int free_point_num;
extern fix View_zoom;
extern vms_vector View_position,Matrix_scale;

8
common/3d/setup.cpp
View file

@ -68,11 +68,7 @@ void g3_end_frame(void)
{
#ifdef OGL
ogl_end_frame();
#endif
// Assert(free_point_num==0);
#else
free_point_num = 0;
#endif
}