josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make Client::draw_player() accept a player argument

Browse Source
This commit is contained in:
Josh Holtrop 2012-09-23 11:58:08 -04:00
parent dabca714c9
commit 3e178b4d97
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/Client-gl.cc
View File

@ -266,7 +266,8 @@ void Client::redraw()
m_player->x, m_player->y, 20, m_player->x, m_player->y, 20,
0, 0, 1); 0, 0, 1);
draw_players(); // TODO: call draw_player() for each networked player
draw_player(m_player);
draw_map(); draw_map();
draw_sky(); draw_sky();
draw_lava(); draw_lava();
@ -276,12 +277,12 @@ void Client::redraw()
m_window->display(); m_window->display();
} }
void Client::draw_players() void Client::draw_player(refptr<Player> player)
{ {
m_obj_program.use(); m_obj_program.use();
m_modelview.push(); m_modelview.push();
m_modelview.translate(m_player->x, m_player->y, 4); m_modelview.translate(player->x, player->y, 4);
m_modelview.rotate(m_player->direction * 180.0 / M_PI, 0, 0, 1); m_modelview.rotate(player->direction * 180.0 / M_PI, 0, 0, 1);
m_modelview.scale(2, 2, 2); m_modelview.scale(2, 2, 2);
m_tank_obj.bindBuffers(); m_tank_obj.bindBuffers();
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);

2
src/client/Client.h
View File

@ -25,7 +25,7 @@ class Client
void resize_window(int width, int height); void resize_window(int width, int height);
void update(double elapsed_time); void update(double elapsed_time);
void redraw(); void redraw();
void draw_players(); void draw_player(refptr<Player> player);
void draw_map(); void draw_map();
void draw_overlay(); void draw_overlay();
void draw_sky(); void draw_sky();