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

Use canvas in OGL g3_draw_sphere

Browse source
This commit is contained in:
Kp 2017-03-11 19:56:24 +00:00
parent 9ccddf5366
commit 4e1156a996
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/include/3d.h
View file

@ -126,7 +126,6 @@ void g3_set_view_matrix(const vms_vector &view_pos,const vms_matrix &view_matrix
//end the frame
#if DXX_USE_OGL
#define g3_end_frame() ogl_end_frame()
#define g3_draw_sphere(C,P,R,c) g3_draw_sphere(P,R,c)
#else
#define g3_end_frame()
#endif

4
similar/arch/ogl/ogl.cpp
View file

@ -770,10 +770,10 @@ namespace dcx {
/*
* Stars on heaven in exit sequence, automap objects
*/
void g3_draw_sphere(grs_canvas &, g3s_point &pnt, fix rad, const uint8_t c)
void g3_draw_sphere(grs_canvas &canvas, g3s_point &pnt, fix rad, const uint8_t c)
{
int i;
const float scale = (static_cast<float>(grd_curcanv->cv_bitmap.bm_w)/grd_curcanv->cv_bitmap.bm_h);
const float scale = (static_cast<float>(canvas.cv_bitmap.bm_w) / canvas.cv_bitmap.bm_h);
GLfloat color_array[20*4];
for (i = 0; i < 20*4; i += 4)

2
similar/main/automap.cpp
View file

@ -255,8 +255,6 @@ array<objnum_t, NUM_MARKERS> MarkerObject = init_MarkerObject(make_tree_index_se
# define automap_draw_line g3_draw_line
#if DXX_USE_OGL
#define DrawMarkerNumber(C,a,b,c) DrawMarkerNumber(a,b,c)
#define DrawMarkers(C,a) DrawMarkers(a)
#define draw_player(C,a,b) draw_player(a,b)
#define draw_all_edges(C,a) draw_all_edges(a)
#endif