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

draw each tile with its own size

Browse Source
This commit is contained in:
Josh Holtrop 2012-09-13 23:47:48 -04:00
parent 89fc42251f
commit 84aecf957c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,8 +215,6 @@ void Client::draw_map()
{ {
const int width = m_map.get_width(); const int width = m_map.get_width();
const int height = m_map.get_height(); const int height = m_map.get_height();
const float tile_size = 50;
glUniform1f(OBJ_SCALE, tile_size);
m_projection.to_uniform(OBJ_PROJECTION); m_projection.to_uniform(OBJ_PROJECTION);
m_tile_obj.bindBuffers(); m_tile_obj.bindBuffers();
glEnableVertexAttribArray(0); glEnableVertexAttribArray(0);
@ -232,11 +230,13 @@ void Client::draw_map()
{ {
if (m_map.tile_present(x, y)) if (m_map.tile_present(x, y))
{ {
refptr<HexTile> tile = m_map.get_tile(x, y);
float cx = tile->get_x();
float cy = tile->get_y();
m_modelview.push(); m_modelview.push();
float cx = m_map.get_tile(x, y)->get_x();
float cy = m_map.get_tile(x, y)->get_y();
m_modelview.translate(cx, cy, 0); m_modelview.translate(cx, cy, 0);
m_modelview.to_uniform(OBJ_MODELVIEW); m_modelview.to_uniform(OBJ_MODELVIEW);
glUniform1f(OBJ_SCALE, tile->get_size());
for (map<string, WFObj::Material>::iterator it = for (map<string, WFObj::Material>::iterator it =
m_tile_obj.getMaterials().begin(); m_tile_obj.getMaterials().begin();
it != m_tile_obj.getMaterials().end(); it != m_tile_obj.getMaterials().end();